From 9119613d5b2089de5821e25aff5678579f97ff9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 4 May 2015 20:19:15 +0200
Subject: d/libsane-common.preinst: remove unused parts; add remove of
 /etc/sane.d/v4l.conf

---
 debian/changelog              |  5 +++++
 debian/libsane-common.preinst | 30 +++++-------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 9195365..6822ed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,11 @@ sane-backends (1.0.24-10) unstable; urgency=high
   * debian/saned@.service:
     - Change StandardInput=socket to StandardInput=null to enable
       working over network (Closes: #782971).
+  * debian/libsane-common.preinst:
+    - Remove oldstyle rm_conffile() function.
+    - Remove obsolete transition from the old-style udev setup.
+    - Add remove obsolete /etc/sane.d/v4l.conf via dpkg-maintscript-helper
+      command rm_conffile.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 01 May 2015 09:14:07 +0200
 
diff --git a/debian/libsane-common.preinst b/debian/libsane-common.preinst
index 6dad339..2a04fd6 100644
--- a/debian/libsane-common.preinst
+++ b/debian/libsane-common.preinst
@@ -1,32 +1,12 @@
 #!/bin/sh
 set -e
 
-# From http://wiki.debian.org/DpkgConffileHandling
-# Remove a no-longer used conffile
-rm_conffile() {
-    PKGNAME="$1"
-    CONFFILE="$2"
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
-        if [ "$md5sum" != "$old_md5sum" ]; then
-            echo "Obsolete conffile $CONFFILE has been modified by you."
-            echo "Saving as $CONFFILE.dpkg-bak ..."
-            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-        else
-            echo "Removing obsolete conffile $CONFFILE ..."
-            rm -f "$CONFFILE"
-        fi
-    fi
-}
-
-if [ "$1" = install ] || [ "$1" = upgrade ]; then
-    ## Transition from the old-style udev setup to the old-style dh_installudev setup
-    ## Then dh_installudev will take care of the transition to the new dh_installudev setup
-    if [ -e "/etc/udev/rules.d/025_libsane.rules" ]; then
-        mv /etc/udev/rules.d/025_libsane.rules /etc/udev/rules.d/z60_libsane.rules
-    fi
 
+if [ "$1" = upgrade ]; then
+#
+# remove obsolete conffile
+#
+    rm_conffile /etc/sane.d/v4l.conf 1.0.24-10
 fi
 
 #DEBHELPER#
-- 
cgit v1.2.3