[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-71-gbbe3dd6
Alexander Golovko
alexandro at ankalagon.ru
Wed May 23 13:55:45 UTC 2012
The following commit has been merged in the master branch:
commit d48e7cbf5e541e61275d8539c84f455ab3ff6d68
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Tue May 22 17:35:03 2012 +0400
merge part of changes from dfb1b77
diff --git a/debian/bacula-common.postinst b/debian/bacula-common.postinst
index 9c7446a..7f49059 100644
--- a/debian/bacula-common.postinst
+++ b/debian/bacula-common.postinst
@@ -1,29 +1,10 @@
#! /bin/sh
-# postinst script for bacula-director-common
-#
+
+set -e
. /usr/share/debconf/confmodule
db_version 2.0
-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'.
case "$1" in
configure)
@@ -34,26 +15,13 @@ case "$1" in
. /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords # create our common passwords if needed
-
- ;;
-
- 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 --git a/debian/bacula-common.postrm b/debian/bacula-common.postrm
index 085a6ca..2e95566 100644
--- a/debian/bacula-common.postrm
+++ b/debian/bacula-common.postrm
@@ -1,22 +1,7 @@
#! /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
-
case "$1" in
purge)
@@ -26,17 +11,9 @@ case "$1" in
rm -rf /var/log/bacula
rm -rf /var/lib/bacula
;;
-
- 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.
diff --git a/debian/bacula-common.preinst b/debian/bacula-common.preinst
index d79a7de..62c6e32 100644
--- a/debian/bacula-common.preinst
+++ b/debian/bacula-common.preinst
@@ -1,45 +1,9 @@
#! /bin/bash
-# preinst script for bacula
-#
set -e
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-create_bacula_do_not_run()
-{
- if [ "$1" = "install" -a "$#" -eq 1 ]; then
- test -d /etc/bacula || mkdir -p /etc/bacula
-
- cat > /etc/bacula/do_not_run <<EOF
-If this file exists as /etc/bacula/do_not_run, none of the Bacula daemons
-will start.
-This is to allow you time to configure things before Bacula tries to
-do anything.
-
-To make Bacula start, rename or remove this file.
-EOF
-
- fi
-
-}
-
-
-#if [ "$1" = "install" -a "$#" -eq 1 ]; then
-# create_bacula_do_not_run()
-#fi
-
case "$1" in
-
install)
if ! getent passwd bacula >/dev/null; then
echo -n "Adding user 'bacula'... "
@@ -60,20 +24,12 @@ case "$1" in
mv /var/lib/bacula/log /var/log/bacula/log
fi
;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst 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 --git a/debian/bacula-console.postrm b/debian/bacula-console.postrm
index c81055e..ed0794c 100644
--- a/debian/bacula-console.postrm
+++ b/debian/bacula-console.postrm
@@ -1,21 +1,7 @@
#! /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
CONSOLE=/usr/sbin/bacula-console
CFGDIR=/etc/bacula
@@ -25,20 +11,9 @@ 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.
diff --git a/debian/bacula-director-common.postinst b/debian/bacula-director-common.postinst
deleted file mode 100644
index 25032d3..0000000
--- a/debian/bacula-director-common.postinst
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/bash
-# postinst script for bacula-director-common
-#
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-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="bacula-dir.conf"
-
-
-case "$1" in
- configure)
-
- ;;
-
- 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 --git a/debian/bacula-director-common.postrm b/debian/bacula-director-common.postrm
deleted file mode 100644
index a58f281..0000000
--- a/debian/bacula-director-common.postrm
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /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
-
-
-case "$1" in
- purge)
- ;;
-
- 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
diff --git a/debian/bacula-fd.prerm b/debian/bacula-fd.prerm
deleted file mode 100644
index 163cd1d..0000000
--- a/debian/bacula-fd.prerm
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# prerm script for bacula-fd
-#
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/bacula.info.gz
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm 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 --git a/debian/bacula-sd.prerm b/debian/bacula-sd.prerm
deleted file mode 100644
index c50fc88..0000000
--- a/debian/bacula-sd.prerm
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# prerm script for bacula-sd
-#
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/bacula.info.gz
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm 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
More information about the pkg-bacula-commits
mailing list