Hi,

Attached is the diff for my isns 2.1-01+dfsg-2.1 NMU.
diff -u isns-2.1-01+dfsg/debian/dirs isns-2.1-01+dfsg/debian/dirs
--- isns-2.1-01+dfsg/debian/dirs
+++ isns-2.1-01+dfsg/debian/dirs
@@ -1,2 +1,2 @@
-usr/bin
 usr/sbin
+var/lib/isns
diff -u isns-2.1-01+dfsg/debian/changelog isns-2.1-01+dfsg/debian/changelog
--- isns-2.1-01+dfsg/debian/changelog
+++ isns-2.1-01+dfsg/debian/changelog
@@ -1,3 +1,20 @@
+isns (2.1-01+dfsg-2.1) unstable; urgency=high
+
+  * NMU:
+  [ Meike Reichle ]
+  * created patches/iSNSLinux.c_var_lib.patch and changed
+    dirs (Closes: #465782)
+  * Added preinst in order to ensure upgrade path
+  * urgency high for RC bug fix
+
+  [ Alexander Schmehl ]
+  * Adding postrm to rm /var/lib/isns on purge as suggested by Pierre Habouzit
+  * stoping service on removal
+  * mv files in preinst
+  * restart service
+
+ -- Meike Reichle <[EMAIL PROTECTED]>  Fri, 04 Apr 2008 23:19:37 +0200
+
 isns (2.1-01+dfsg-2) unstable; urgency=low
 
   * Fix location of pid file (Closes: #462006)
diff -u isns-2.1-01+dfsg/debian/patches/series isns-2.1-01+dfsg/debian/patches/series
--- isns-2.1-01+dfsg/debian/patches/series
+++ isns-2.1-01+dfsg/debian/patches/series
@@ -3,0 +4 @@
+iSNSLinux.c_var_lib.patch
only in patch2:
unchanged:
--- isns-2.1-01+dfsg.orig/debian/patches/iSNSLinux.c_var_lib.patch
+++ isns-2.1-01+dfsg/debian/patches/iSNSLinux.c_var_lib.patch
@@ -0,0 +1,16 @@
+Index: isns-2.1-01+dfsg/isnsserver/src/iSNSLinux.c
+===================================================================
+--- isns-2.1-01+dfsg.orig/isnsserver/src/iSNSLinux.c	2008-03-20 14:30:43.000000000 +0100
++++ isns-2.1-01+dfsg/isnsserver/src/iSNSLinux.c	2008-03-20 14:33:10.000000000 +0100
+@@ -210,8 +210,9 @@
+       }
+    }
+ 
+-   rc = mkdir("/var/isns",0777);
+-   rc = chdir("/var/isns");
++   //rc = mkdir("/var/isns",0777);
++   //In Debian this belongs in /var/lib/isns, created by dh_installdirs
++   rc = chdir("/var/lib/isns");
+ 
+    if (daemon_state == TRUE)
+    {
only in patch2:
unchanged:
--- isns-2.1-01+dfsg.orig/debian/preinst
+++ isns-2.1-01+dfsg/debian/preinst
@@ -0,0 +1,42 @@
+#!/bin/sh
+# preinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    upgrade)
+        ## 2.1-01+dfsg-2 and earlier stored their data in wrong path (see #465782)
+	if [ -d /var/isns ]
+	then
+		mv /var/isns /var/lib/isns/
+	fi
+    ;;
+
+    install|abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
only in patch2:
unchanged:
--- isns-2.1-01+dfsg.orig/debian/postinst
+++ isns-2.1-01+dfsg/debian/postinst
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    	invoke-rc.d isns restart
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
only in patch2:
unchanged:
--- isns-2.1-01+dfsg.orig/debian/postrm
+++ isns-2.1-01+dfsg/debian/postrm
@@ -0,0 +1,46 @@
+#!/bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+    	## clean data from isns
+    	rm -rf /var/lib/isns
+    ;;
+    remove)
+    	invoke-rc.d isns stop
+    ;;
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Reply via email to