[pkg-wpa-devel] r1480 - in /wpasupplicant/trunk/debian: changelog rules wpasupplicant.postinst wpasupplicant.postrm wpasupplicant.preinst

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

Author: kelmo-guest
Date: Tue Feb 16 11:51:12 2010
New Revision: 1480

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1480
Log:
* Remove debian/wpasupplicant.postrm - it is no longer needed to
  handle purge of log files, none are created anymore.
* Enable make concurrency via dh --parallel option in debian/rules.

Removed:
    wpasupplicant/trunk/debian/wpasupplicant.postrm
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpasupplicant.postinst
    wpasupplicant/trunk/debian/wpasupplicant.preinst

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1480&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Feb 16 11:51:12 2010
@@ -61,8 +61,11 @@
   * Ensure wpa_supplicant/wpa_gui-qt4 is really clean, qmake seems to leave
     some crumbs (.obj, .moc & .ui).
   * Adjust debian/watch to scan for the 0.6.X stable releases only.
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 11 Feb 2010 17:30:53 +1000
+  * Remove debian/wpasupplicant.postrm - it is no longer needed to
+    handle purge of log files, none are created anymore.
+  * Enable make concurrency via dh --parallel option in debian/rules.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 16 Feb 2010 21:26:26 +1000
 
 wpasupplicant (0.6.9-3) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1480&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Tue Feb 16 11:51:12 2010
@@ -26,9 +26,11 @@
 
 override_dh_auto_build:
 	dh_auto_build --sourcedirectory=wpa_supplicant \
-	              --buildsystem=makefile
+	              --buildsystem=makefile \
+		      --parallel
 	dh_auto_build --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
-	              --buildsystem=qmake
+	              --buildsystem=qmake \
+		      --parallel
 
 override_dh_auto_clean:
 	dh_auto_clean --sourcedirectory=wpa_supplicant \

Modified: wpasupplicant/trunk/debian/wpasupplicant.postinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postinst?rev=1480&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postinst Tue Feb 16 11:51:12 2010
@@ -17,31 +17,11 @@
 
 set -e
 
-rm_conffile()
-{
-	CONFFILE="$1"
-
-	if [ -e "$CONFFILE" ]; then
-		echo "Removing obsolete conffile $CONFFILE"
-		rm -f "$CONFFILE"
-	fi
-}
-
 case "$1" in
 	configure)
 		# Add the netdev group unless it's already there
 		if ! getent group netdev >/dev/null; then
 			addgroup --quiet --system netdev || true
-		fi
-
-		# Remove obsolete conffiles
-		if dpkg --compare-versions "$2" lt "0.6.9-4"; then
-			rm_conffile /etc/logrotate.d/wpa_supplicant
-			rm_conffile /etc/logrotate.d/wpa_action
-		fi
-		if dpkg --compare-versions "$2" lt "0.6.10-1"; then
-			rm_conffile /etc/init.d/wpa-ifupdown
-			update-rc.d -f wpa-ifupdown remove >/dev/null
 		fi
 		;;
 	abort-upgrade|abort-deconfigure|abort-remove)

Modified: wpasupplicant/trunk/debian/wpasupplicant.preinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.preinst?rev=1480&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.preinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.preinst Tue Feb 16 11:51:12 2010
@@ -16,7 +16,7 @@
 
 set -e
 
-prep_rm_conffile() {
+rm_conffile() {
 	local PKGNAME="$1"
 	local CONFFILE="$2"
 
@@ -29,17 +29,21 @@
 		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
 }
 
 case "$1" in
 	install|upgrade)
 		if dpkg --compare-versions "$2" lt "0.6.9-4"; then
-			prep_rm_conffile wpasupplicant /etc/logrotate.d/wpa_supplicant
-			prep_rm_conffile wpasupplicant /etc/logrotate.d/wpa_action
+			rm_conffile wpasupplicant /etc/logrotate.d/wpa_supplicant
+			rm_conffile wpasupplicant /etc/logrotate.d/wpa_action
 		fi
 		if dpkg --compare-versions "$2" lt "0.6.10-1"; then
-			prep_rm_conffile wpasupplicant /etc/init.d/wpa-ifupdown
+			rm_conffile wpasupplicant /etc/init.d/wpa-ifupdown
+			update-rc.d -f wpa-ifupdown remove >/dev/null
 		fi
 		;;
 	abort-upgrade)