Add NMU

3 files changed, 34 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 5783e4f..b3f5b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+conntrack (1:0.9.14-2) unstable; urgency=low
+
+  * Integrate lost NMU from Stefan Fritsch. Thanks Stefan
+  * Prevent dpkg conffile prompt for unmodified conntrackd.conf when upgrading
+    from pre 1:0.9.12-1 (closes: #542662).
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 13 Feb 2010 11:17:59 +0100
+
 conntrack (1:0.9.14-1) unstable; urgency=low
 
   * New upstream version 
diff --git a/debian/conntrackd.postinst b/debian/conntrackd.postinst
new file mode 100644
index 0000000..847932b
--- /dev/null
+++ b/debian/conntrackd.postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+action=$1
+version=$2
+
+# package versions < 0.9.8-1 had the configuration file in a
+# non-standard location
+if [ "$action" = configure -a -n "$version" ] &&
+    dpkg --compare-versions "$version" lt "1:0.9.8-1" &&
+    test -f /etc/conntrackd.conf.dpkg-updating
+then
+    # unmodified version, delete without prompting
+    rm /etc/conntrackd.conf.dpkg-updating
+fi
+
+#DEBHELPER#
diff --git a/debian/conntrackd.preinst b/debian/conntrackd.preinst
index 1fae212..2bb65ef 100755
--- a/debian/conntrackd.preinst
+++ b/debian/conntrackd.preinst
@@ -11,7 +11,15 @@ if [ "$action" = upgrade -a -n "$version" ] &&
     # package versions < 0.9.8-1 had the configuration file in a
     # non-standard location
     mkdir -p /etc/conntrackd
-    mv /etc/conntrackd.conf /etc/conntrackd/conntrackd.conf
+    if md5sum /etc/conntrackd.conf 2> /dev/null |
+        grep -q 9e463d9bb7902e513da1b90b326bd43d
+    then
+        # unmodified version, dpkg should not prompt, delete in postinst
+        mv /etc/conntrackd.conf /etc/conntrackd.conf.dpkg-updating
+    else
+	# move to new location to make dpkg prompt
+        mv /etc/conntrackd.conf /etc/conntrackd/conntrackd.conf
+    fi
 fi
 
 #DEBHELPER#