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

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

Author: slh-guest
Date: Tue May 24 23:25:00 2016
New Revision: 1967

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1967
Log:
* use --buildsystem=qmake_qt4 for debhelper (Closes: #823171).
* fix clean target, by splitting the find call into individual searches.

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=1967&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Tue May 24 23:25:00 2016
@@ -22,6 +22,8 @@
     - Remove newlines from wpa_supplicant config network output
     - Reject SET_CRED commands with newline characters in the string values
     - Reject SET commands with newline characters in the string values
+  * use --buildsystem=qmake_qt4 for debhelper (Closes: #823171).
+  * fix clean target, by splitting the find call into individual searches.
 
  -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 19 Aug 2015 03:00:19 +0200
 

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1967&op=diff
==============================================================================
--- wpa/trunk/debian/rules	(original)
+++ wpa/trunk/debian/rules	Tue May 24 23:25:00 2016
@@ -32,7 +32,7 @@
 ### start dh overrides
 override_dh_auto_configure:
 	dh_auto_configure --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
-	                  --buildsystem=qmake
+	                  --buildsystem=qmake_qt4
 
 override_dh_auto_build:
 	# build documentation
@@ -55,7 +55,7 @@
 		      --parallel
 	# build wpa_gui-qt4
 	dh_auto_build --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
-	              --buildsystem=qmake \
+	              --buildsystem=qmake_qt4 \
 		      --parallel
 	dh_auto_clean --sourcedirectory=src --buildsystem=makefile
 	# build hostapd
@@ -71,9 +71,10 @@
 	dh_auto_clean --sourcedirectory=wpa_supplicant \
 	              --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 -exec rm -rf {} \;
+	              --buildsystem=qmake_qt4
+	-find wpa_supplicant/wpa_gui-qt4 -type d -name \.moc -exec rm -rf {} \;
+	-find wpa_supplicant/wpa_gui-qt4 -type d -name \.ui  -exec rm -rf {} \;
+	-find wpa_supplicant/wpa_gui-qt4 -type d -name \.obj -exec rm -rf {} \;
 	dh_auto_clean --sourcedirectory=hostapd \
 	              --buildsystem=makefile