[pkg-wpa-devel] r851 - in /wpasupplicant/trunk/debian: changelog rules wpagui.install

[siretart at users.alioth.debian.org]

Author: siretart
Date: Sun Jun 17 09:29:40 2007
New Revision: 851

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=851
Log:
* Fix debian/rules and debian/wpa_gui.install to actually build and
  install the qt4 version of wpa_gui.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpagui.install

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=851&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jun 17 09:29:40 2007
@@ -1,5 +1,6 @@
 wpasupplicant (0.6.0-1) UNRELEASED; urgency=low
 
+  [Kel Modderman]
   * New upstream release.
     - restructured source layout
   * Adjust debian/wpasupplicant.examples, debian/wpagui.install,
@@ -18,6 +19,10 @@
     for those people who followed the poor example outlined in the hidden
     ssid's section of README.modes. Also remove the offending line from the
     documentaion. (Closes: #428137)
+
+  [Reinhard Tartler]
+  * Fix debian/rules and debian/wpa_gui.install to actually build and
+    install the qt4 version of wpa_gui.
 
  -- Kel Modderman <kel at otaku42.de>  Mon, 11 Jun 2007 11:59:56 +1000
 

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=851&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sun Jun 17 09:29:40 2007
@@ -5,10 +5,11 @@
 
 WPADIR=wpa_supplicant/
 QMAKE=qmake-qt4
-WPAGUI=wpa_gui
+WPAGUI=wpa_gui-qt4
 
 build/wpagui::
-	$(MAKE) -C $(WPADIR) $(WPAGUI)
+	cd $(WPADIR)$(WPAGUI) ; $(QMAKE)
+	$(MAKE) -C $(WPADIR)$(WPAGUI)
 
 build/wpasupplicant::
 	$(MAKE) -f debian/dot.config.mk DOTCONFIG=$(WPADIR).config

Modified: wpasupplicant/trunk/debian/wpagui.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpagui.install?rev=851&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpagui.install (original)
+++ wpasupplicant/trunk/debian/wpagui.install Sun Jun 17 09:29:40 2007
@@ -1,1 +1,1 @@
-wpa_supplicant/wpa_gui/wpa_gui usr/sbin/
+wpa_supplicant/wpa_gui-qt4/wpa_gui usr/sbin/