[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-71-gbbe3dd6

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 57cf293cdf74789ec039e476b20cdbedd99f4b7b
Merge: d48e7cbf5e541e61275d8539c84f455ab3ff6d68 dfb1b77479b0182147fa648762ab24f20002a47f
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue May 22 17:42:10 2012 +0400

    Merge commit 'dfb1b7747' (partially)
    
    bacula-director-<dbtype>.* changes was rejected.
      will be done on merging changes for generate files for all databases on fly
    
    some changes was merged in previous commit
    
    other changes was applied

diff --combined debian/bacula-console.postinst
index bb05260,0000000..a457fcd
mode 100644,000000..100644
--- a/debian/bacula-console.postinst
+++ b/debian/bacula-console.postinst
@@@ -1,63 -1,0 +1,33 @@@
 +#! /bin/sh
- # postinst script for bacula
- #
- # see: dh_installdeb(1)
 +
 +set -e
 +
- # summary of how this script can be called:
- #        * <postinst> `configure' <most-recently-configured-version>
- #        * <old-postinst> `abort-upgrade' <new version>
- #        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
- #          <new-version>
- #        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
- #          <failed-install-package> <version> `removing'
- #          <conflicting-package> <version>
- # for details, see http://www.debian.org/doc/debian-policy/ or
- # the debian-policy package
- #
- # quoting from the policy:
- #     Any necessary prompting should almost always be confined to the
- #     post-installation script, and should be protected with a conditional
- #     so that unnecessary prompting doesn't happen if a package's
- #     installation fails and the `postinst' is called with `abort-upgrade',
- #     `abort-remove' or `abort-deconfigure'.
 +
 +SRCDIR="/usr/share/bacula-common/defconfig"
 +DSTDIR="/etc/bacula"
 +CONFIG="bconsole.conf"
- 
 +CONSOLE=/usr/sbin/bacula-console
 +
++
 +case "$1" in
 +    configure)
 +	if [ ! -f $DSTDIR/$CONFIG ]; then
 +		TARGET=$DSTDIR/$CONFIG
 +	else
 +		TARGET=$DSTDIR/$CONFIG.dist
 +	fi
 +
 +	sed -e "s~@debian_hostname@~localhost~" < $SRCDIR/$CONFIG > $TARGET
 +
 +	chown root:bacula $TARGET
 +	chmod 640 $TARGET
 +    ;;
- 
-     abort-upgrade|abort-remove|abort-deconfigure)
- 
-     ;;
- 
-     *)
-         echo "postinst called with unknown argument \`$1'" >&2
-         exit 1
-     ;;
 +esac
 +
++
 +# dh_installdeb will replace this with shell code automatically
 +# generated by other debhelper scripts.
 +
 +#DEBHELPER#
 +
 +exit 0
- 
- 
diff --combined debian/bacula-traymonitor.postrm
index 1486980,0000000..219fa81
mode 100644,000000..100644
--- a/debian/bacula-traymonitor.postrm
+++ b/debian/bacula-traymonitor.postrm
@@@ -1,46 -1,0 +1,22 @@@
 +#! /bin/sh
- # postrm script for bacula
- #
- # see: dh_installdeb(1)
 +
 +set -e
 +
- # summary of how this script can be called:
- #        * <postrm> `remove'
- #        * <postrm> `purge'
- #        * <old-postrm> `upgrade' <new-version>
- #        * <new-postrm> `failed-upgrade' <old-version>
- #        * <new-postrm> `abort-install'
- #        * <new-postrm> `abort-install' <old-version>
- #        * <new-postrm> `abort-upgrade' <old-version>
- #        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
- # for details, see http://www.debian.org/doc/debian-policy/ or
- # the debian-policy package
 +
 +CFGDIR=/etc/bacula
 +CFGFILE="tray-monitor.conf"
 +
++
 +case "$1" in
 +    purge)
 +        rm -f $CFGDIR/$CFGFILE.*
 +    ;;
- 
-     remove)
-     ;;
- 
-     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- 
-     ;;
- 
-     *)
-         echo "postrm called with unknown argument \`$1'" >&2
-         exit 1
- 
 +esac
 +
++
 +# dh_installdeb will replace this with shell code automatically
 +# generated by other debhelper scripts.
 +
 +#DEBHELPER#
 +
 +exit 0

-- 
Bacula, a network backup, recovery and verification program