r291 - in /unstable/madwifi-tools/debian: changelog control postinst preinst rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Mon Aug 27 13:41:20 2007
New Revision: 291

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=291
Log:
* Install ifupdown hooks to /etc/network/if-pre-up.d/050madwifi and
  /etc/network/if-post-down.d/z50madwifi. This also involves management of
  previous conffiles provided by this package and the movement from old
  location to new location via preinst/postinst scripts described at
  http://wiki.debian.org/DpkgConffileHandling. (Closes: #427713)
* Suggest, and not Recommend, madwifi-doc. (Closes: #435866)
* Don't replace madwifi-ng-tools, this package never existed in debian.

Added:
    unstable/madwifi-tools/debian/postinst
    unstable/madwifi-tools/debian/preinst
Modified:
    unstable/madwifi-tools/debian/changelog
    unstable/madwifi-tools/debian/control
    unstable/madwifi-tools/debian/rules

Modified: unstable/madwifi-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/changelog?rev=291&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/changelog (original)
+++ unstable/madwifi-tools/debian/changelog Mon Aug 27 13:41:20 2007
@@ -1,3 +1,15 @@
+madwifi-tools (1:0.9.3+dfsg-3) unstable; urgency=low
+
+  * Install ifupdown hooks to /etc/network/if-pre-up.d/050madwifi and
+    /etc/network/if-post-down.d/z50madwifi. This also involves management of
+    previous conffiles provided by this package and the movement from old
+    location to new location via preinst/postinst scripts described at
+    http://wiki.debian.org/DpkgConffileHandling. (Closes: #427713)
+  * Suggest, and not Recommend, madwifi-doc. (Closes: #435866)
+  * Don't replace madwifi-ng-tools, this package never existed in debian.
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 27 Aug 2007 23:34:38 +1000
+
 madwifi-tools (1:0.9.3+dfsg-2) unstable; urgency=low
 
   * Restrict build archs to alpha amd64 arm hurd-i386 i386 mips mipsel powerpc

Modified: unstable/madwifi-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/control?rev=291&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/control (original)
+++ unstable/madwifi-tools/debian/control Mon Aug 27 13:41:20 2007
@@ -11,9 +11,8 @@
 Package: madwifi-tools
 Architecture: alpha amd64 arm hurd-i386 i386 mips mipsel powerpc sparc
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: madwifi-doc, madwifi-source
-Replaces: madwifi-ng-tools
-Suggests: bridge-utils, hostapd, wpasupplicant, wireless-tools
+Recommends: madwifi-source
+Suggests: bridge-utils, hostapd, wpasupplicant, wireless-tools, madwifi-doc
 Description: tools for the Multiband Atheros Driver for WiFi
  This package provides userspace tools for the madwifi driver. The tools are
  required to use and manipulate the madwifi interfaces present in a system.

Added: unstable/madwifi-tools/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/postinst?rev=291&op=file
==============================================================================
--- unstable/madwifi-tools/debian/postinst (added)
+++ unstable/madwifi-tools/debian/postinst Mon Aug 27 13:41:20 2007
@@ -1,0 +1,26 @@
+#!/bin/sh -e
+
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+	OLDCONFFILE="$1"
+	NEWCONFFILE="$2"
+
+	if [ -e "$OLDCONFFILE" ]; then
+		echo "Preserving user changes to $NEWCONFFILE ..."
+		mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+		mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+	fi
+}
+
+case "$1" in
+	configure)
+		if dpkg --compare-versions "$2" le "1:0.9.3+dfsg-2"; then
+			mv_conffile /etc/network/if-pre-up.d/madwifi \
+				/etc/network/if-pre-up.d/050madwifi
+			mv_conffile /etc/network/if-post-down.d/madwifi \
+				/etc/network/if-post-down.d/z50madwifi
+		fi
+		;;
+esac
+
+#DEBHELPER#

Added: unstable/madwifi-tools/debian/preinst
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/preinst?rev=291&op=file
==============================================================================
--- unstable/madwifi-tools/debian/preinst (added)
+++ unstable/madwifi-tools/debian/preinst Mon Aug 27 13:41:20 2007
@@ -1,0 +1,26 @@
+#!/bin/sh -e
+
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_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
+			rm -f "$CONFFILE"
+		fi
+	fi
+}
+
+case "$1" in
+	install|upgrade)
+		if dpkg --compare-versions "$2" le "1:0.9.3+dfsg-2"; then
+			prep_mv_conffile madwifi-tools /etc/network/if-pre-up.d/madwifi
+			prep_mv_conffile madwifi-tools /etc/network/if-post-down.d/madwifi
+		fi
+		;;
+esac
+
+#DEBHELPER#

Modified: unstable/madwifi-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/rules?rev=291&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/rules (original)
+++ unstable/madwifi-tools/debian/rules Mon Aug 27 13:41:20 2007
@@ -33,9 +33,9 @@
 	done
 	# ifupdown helper scripts
 	install -D -m 0755 debian/pre-up \
-		debian/madwifi-tools/etc/network/if-pre-up.d/madwifi
+		debian/madwifi-tools/etc/network/if-pre-up.d/050madwifi
 	install -D -m 0755 debian/post-down \
-		debian/madwifi-tools/etc/network/if-post-down.d/madwifi
+		debian/madwifi-tools/etc/network/if-post-down.d/z50madwifi
 
 get-orig-source:
 	@dh_testdir