[pkg-wpa-devel] r1160 - in /wpasupplicant/trunk/debian: changelog compat control rules wpasupplicant.docs

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

Author: kelmo-guest
Date: Sun May 11 13:08:52 2008
New Revision: 1160

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1160
Log:
* Fix arch specific build dependency declarations introduced by GNU/kFreeBSD
  compat patch.
* Build depend on debhelper >= 7, adjust debian/compat to suit.
* Simplify debian/rules, cleaning up the sanitization of
  README.wpa_supplicant.conf, clean , build and install targets.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/compat
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpasupplicant.docs

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1160&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun May 11 13:08:52 2008
@@ -10,8 +10,13 @@
       kfreebsd DEB_HOST_ARCH_OS
     - add debian/patches/50_fix_ftbfs_on_gnukfreebsd.patch to make sure
       required headers are included
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 11 May 2008 22:16:02 +1000
+  * Fix arch specific build dependency declarations introduced by GNU/kFreeBSD
+    compat patch.
+  * Build depend on debhelper >= 7, adjust debian/compat to suit.
+  * Simplify debian/rules, cleaning up the sanitization of
+    README.wpa_supplicant.conf, clean , build and install targets.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 11 May 2008 23:06:20 +1000
 
 wpasupplicant (0.6.3-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/compat?rev=1160&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/compat (original)
+++ wpasupplicant/trunk/debian/compat Sun May 11 13:08:52 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1160&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sun May 11 13:08:52 2008
@@ -3,7 +3,7 @@
 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 (>= 5), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils, pkg-config, libpcap-dev [kfreebsd], libbsd [kfreebsd]
+Build-Depends: debhelper (>= 7), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils, pkg-config, libpcap-dev [kfreebsd-i386 kfreebsd-amd64], libbsd [kfreebsd-i386 kfreebsd-amd64]
 Standards-Version: 3.7.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=1160&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sun May 11 13:08:52 2008
@@ -36,38 +36,28 @@
 	# wpa_supplicant
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C wpa_supplicant all
 	
+	# wpa_gui
+	$(MAKE) -C wpa_supplicant $(WPAGUI)
+	
 	# manpages
 	$(MAKE) -C wpa_supplicant/doc/docbook man
-	
-	# sanitise the example configuration
-	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
-		> wpa_supplicant/README.wpa_supplicant.conf
-	
-	# wpa_gui
-	$(MAKE) -C wpa_supplicant $(WPAGUI)
 	
 	touch $@
 
 clean: unpatch
 	dh_testdir
-	dh_testroot
 	
 	$(MAKE) -C wpa_supplicant clean
-	
-	$(MAKE) -C wpa_supplicant/doc/docbook clean
 	
 	if [ -f wpa_supplicant/$(WPAGUI)/Makefile ]; then \
 		$(MAKE) -C wpa_supplicant/$(WPAGUI) distclean ; \
 	fi
 	
-	if [ -f wpa_supplicant/README.wpa_supplicant.conf ]; then \
-		rm -f wpa_supplicant/README.wpa_supplicant.conf ; \
-	fi
+	$(MAKE) -C wpa_supplicant/doc/docbook clean
 	
 	dh_clean wpa_supplicant/.config build-stamp install-stamp
 
-install: build install-stamp
-install-stamp:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
@@ -89,13 +79,16 @@
 	install --mode=644 -D wpa_supplicant/dbus-wpa_supplicant.service \
 		debian/wpasupplicant/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 	
-	touch $@
+	# sanitise the example configuration
+	mkdir -p debian/wpasupplicant/usr/share/doc/wpasupplicant
+	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
+		> debian/wpasupplicant/usr/share/doc/wpasupplicant/README.wpa_supplicant.conf
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs wpa_supplicant/ChangeLog

Modified: wpasupplicant/trunk/debian/wpasupplicant.docs
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.docs?rev=1160&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.docs (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.docs Sun May 11 13:08:52 2008
@@ -1,4 +1,3 @@
 debian/README.modes
 wpa_supplicant/eap_testing.txt
 wpa_supplicant/README
-wpa_supplicant/README.wpa_supplicant.conf