[pkg-wpa-devel] r1048 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh patches/01_debian_wpa_roam_example.patch rules wpasupplicant.docs wpasupplicant.examples

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

Author: kelmo-guest
Date: Mon Jan 21 06:08:40 2008
New Revision: 1048

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1048
Log:
change location of README.wpa_supplicant.conf, do not make useless noise in wpa_action logfile

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/functions.sh
    wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpasupplicant.docs
    wpasupplicant/trunk/debian/wpasupplicant.examples

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1048&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Jan 21 06:08:40 2008
@@ -29,8 +29,10 @@
     LSB header in debian/wpasupplicant.wpa-ifupdown.init.
   * Add debian/patches/38_dbus_blob_support.patch to allow support for loading
     of blobs via the D-Bus interface. Patch cherry picked from upstream git.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 20 Jan 2008 11:04:24 +1000
+  * Move README.wpa_supplicant.conf from examples to docs. Generate the file
+    in the wpa_supplicant/ directory.
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 21 Jan 2008 15:43:08 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1048&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Mon Jan 21 06:08:40 2008
@@ -890,7 +890,6 @@
 
 ifupdown_status () {
 	if grep -s -q "^${WPA_IFACE}=${WPA_LOGICAL_IFACE}" "$IFSTATE_FILE"; then
-		echo "Interface \"$WPA_IFACE\" connected successfully."
 		return 0
 	fi
 

Modified: wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch?rev=1048&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch Mon Jan 21 06:08:40 2008
@@ -9,7 +9,7 @@
 +# to get an overview of how to setup this mode.
 +#
 +# For a detailed set of configuration examples for different networks, refer to
-+# /usr/share/doc/wpasupplicant/examples/README.wpa_supplicant.conf.gz
++# /usr/share/doc/wpasupplicant/README.wpa_supplicant.conf.gz
 +#
 +# Also see the other files in /usr/share/doc/wpasupplicant/examples/ for
 +# specific network configuration examples.

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1048&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Mon Jan 21 06:08:40 2008
@@ -28,7 +28,7 @@
 	
 	# sanitise the example configuration
 	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
-		> README.wpa_supplicant.conf
+		> wpa_supplicant/README.wpa_supplicant.conf
 	
 	# wpa_gui
 	$(MAKE) -C wpa_supplicant $(WPAGUI)
@@ -48,8 +48,8 @@
 		$(MAKE) -C wpa_supplicant/$(WPAGUI) distclean ; \
 	fi
 	
-	if [ -f README.wpa_supplicant.conf ]; then \
-		rm -f README.wpa_supplicant.conf ; \
+	if [ -f wpa_supplicant/README.wpa_supplicant.conf ]; then \
+		rm -f wpa_supplicant/README.wpa_supplicant.conf ; \
 	fi
 	
 	if [ -d src/drivers/driver_madwifi/ ]; then \

Modified: wpasupplicant/trunk/debian/wpasupplicant.docs
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.docs?rev=1048&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.docs (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.docs Mon Jan 21 06:08:40 2008
@@ -1,3 +1,4 @@
 debian/README.modes
 wpa_supplicant/eap_testing.txt
 wpa_supplicant/README
+wpa_supplicant/README.wpa_supplicant.conf

Modified: wpasupplicant/trunk/debian/wpasupplicant.examples
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.examples?rev=1048&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.examples (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.examples Mon Jan 21 06:08:40 2008
@@ -1,2 +1,1 @@
-README.wpa_supplicant.conf
 wpa_supplicant/examples/*.conf