[Pkg-samba-maint] [samba] 01/02: /etc/init.d/samba exists again as an init script, so drop ill-fated code which tries to remove it in the postinst. LP: #1216438.

[Steve Langasek]

This is an automated email from the git hooks/post-receive script.

vorlon pushed a commit to branch ubuntu
in repository samba.

commit 75a404a29ef2bbb7fac865df502ad88ba396f3f9
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Sun Aug 25 10:03:24 2013 -0700

    /etc/init.d/samba exists again as an init script, so drop ill-fated code
    which tries to remove it in the postinst.  LP: #1216438.
---
 debian/changelog         |    7 +++++++
 debian/samba.maintscript |    1 -
 debian/samba.postinst    |    2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87d1b94..de679b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:3.6.18-1ubuntu2) UNRELEASED; urgency=low
+
+  * /etc/init.d/samba exists again as an init script, so drop ill-fated
+    code which tries to remove it in the postinst.  LP: #1216438.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sun, 25 Aug 2013 10:02:43 -0700
+
 samba (2:3.6.18-1ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/samba.maintscript b/debian/samba.maintscript
index 32d8e06..91bcd64 100644
--- a/debian/samba.maintscript
+++ b/debian/samba.maintscript
@@ -1,2 +1 @@
 rm_conffile /etc/network/if-up.d/samba 2:3.6.5-6~ samba
-rm_conffile /etc/init.d/samba 2:3.6.15-2~ samba
diff --git a/debian/samba.postinst b/debian/samba.postinst
index 8862971..79445e1 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -71,6 +71,4 @@ update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.sa
 
 #DEBHELPER#
 
-update-rc.d samba remove > /dev/null
-
 exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git