diff options
| -rw-r--r-- | debian/bcfg2.postinst | 5 | ||||
| -rw-r--r-- | debian/bcfg2.postrm | 10 | ||||
| -rw-r--r-- | debian/buildsys/2.3/control.in | 1 | ||||
| -rw-r--r-- | debian/buildsys/2.4/control.in | 1 | ||||
| -rw-r--r-- | debian/buildsys/pycentral/control.in | 3 | ||||
| -rwxr-xr-x | debian/rules | 5 |
6 files changed, 22 insertions, 3 deletions
diff --git a/debian/bcfg2.postinst b/debian/bcfg2.postinst index ebdef9d6b..3d6e75448 100644 --- a/debian/bcfg2.postinst +++ b/debian/bcfg2.postinst @@ -19,8 +19,13 @@ set -e case "$1" in configure) + OLDUMASK=$(umask) + umask 027 ucf /usr/share/bcfg2/bcfg2.conf /etc/bcfg2.conf + ucfr bcfg2 /etc/bcfg2.conf + umask $OLDUMASK ucf /usr/share/bcfg2/bcfg2.default /etc/default/bcfg2 + ucfr bcfg2 /etc/default/bcfg2 ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/bcfg2.postrm b/debian/bcfg2.postrm index bd6264cd7..5d7efc942 100644 --- a/debian/bcfg2.postrm +++ b/debian/bcfg2.postrm @@ -21,8 +21,14 @@ case "$1" in purge) for i in /etc/default/bcfg2 /etc/bcfg2.conf; do rm -f $i - # This might prove to be a bug, assuming that ucf is in /usr/sbin - test -x /usr/bin/ucf && ucf -p $i + + if which ucf >/dev/null; then + ucf --purge $1 + fi + if which ucfr >/dev/null; then + ucfr --purge bcfg2 $i + fi + done ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/buildsys/2.3/control.in b/debian/buildsys/2.3/control.in index 5d7c97d6a..a1abd1b11 100644 --- a/debian/buildsys/2.3/control.in +++ b/debian/buildsys/2.3/control.in @@ -3,6 +3,7 @@ Section: admin Priority: optional Maintainer: Sami Haahtinen <ressu@debian.org> Build-Depends: @cdbs@, python2.3-dev, python +Build-Depends-Indep: xsltproc, docbook-xsl Standards-Version: 3.7.2.0 Package: bcfg2 diff --git a/debian/buildsys/2.4/control.in b/debian/buildsys/2.4/control.in index 82ad5c056..0ad1ca844 100644 --- a/debian/buildsys/2.4/control.in +++ b/debian/buildsys/2.4/control.in @@ -3,6 +3,7 @@ Section: admin Priority: optional Maintainer: Sami Haahtinen <ressu@debian.org> Build-Depends: @cdbs@, python2.4-dev +Build-Depends-Indep: xsltproc, docbook-xsl Standards-Version: 3.7.2.0 Package: bcfg2 diff --git a/debian/buildsys/pycentral/control.in b/debian/buildsys/pycentral/control.in index e924f40f5..6663bba68 100644 --- a/debian/buildsys/pycentral/control.in +++ b/debian/buildsys/pycentral/control.in @@ -3,6 +3,7 @@ Section: admin Priority: optional Maintainer: Sami Haahtinen <ressu@debian.org> Build-Depends: @cdbs@ +Build-Depends-Indep: xsltproc, docbook-xsl Standards-Version: 3.7.2.0 XS-Python-Version: >= 2.3 @@ -20,7 +21,7 @@ Description: Configuration management client Package: bcfg2-server Architecture: all -Depends: ${python:Depends}, python-lxml (>= 0.8), python-fam | python2.3-gamin | python2.4-gamin , python-pyopenssl, libxml2-utils (>= 2.6.23), fam | gamin, lsb-base (>= 3.1-9), ucf, bcfg2 (= ${Source-Version}), python-cheetah +Depends: ${python:Depends}, python-lxml (>= 0.8), python-gamin | python-fam , python-pyopenssl, libxml2-utils (>= 2.6.23), gamin | fam, lsb-base (>= 3.1-9), ucf, bcfg2 (= ${Source-Version}), python-cheetah XB-Python-Version: ${python:Versions} Description: Configuration management server Bcfg2 is a configuration management system that generates configuration sets diff --git a/debian/rules b/debian/rules index 1b038c281..f4a10a6fe 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,7 @@ DEB_DH_INSTALLINIT_ARGS := -n else DEB_DH_INSTALLINIT_ARGS := --no-start endif +DEB_COMPRESS_EXCLUDE :=*.tif include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk @@ -41,3 +42,7 @@ binary-install/bcfg2-server :: cd doc && make manual.html dh_installinit -p$(cdbs_curpkg) -o endif + +# Build the manual page too +build/bcfg2-server:: + cd doc && make manual.html |