[pkg-wpa-devel] r1099 - in /wpasupplicant/trunk/debian: changelog patches/05_qmake_version_makefile.patch patches/series

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

Author: kelmo-guest
Date: Mon Feb  4 06:00:00 2008
New Revision: 1099

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1099
Log:
* Add patch to invoke versioned qmake binary when preparing the Makefile for
  wpa_gui/wpa_gui-qt4 or else a failure to build from source can be possible
  when more than one QT version is installed. (Closes: #463547)
  - debian/patches/05_qmake_version_makefile.patch

Added:
    wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1099&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Feb  4 06:00:00 2008
@@ -1,3 +1,12 @@
+wpasupplicant (0.6.2+git20080202.gde6ccd7-2) unstable; urgency=low
+
+  * Add patch to invoke versioned qmake binary when preparing the Makefile for
+    wpa_gui/wpa_gui-qt4 or else a failure to build from source can be possible
+    when more than one QT version is installed. (Closes: #463547)
+    - debian/patches/05_qmake_version_makefile.patch
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 04 Feb 2008 15:59:42 +1000
+
 wpasupplicant (0.6.2+git20080202.gde6ccd7-1) unstable; urgency=low
 
   * New Upstream git snapshot.

Added: wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch?rev=1099&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch (added)
+++ wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch Mon Feb  4 06:00:00 2008
@@ -1,0 +1,18 @@
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -1066,13 +1066,13 @@
+ 	$(STRIP) $(WINALL)
+ 
+ wpa_gui/Makefile:
+-	qmake -o wpa_gui/Makefile wpa_gui/wpa_gui.pro 
++	qmake-qt3 -o wpa_gui/Makefile wpa_gui/wpa_gui.pro
+ 
+ wpa_gui: wpa_gui/Makefile
+ 	$(MAKE) -C wpa_gui
+ 
+ wpa_gui-qt4/Makefile:
+-	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro 
++	qmake-qt4 -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
+ 
+ wpa_gui-qt4: wpa_gui-qt4/Makefile
+ 	$(MAKE) -C wpa_gui-qt4

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1099&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Mon Feb  4 06:00:00 2008
@@ -3,6 +3,7 @@
 02_dbus_group_policy.patch
 03_dbus_service_activation_logfile.patch
 04_append_mmd_to_default_cflags.patch
+05_qmake_version_makefile.patch
 20_madwifi_headers.patch
 21_config_driver_madwifi.patch
 30_src_clean_existing_dirs.patch