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

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

Author: kelmo-guest
Date: Sat Jun 14 01:52:21 2008
New Revision: 1200

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1200
Log:
Reinstate WPAGUI variable, only remove QMAKE

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/rules

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1200&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat Jun 14 01:52:21 2008
@@ -33,10 +33,10 @@
   * Don't install the wpa_supplicant/eap_testing.txt document, it contains
     information about development features and testing that is not possible
     with what is provided by the wpasupplicant package.
-  * Remove the QMAKE and WPAGUI variable from debian/rules, they are no longer
-    useful with upstream build system.
-
- -- Kel Modderman <kel at otaku42.de>  Sat, 14 Jun 2008 11:49:00 +1000
+  * Remove the QMAKE variable from debian/rules, it is no longer used with
+    upstream build system.
+
+ -- Kel Modderman <kel at otaku42.de>  Sat, 14 Jun 2008 11:52:05 +1000
 
 wpasupplicant (0.6.3-2) UNRELEASED; urgency=low
 

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1200&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sat Jun 14 01:52:21 2008
@@ -4,6 +4,8 @@
 #export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make
+
+WPAGUI = wpa_gui-qt4
 
 CFLAGS = -Wall -g
 LDFLAGS = -Wl,--as-needed
@@ -32,7 +34,7 @@
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C wpa_supplicant all
 	
 	# wpa_gui
-	$(MAKE) -C wpa_supplicant wpa_gui-qt4
+	$(MAKE) -C wpa_supplicant $(WPAGUI)
 	
 	# manpages
 	$(MAKE) -C wpa_supplicant/doc/docbook man