[pkg-wpa-devel] r1176 - in /wpasupplicant/trunk/debian: changelog rules

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

Author: kelmo-guest
Date: Wed Jun  4 12:41:33 2008
New Revision: 1176

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1176
Log:
Simplify debian/rules handling of wpa_supplicant/.config, just cp it in as
needed in build target. Move dh_install into install target. These will
make integration of possible future udeb cleaner.

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

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1176&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jun  4 12:41:33 2008
@@ -37,8 +37,11 @@
     frequency information returned by mac80211 using drivers in ad-hoc mode.
   * 51_dont_reschedule_specific_scans_for_hidden_ssids.patch to optimize scan
     rescheduling in order to better detect hidden SSIDs.
-
- -- Kel Modderman <kel at otaku42.de>  Tue, 03 Jun 2008 21:31:33 +1000
+  * Simplify debian/rules handling of wpa_supplicant/.config, just cp it in as
+    needed in build target. Move dh_install into install target. These will
+    make integration of possible future udeb cleaner.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 04 Jun 2008 22:39:45 +1000
 
 wpasupplicant (0.6.3-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1176&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Wed Jun  4 12:41:33 2008
@@ -26,14 +26,12 @@
 endif
 
 
-wpa_supplicant/.config: $(CONFIG)
-	cp -v $< $@
-
 build: build-stamp
-build-stamp: wpa_supplicant/.config $(QUILT_STAMPFN)
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	
 	# wpa_supplicant
+	cp -v $(CONFIG) wpa_supplicant/.config
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C wpa_supplicant all
 	
 	# wpa_gui
@@ -62,6 +60,7 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	dh_install
 	
 	# ifupdown
 	install --mode=755 -D debian/ifupdown/ifupdown.sh \
@@ -94,7 +93,6 @@
 	dh_installchangelogs wpa_supplicant/ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install
 	dh_installlogrotate --package=wpasupplicant --name=wpa_action
 	dh_installlogrotate --package=wpasupplicant --name=wpa_supplicant
 	dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .