[Pkg-mpd-commits] [pkg-mpd] 08/09: Clean up START_MPD transition ("obsolete after jessie")

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 6ab3571dd1f6199640d0d6174f70ca668136f895
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Feb 14 21:13:03 2017 +0100

    Clean up START_MPD transition ("obsolete after jessie")
---
 debian/mpd.lintian-overrides |  4 ----
 debian/mpd.postinst          |  6 ------
 debian/mpd.preinst           | 20 --------------------
 3 files changed, 30 deletions(-)

diff --git a/debian/mpd.lintian-overrides b/debian/mpd.lintian-overrides
index 389fcee..3d88b07 100644
--- a/debian/mpd.lintian-overrides
+++ b/debian/mpd.lintian-overrides
@@ -1,6 +1,2 @@
-# update-rc.d is only called on upgrade, which is not forbidden and actually makes sense here
-preinst-calls-updaterc.d mpd
-# not setting -e on purpose
-maintainer-script-ignores-errors preinst
 # this is from the Avahi API
 spelling-error-in-binary usr/bin/mpd UNCOMMITED UNCOMMITTED
diff --git a/debian/mpd.postinst b/debian/mpd.postinst
index dd4c349..207ac32 100644
--- a/debian/mpd.postinst
+++ b/debian/mpd.postinst
@@ -28,10 +28,4 @@ if [ "$ACTION" = "configure" ]; then
     fi
 fi
 
-# disable mpd for (new) systemd units if START_MPD was not true
-if [ -f /var/lib/mpd/NO_START ]; then
-    rm /var/lib/mpd/NO_START
-    deb-systemd-helper update-state mpd.socket mpd.service
-fi
-
 #DEBHELPER#
diff --git a/debian/mpd.preinst b/debian/mpd.preinst
deleted file mode 100644
index 101c0a6..0000000
--- a/debian/mpd.preinst
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# don't fail if this doesn't work
-#set -e
-
-ACTION="$1"
-VERSION="$2"
-
-# transition away from START_MPD=false (obsolete after jessie)
-if [ "$ACTION" = "upgrade" ]; then
-    [ -r /etc/default/mpd ] && . /etc/default/mpd
-    if grep -q START_MPD /etc/default/mpd && [ "x$START_MPD" != "xtrue" ]; then
-        touch /var/lib/mpd/NO_START
-        update-rc.d mpd disable > /dev/null
-        # attempt to reset /etc/default/mpd to unmodified state
-        sed -i -e's/^START_MPD=.*$/START_MPD=true/' /etc/default/mpd
-    fi
-fi
-
-#DEBHELPER#

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