summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/bcfg2-server.postinst14
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
3 files changed, 11 insertions, 9 deletions
diff --git a/debian/bcfg2-server.postinst b/debian/bcfg2-server.postinst
index 586263152..2f65fe847 100644
--- a/debian/bcfg2-server.postinst
+++ b/debian/bcfg2-server.postinst
@@ -42,17 +42,19 @@ esac
# We do a restart manually here because with autogenerated code
# we get this traceback (eg something isn't done yet):
+# This happens due to debhelper bug #546293, fixed in version 7.4.2.
## Setting up bcfg2-server (1.0.0~rc3+r5542-0.1+dctest8) ...
## Starting Configuration Management Server: Traceback (most recent call last):
## File "/usr/sbin/bcfg2-server", line 12, in <module>
## import Bcfg2.Server.Plugins.Metadata
## ImportError: No module named Server.Plugins.Metadata
## * bcfg2-server
-case "$1" in
- configure)
- echo "Restarting bcfg2-server after initial install or upgrade..."
- /etc/init.d/bcfg2-server restart
- ;;
-esac
+if [ -x "/etc/init.d/bcfg2-server" ]; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d bcfg2-server start || exit $?
+ else
+ /etc/init.d/bcfg2-server start || exit $?
+ fi
+fi
exit 0
diff --git a/debian/compat b/debian/compat
index 7ed6ff82d..7f8f011eb 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index ed5d882fd..31d0740d7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: bcfg2
Section: admin
Priority: optional
Maintainer: Sami Haahtinen <ressu@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-dev (>= 2.3.5-7), python (>= 2.3.5-7)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.3.5-7)
Build-Depends-Indep: python-support (>= 0.5.3)
Standards-Version: 3.8.0.0
XS-Python-Version: >= 2.3
@@ -20,7 +20,7 @@ Description: Configuration management client
Package: bcfg2-server
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${Source-Version}), openssl, python-ssl | python2.6 | python3.0 | python3.1 | python3.2, gamin | fam, python-gamin | python-fam, python-gamin | fam, gamin | python-fam
+Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python-ssl | python2.6 | python3.0 | python3.1 | python3.2, gamin | fam, python-gamin | python-fam, python-gamin | fam, gamin | python-fam
XB-Python-Version: >= 2.4
Recommends: graphviz
Suggests: python-cheetah, python-genshi (>= 0.4.4), python-profiler, sqlalchemy (>= 0.5.0), python-django, mail-transport-agent