[Pkg-samba-maint] r3127 - trunk/samba/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sun Nov 29 01:27:28 UTC 2009
tags 558116 pending
thanks
Author: vorlon
Date: 2009-11-29 01:27:28 +0000 (Sun, 29 Nov 2009)
New Revision: 3127
Added:
trunk/samba/debian/samba-common-bin.prerm
Removed:
trunk/samba/debian/samba-common.prerm
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/samba-common-bin.postinst
trunk/samba/debian/samba.postinst
trunk/samba/debian/samba.prerm
Log:
* The "I hate non-declarative alternatives" upload:
- debian/samba{,-common}.prerm: don't call update-alternatives --remove
on upgrade, /do/ call it on other invocations of the prerm script. If
these tools ever go away, the removal needs to be handled on upgrade by
the maintainer scripts of the new package version.
- debian/samba{,-common-bin}.postinst: call update-alternatives
unconditionally, don't second-guess the maintainer script arguments.
- debian/samba.postinst: call update-alternatives after the debconf
handling, not before; debconf triggers a re-exec of the script so
anything done before invoking debconf is wasted because it will be
re-done, and if there's already a debconf frontend running when this
is called, the not-redirected update-alternatives output will confuse
it. Closes: #558116.
- debian/samba-common.prerm: move to samba-common-bin, this is the package
that owns these binaries.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2009-11-28 17:44:54 UTC (rev 3126)
+++ trunk/samba/debian/changelog 2009-11-29 01:27:28 UTC (rev 3127)
@@ -1,10 +1,28 @@
samba (2:3.4.3-2) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* Switch to source format 3.0 (quilt)
* Better adapt "add machine script" example to adduser
Thanks to Heiko Schlittermann for the suggestion
Closes: #555466
+ [ Steve Langasek ]
+ * The "I hate non-declarative alternatives" upload:
+ - debian/samba{,-common}.prerm: don't call update-alternatives --remove
+ on upgrade, /do/ call it on other invocations of the prerm script. If
+ these tools ever go away, the removal needs to be handled on upgrade by
+ the maintainer scripts of the new package version.
+ - debian/samba{,-common-bin}.postinst: call update-alternatives
+ unconditionally, don't second-guess the maintainer script arguments.
+ - debian/samba.postinst: call update-alternatives after the debconf
+ handling, not before; debconf triggers a re-exec of the script so
+ anything done before invoking debconf is wasted because it will be
+ re-done, and if there's already a debconf frontend running when this
+ is called, the not-redirected update-alternatives output will confuse
+ it. Closes: #558116.
+ - debian/samba-common.prerm: move to samba-common-bin, this is the package
+ that owns these binaries.
+
-- Christian Perrier <bubulle at debian.org> Sun, 08 Nov 2009 15:04:24 +0100
samba (2:3.4.3-1) unstable; urgency=low
Modified: trunk/samba/debian/samba-common-bin.postinst
===================================================================
--- trunk/samba/debian/samba-common-bin.postinst 2009-11-28 17:44:54 UTC (rev 3126)
+++ trunk/samba/debian/samba-common-bin.postinst 2009-11-29 01:27:28 UTC (rev 3127)
@@ -4,14 +4,11 @@
set -e
-if [ "$1" = "configure" ]
-then
- update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
- --slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
- update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
- --slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
- update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
- --slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
-fi
+update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+ --slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
+update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+ --slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
+update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+ --slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
#DEBHELPER#
Copied: trunk/samba/debian/samba-common-bin.prerm (from rev 3126, trunk/samba/debian/samba-common.prerm)
===================================================================
--- trunk/samba/debian/samba-common-bin.prerm (rev 0)
+++ trunk/samba/debian/samba-common-bin.prerm 2009-11-29 01:27:28 UTC (rev 3127)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "x$1" != xupgrade ]; then
+ update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
+ update-alternatives --remove net /usr/bin/net.samba3
+ update-alternatives --remove testparm /usr/bin/testparm.samba3
+fi
+
+#DEBHELPER#
+
+exit 0
Deleted: trunk/samba/debian/samba-common.prerm
===================================================================
--- trunk/samba/debian/samba-common.prerm 2009-11-28 17:44:54 UTC (rev 3126)
+++ trunk/samba/debian/samba-common.prerm 2009-11-29 01:27:28 UTC (rev 3127)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
- update-alternatives --remove net /usr/bin/net.samba3
- update-alternatives --remove testparm /usr/bin/testparm.samba3
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst 2009-11-28 17:44:54 UTC (rev 3126)
+++ trunk/samba/debian/samba.postinst 2009-11-29 01:27:28 UTC (rev 3127)
@@ -4,23 +4,6 @@
#
#
-case "$1" in
- configure)
- update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10 \
- --slave /usr/share/man/man1/smbstatus.1.gz smbstatus.1.gz /usr/share/man/man1/smbstatus.samba3.1.gz
- # continue below
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- exit 0
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
# Handle debconf
. /usr/share/debconf/confmodule
@@ -139,6 +122,9 @@
install -d -m 1770 -g sambashare /var/lib/samba/usershares
fi
+update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10 \
+ --slave /usr/share/man/man1/smbstatus.1.gz smbstatus.1.gz /usr/share/man/man1/smbstatus.samba3.1.gz
+
#DEBHELPER#
exit 0
Modified: trunk/samba/debian/samba.prerm
===================================================================
--- trunk/samba/debian/samba.prerm 2009-11-28 17:44:54 UTC (rev 3126)
+++ trunk/samba/debian/samba.prerm 2009-11-29 01:27:28 UTC (rev 3127)
@@ -2,11 +2,9 @@
set -e
-case "$1" in
- remove|upgrade|deconfigure)
+if [ "x$1" != xupgrade ]; then
update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
- ;;
-esac
+fi
#DEBHELPER#
More information about the Pkg-samba-maint
mailing list