[Pkg-samba-maint] r4077 - trunk/samba/debian
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Wed May 9 18:44:46 UTC 2012
Author: bubulle
Date: 2012-05-09 18:44:46 +0000 (Wed, 09 May 2012)
New Revision: 4077
Added:
trunk/samba/debian/swat.postrm
Removed:
trunk/samba/debian/swat.prerm
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/samba.postrm
trunk/samba/debian/samba.prerm
Log:
Revert r4076
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2012-05-09 16:02:40 UTC (rev 4076)
+++ trunk/samba/debian/changelog 2012-05-09 18:44:46 UTC (rev 4077)
@@ -29,8 +29,6 @@
prefer this over removing the waf binary and repack upstream
tarball.
Closes: #654499
- * Move update-inetd calls from postrm scripts to prerm.
- Closes: #644963
-- Christian Perrier <bubulle at debian.org> Mon, 07 May 2012 22:16:32 +0200
Modified: trunk/samba/debian/samba.postrm
===================================================================
--- trunk/samba/debian/samba.postrm 2012-05-09 16:02:40 UTC (rev 4076)
+++ trunk/samba/debian/samba.postrm 2012-05-09 18:44:46 UTC (rev 4077)
@@ -10,6 +10,15 @@
# Remove init.d configuration file
echo Removing configuration file /etc/default/samba... >&2
rm -f /etc/default/samba
+
+ # Remove NetBIOS entries from /etc/inetd.conf
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --remove netbios-ssn
+ fi
+else
+ # Not purging, do not remove NetBIOS entries from /etc/inetd.conf
+ update-inetd --disable netbios-ssn
+
fi
#DEBHELPER#
Modified: trunk/samba/debian/samba.prerm
===================================================================
--- trunk/samba/debian/samba.prerm 2012-05-09 16:02:40 UTC (rev 4076)
+++ trunk/samba/debian/samba.prerm 2012-05-09 18:44:46 UTC (rev 4077)
@@ -6,16 +6,6 @@
update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
fi
-if [ "$1" = purge ]; then
- # Remove NetBIOS entries from /etc/inetd.conf
- if [ -x /usr/sbin/update-inetd ]; then
- update-inetd --remove netbios-ssn
- fi
-else
- # Not purging, do not remove NetBIOS entries from /etc/inetd.conf
- update-inetd --disable netbios-ssn
-fi
-
#DEBHELPER#
exit 0
Copied: trunk/samba/debian/swat.postrm (from rev 4075, trunk/samba/debian/swat.postrm)
===================================================================
--- trunk/samba/debian/swat.postrm (rev 0)
+++ trunk/samba/debian/swat.postrm 2012-05-09 18:44:46 UTC (rev 4077)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+case "$1" in
+ purge)
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --remove swat
+ fi
+ ;;
+ remove)
+ update-inetd --disable swat
+ ;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+ *)
+ echo "$0: unknown action \"$1\""
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
Deleted: trunk/samba/debian/swat.prerm
===================================================================
--- trunk/samba/debian/swat.prerm 2012-05-09 16:02:40 UTC (rev 4076)
+++ trunk/samba/debian/swat.prerm 2012-05-09 18:44:46 UTC (rev 4077)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-case "$1" in
- purge)
- if [ -x /usr/sbin/update-inetd ]; then
- update-inetd --remove swat
- fi
- ;;
- remove)
- update-inetd --disable swat
- ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
- *)
- echo "$0: unknown action \"$1\""
- exit 0
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
More information about the Pkg-samba-maint
mailing list