[pkg-wpa-devel] r947 - in /wpasupplicant/trunk/debian: changelog rules wpasupplicant.examples

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

Author: kelmo-guest
Date: Wed Dec 26 10:54:08 2007
New Revision: 947

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=947
Log:
revert r946

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

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=947&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Dec 26 10:54:08 2007
@@ -62,11 +62,8 @@
     option.
   * Activate CONFIG_IEEE80211R, CONFIG_IEEE80211W and CONFIG_EAP_WSC in the
     default build configuration.
-  * Sanitize the example catch-all configuration in the install target of
-    debian/rules. Send the output to debian/tmp and remove the custom clean
-    target rules. Adjust debian/wpasupplicant.examples accordingly.
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 26 Dec 2007 20:45:25 +1000
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 26 Dec 2007 20:39:31 +1000
 
 wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=947&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Wed Dec 26 10:54:08 2007
@@ -29,6 +29,10 @@
 	# manpages - docbook2man
 	$(MAKE) -C wpa_supplicant/doc/docbook man
 	
+	# sanitise the example configuration
+	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
+		> README.wpa_supplicant.conf
+	
 	# wpa_gui
 	cd wpa_supplicant/$(WPAGUI) && $(QMAKE)
 	$(MAKE) -C wpa_supplicant/$(WPAGUI)
@@ -47,6 +51,10 @@
 	if [ -f wpa_supplicant/$(WPAGUI)/Makefile ]; then \
 		$(MAKE) -C wpa_supplicant/$(WPAGUI) distclean ; \
 		rm -f wpa_supplicant/$(WPAGUI)/Makefile ; \
+	fi
+	
+	if [ -f README.wpa_supplicant.conf ]; then \
+		rm -f README.wpa_supplicant.conf ; \
 	fi
 	
 	if [ -d src/drivers/driver_madwifi/ ]; then \
@@ -76,11 +84,6 @@
 		debian/wpasupplicant/etc/dbus-1/system.d/wpa_supplicant.conf
 	install --mode=644 -D wpa_supplicant/dbus-wpa_supplicant.service \
 		debian/wpasupplicant/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
-	
-	# sanitise the example catch-all configuration
-	# (some people tried to use this in the past)
-	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
-		> debian/tmp/README.wpa_supplicant.conf
 
 # Build architecture-independent files here.
 binary-indep: build install

Modified: wpasupplicant/trunk/debian/wpasupplicant.examples
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.examples?rev=947&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.examples (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.examples Wed Dec 26 10:54:08 2007
@@ -1,2 +1,2 @@
-debian/tmp/README.wpa_supplicant.conf
+README.wpa_supplicant.conf
 wpa_supplicant/examples/*.conf