[pkg-wpa-devel] r1721 - in /wpa/trunk/debian: changelog rules

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

Author: slh-guest
Date: Fri Apr 13 23:54:56 2012
New Revision: 1721

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1721
Log:
fix clean target and make sure to succeed building twice in a row.

Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/rules

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1721&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Fri Apr 13 23:54:56 2012
@@ -24,6 +24,7 @@
   * convert packaging to Multi-Arch, bump compat level to 9 and debhelper
     build-dependency accordingly; all binaries are Multi-Arch=foreign.
   * update debian/copyright for wpa 1.0~rc2 and merged sources.
+  * fix clean target and make sure to succeed building twice in a row.
 
   [ Kel Modderman ]
   * export BINDIR=/sbin, the build system now requires it when patching
@@ -51,7 +52,7 @@
   * Remove Faidon Liambotis <paravoid at debian.org> from Uploaders as per
     his request, many thanks for all past efforts Faidon.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sat, 14 Apr 2012 00:58:32 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sat, 14 Apr 2012 01:34:13 +0200
 
 wpasupplicant (0.7.3-6) unstable; urgency=low
 

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1721&op=diff
==============================================================================
--- wpa/trunk/debian/rules (original)
+++ wpa/trunk/debian/rules Fri Apr 13 23:54:56 2012
@@ -64,8 +64,8 @@
 	              --buildsystem=makefile
 	dh_auto_clean --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
 	              --buildsystem=qmake
-	find wpa_supplicant/wpa_gui-qt4 -type d \
-		-name \.moc -o -name \.ui -o -name \.obj -delete
+	-find wpa_supplicant/wpa_gui-qt4 -type d \
+		-name \.moc -o -name \.ui -o -name \.obj -exec rm -rf {} \;
 	dh_auto_clean --sourcedirectory=hostapd \
 	              --buildsystem=makefile
 
@@ -73,7 +73,11 @@
 	$(info Skip dh_auto_install ...)
 
 override_dh_clean:
-	dh_clean wpa_supplicant/.config hostapd/.config wpa_supplicant/wpa_supplicant-udeb
+	# make sure to remove the staging directory for the udeb
+	rm -rf debian/wpasupplicant-udeb
+	dh_clean wpa_supplicant/.config \
+		 hostapd/.config \
+		 wpa_supplicant/wpa_supplicant-udeb
 
 override_dh_install:
 	dh_install