[pkg-wpa-devel] r1458 - in /wpasupplicant/trunk/debian: NEWS README.source changelog control rules source/ source/format watch wpasupplicant.examples

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Fri Jan 29 14:27:56 UTC 2010 

Author: kelmo-guest
Date: Fri Jan 29 14:27:55 2010
New Revision: 1458

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1458
Log:
* New upstream release.
  - wpa_msg_ctrl helper which can send messages to the control interface
    without logging when running in non-debug mode. Used for
    CTRL-EVENT-SCAN-RESULTS. (Closes: #539915) (LP: #352118)
* Do not use sed to comment all network blocks out in the example
  wpa_supplicant.conf.
* Do not strip upstream manual pages from source tree, do no generate
  them at build time, do not build-depend on dockbook.
  - build depend on debhelper (>= 7.0.50~) dh override support
* Use 3.0 (quilt) package format, drop build dependency of quilt and remove
  debian/README.source.
* Remove uupdate command from debian/watch, it is no longer useful.

Added:
    wpasupplicant/trunk/debian/source/
    wpasupplicant/trunk/debian/source/format
Removed:
    wpasupplicant/trunk/debian/README.source
Modified:
    wpasupplicant/trunk/debian/NEWS
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/watch
    wpasupplicant/trunk/debian/wpasupplicant.examples

Modified: wpasupplicant/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/NEWS?rev=1458&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/NEWS (original)
+++ wpasupplicant/trunk/debian/NEWS Fri Jan 29 14:27:55 2010
@@ -1,4 +1,4 @@
-wpasupplicant (0.6.2-2) unstable; urgency=low
+wpasupplicant (0.6.2-1) unstable; urgency=low
 
   The -w (wait for network interface to exist) command line option no longer
   exists. If you have scripts that require this option, it is time to change

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1458&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Jan 29 14:27:55 2010
@@ -1,11 +1,9 @@
 wpasupplicant (0.6.10-1) UNRELEASED; urgency=low
 
-  * New upstream release
-  * Backport a series of WEXT driver wrapper enhancements from upstream
-    development tree. See each patch's header for more details.
-    - 12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch
-    - 13_deauthenticate_fixup.patch
-    - 14_start_and_finish_with_clean_slate.patch
+  * New upstream release.
+    - wpa_msg_ctrl helper which can send messages to the control interface
+      without logging when running in non-debug mode. Used for
+      CTRL-EVENT-SCAN-RESULTS. (Closes: #539915) (LP: #352118)
   * Disable building of atmel driver backend, neither atmel_{cs,pci},
     nor at76c50x-usb ever used it and atmelwlandriver is not in Debian
     and has been abandoned upstream in 2005. Thanks to Stefan Lippers-
@@ -25,13 +23,19 @@
     (Closes: #553891)
   * Update wpa-ifupdown.init description to avoid confusion about
     whether or not the script is used currently.
+  * Do not use sed to comment all network blocks out in the example
+    wpa_supplicant.conf.
+  * Do not strip upstream manual pages from source tree, do no generate
+    them at build time, do not build-depend on dockbook.
   * Convert debian/rules to use dh
-    - build depend on debhelper (>= 7.3.7~) and quilt (>= 0.46-7~) for
-      dh override, dh sequence and dh buildsystem/sourcedirectory support
+    - build depend on debhelper (>= 7.0.50~) dh override support
     - install wpagui files via debian/wpagui.install
     - rename debian/ifupdown/wpa_action.sh to debian/ifupdown/wpa_action
       and install via debian/wpasupplicant.install
     - install wpasupplicant ifupdown scripts via debian/wpasupplicant.install
+  * Use 3.0 (quilt) package format, drop build dependency of quilt and remove
+    debian/README.source.
+  * Remove uupdate command from debian/watch, it is no longer useful.
   * Add ${misc:Depends} to debian/control for debhelpers to use as required.
   * Remove debian/get-git-snapshot and debian/rules target.
   * Bump Standards-Version to 3.8.3, no extra changes required.
@@ -41,26 +45,13 @@
   * Drop debian/patches/10_multi_driver.patch due to its invasiveness -
     it may make future patches which fix serious issues harder to apply
     while providing an experimental feature only.
-  * Refresh patch series and fix rejects due to removal of
-    debian/patches/10_multi_driver.patch from series.
-  * Import debian/patches/15_wpa_gui_wpa_tab_annoyance.patch from
-    upstream to avoid annoyance of switching to WPS tab too frequently
-    while viewing status messages or managing networks with wpa_gui-qt4.
-  * Import debian/patches/16_wpa_msg_ctrl.patch from upstream to add
-    wpa_msg_ctrl helper which can send messages to the control interface
-    without logging when running in non-debug mode. Use it for CTRL-
-    EVENT-SCAN-RESULTS. (Closes: #539915) (LP: #352118)
   * Add debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch to also use
     wpa_msg_ctrl help for WPS_EVENT_AP_AVAIL_* events.
   * Add debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch to stop
     notifying about WPS_EVENT_AP_* events via wpa_gui tray status
     bubbles - they are too frequent.
-  * Add debian/patches/19_kfreebsd.patch to fix FTBFS on kfreebsd,
-    contributed by Petr Salinger based on work by Emmanuel Bouthenot.
-    Modify build-dependencies so that libnl-dev is used on all archs
-    except kfreebsd and libbsd-dev on kfreebsd.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 22 Nov 2009 13:24:20 +1000
+
+ -- Kel Modderman <kel at otaku42.de>  Sat, 30 Jan 2010 00:23:28 +1000
 
 wpasupplicant (0.6.9-3) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1458&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Fri Jan 29 14:27:55 2010
@@ -1,10 +1,8 @@
 Source: wpasupplicant
 Section: net
 Priority: optional
-Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
-Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
-Build-Depends: debhelper (>= 7.3.7~),
- quilt (>= 0.46-7~),
+Maintainer: Kel Modderman <kel at otaku42.de>
+Build-Depends: debhelper (>= 7.0.50~),
  libdbus-glib-1-dev,
  libssl-dev,
  libpcsclite-dev,
@@ -12,11 +10,9 @@
  libqt4-dev,
  libdbus-1-dev,
  libnl-dev [!kfreebsd-i386 !kfreebsd-amd64],
- docbook,
- docbook-utils,
- pkg-config,
  libpcap-dev [kfreebsd-i386 kfreebsd-amd64],
- libbsd-dev [kfreebsd-i386 kfreebsd-amd64]
+ libbsd-dev [kfreebsd-i386 kfreebsd-amd64],
+ pkg-config
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1458&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Fri Jan 29 14:27:55 2010
@@ -17,14 +17,17 @@
 	cp --remove-destination $(BUILD_DOT_CONFIG) wpa_supplicant/.config
 	$(MAKE) -C wpa_supplicant all
 	$(MAKE) -C wpa_supplicant wpa_gui-qt4
-	$(MAKE) -C wpa_supplicant/doc/docbook man
+	#$(MAKE) -C wpa_supplicant/doc/docbook man
 
 override_dh_auto_clean:
 	$(MAKE) -C wpa_supplicant clean
-	$(MAKE) -C wpa_supplicant/doc/docbook clean
 	if [ -f wpa_supplicant/wpa_gui-qt4/Makefile ]; then \
 		$(MAKE) -C wpa_supplicant/wpa_gui-qt4 distclean ; \
 	fi
+	#$(MAKE) -C wpa_supplicant/doc/docbook clean
+
+override_dh_auto_configure:
+	$(info Skip dh_auto_configure ...)
 
 override_dh_auto_install:
 	$(info Skip dh_auto_install ...)
@@ -47,14 +50,9 @@
 override_dh_installchangelogs:
 	dh_installchangelogs wpa_supplicant/ChangeLog
 
-override_dh_installdocs:
-	dh_installdocs
-	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
-		> debian/wpasupplicant/usr/share/doc/wpasupplicant/README.wpa_supplicant.conf
-
 override_dh_installinit:
 	dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .
 ### end dh overrides
 
 %:
-	+dh $@ --with quilt --sourcedirectory=wpa_supplicant --buildsystem=makefile
+	dh $@

Added: wpasupplicant/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/source/format?rev=1458&op=file
==============================================================================
--- wpasupplicant/trunk/debian/source/format (added)
+++ wpasupplicant/trunk/debian/source/format Fri Jan 29 14:27:55 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: wpasupplicant/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/watch?rev=1458&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/watch (original)
+++ wpasupplicant/trunk/debian/watch Fri Jan 29 14:27:55 2010
@@ -1,2 +1,2 @@
 version=3
-http://w1.fi/releases/wpa_supplicant-(.*)\.tar\.gz debian uupdate
+http://w1.fi/releases/wpa_supplicant-(.*)\.tar\.gz

Modified: wpasupplicant/trunk/debian/wpasupplicant.examples
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.examples?rev=1458&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.examples (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.examples Fri Jan 29 14:27:55 2010
@@ -1,2 +1,3 @@
+wpa_supplicant/wpa_supplicant.conf
 wpa_supplicant/examples/*.conf
 debian/examples/*.conf

More information about the Pkg-wpa-devel mailing list