[pkg-wpa-devel] r1430 - in /wpasupplicant/trunk/debian: changelog control get-git-snapshot ifupdown/wpa_action ifupdown/wpa_action.sh rules wpagui.install wpasupplicant.install

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Sun Nov 1 11:41:24 UTC 2009 

Author: kelmo-guest
Date: Sun Nov  1 11:41:23 2009
New Revision: 1430

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1430
Log:
* 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
  - 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
* Add ${misc:Depends} to debian/control for debhelpers to use as required.
* Remove debian/get-git-snapshot and debian/rules target.

Added:
    wpasupplicant/trunk/debian/ifupdown/wpa_action
      - copied unchanged from r1424, wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
    wpasupplicant/trunk/debian/wpagui.install
Removed:
    wpasupplicant/trunk/debian/get-git-snapshot
    wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpasupplicant.install

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1430&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Nov  1 11:41:23 2009
@@ -9,8 +9,6 @@
     nor at76c50x-usb ever used it and atmelwlandriver is not in Debian
     and has been abandoned upstream in 2005. Thanks to Stefan Lippers-
     Hollmann for doing the research.
-  * Do not call dh_desktop in debian/rules, it no longer does anything.
-  * Bump Standards-Version to 3.8.2, no changes required.
   * Prefix etc/pm/sleep.d/ pm-utils hook in the 50 - 74 sequence range to
     comply with sequencing rules as per pm-action(8) (LP: #307493). Provide
     the symlink to our hook in /usr/lib/pm-utils/sleep.d/ rather than
@@ -24,8 +22,17 @@
   * Build-depend on libreadline-dev instead of libreadline5-dev.
   * Update wpa-ifupdown.init description to avoid confusion about
     whether or not the script is used currently.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 01 Nov 2009 20:11:27 +1000
+  * 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
+    - 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
+  * Add ${misc:Depends} to debian/control for debhelpers to use as required.
+  * Remove debian/get-git-snapshot and debian/rules target.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 01 Nov 2009 21:33:13 +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=1430&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sun Nov  1 11:41:23 2009
@@ -3,8 +3,8 @@
 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 (>= 6),
- quilt,
+Build-Depends: debhelper (>= 7.3.7~),
+ quilt (>= 0.46-7~),
  libdbus-glib-1-dev,
  libssl-dev,
  libpcsclite-dev,
@@ -24,7 +24,7 @@
 
 Package: wpasupplicant
 Architecture: any
-Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6), adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), adduser
 Suggests: wpagui, libengine-pkcs11-openssl
 Description: client support for WPA and WPA2 (IEEE 802.11i)
  WPA and WPA2 are methods for securing wireless networks, the former
@@ -34,7 +34,7 @@
 
 Package: wpagui
 Architecture: any
-Depends: ${shlibs:Depends}, wpasupplicant (>= 0.6.2-1), libqt4-svg
+Depends: ${shlibs:Depends}, ${misc:Depends}, wpasupplicant (>= 0.6.2-1), libqt4-svg
 Recommends: menu
 Description: graphical user interface for wpa_supplicant
  wpagui provides a Qt interface for choosing which configured network

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1430&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sun Nov  1 11:41:23 2009
@@ -1,11 +1,4 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-WPAGUI = wpa_gui-qt4
 
 CFLAGS = -MMD -Wall -g
 LDFLAGS = -Wl,--as-needed
@@ -17,117 +10,51 @@
 endif
 
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+BUILD_DOT_CONFIG := debian/config/$(DEB_HOST_ARCH_OS)
 
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-	CONFIG := debian/config/kfreebsd
-else
-	CONFIG := debian/config/linux
-endif
+### start dh overrides
+override_dh_auto_build:
+	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
 
+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
 
-build: build-stamp
-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
-	$(MAKE) -C wpa_supplicant $(WPAGUI)
-	
-	# manpages
-	$(MAKE) -C wpa_supplicant/doc/docbook man
-	
-	touch $@
+override_dh_auto_install:
+	$(info Skip dh_auto_install ...)
 
-clean: unpatch
-	dh_testdir
-	
-	$(MAKE) -C wpa_supplicant clean
-	
-	if [ -f wpa_supplicant/$(WPAGUI)/Makefile ]; then \
-		$(MAKE) -C wpa_supplicant/$(WPAGUI) distclean ; \
-	fi
-	
-	$(MAKE) -C wpa_supplicant/doc/docbook clean
-	
-	dh_clean wpa_supplicant/.config build-stamp install-stamp
+override_dh_clean:
+	dh_clean wpa_supplicant/.config
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_fixperms:
+	dh_fixperms
+	chmod 0755 debian/wpagui/usr/share/wpagui/netdev_wrapper \
+		debian/wpasupplicant/etc/wpa_supplicant/*.sh
+
+override_dh_install:
 	dh_install
-	
-	# wpa_gui
-	dh_install --package=wpagui wpa_supplicant/$(WPAGUI)/wpa_gui usr/sbin/
-	dh_install --package=wpagui wpa_supplicant/$(WPAGUI)/wpa_gui.desktop \
-		usr/share/applications/
-	dh_install --package=wpagui wpa_supplicant/$(WPAGUI)/icons/wpa_gui.svg \
-		usr/share/icons/hicolor/scalable/apps/
-	# wpa_gui pixmaps were created with:
-	#   `make -C wpa_supplicant/$(WPAGUI)/icons/'
-	# Not built as part of package build process due to excess build
-	# dependencies of inkscape + imagemagick.
-	dh_install --package=wpagui debian/wpa_gui/wpa_gui.xpm \
-		usr/share/pixmaps/
-	dh_install --package=wpagui debian/wpa_gui/wpa_gui-16.xpm \
-		usr/share/pixmaps/
-	dh_installmenu --package=wpagui
-	# wpa_gui menu exec wrapper
-	install --mode=755 -D debian/wpa_gui/netdev_wrapper \
-		debian/wpagui/usr/share/wpagui/netdev_wrapper
-	
-	# ifupdown
-	install --mode=755 -D debian/ifupdown/ifupdown.sh \
-		debian/wpasupplicant/etc/wpa_supplicant/ifupdown.sh
-	install --mode=755 -D debian/ifupdown/functions.sh \
-		debian/wpasupplicant/etc/wpa_supplicant/functions.sh
-	install --mode=755 -D debian/ifupdown/action_wpa.sh \
-		debian/wpasupplicant/etc/wpa_supplicant/action_wpa.sh
-	
-	# wpa_action
-	install --mode=755 -D debian/ifupdown/wpa_action.sh \
-		debian/wpasupplicant/sbin/wpa_action
-	
-	# D-Bus
 	install --mode=644 -D wpa_supplicant/dbus-wpa_supplicant.conf \
 		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 configuration
-	mkdir -p debian/wpasupplicant/usr/share/doc/wpasupplicant
+
+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
 
-# Build architecture-independent files here.
-binary-indep: install
+override_dh_installinit:
+	dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .
+### end dh overrides
 
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs wpa_supplicant/ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean install binary-indep binary-arch binary install
-
-get-git-snapshot:
-	chmod a+rx debian/$@
-	debian/$@ ..
+%:
+	+dh $@ --with quilt --sourcedirectory=wpa_supplicant --buildsystem=makefile

Added: wpasupplicant/trunk/debian/wpagui.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpagui.install?rev=1430&op=file
==============================================================================
--- wpasupplicant/trunk/debian/wpagui.install (added)
+++ wpasupplicant/trunk/debian/wpagui.install Sun Nov  1 11:41:23 2009
@@ -1,0 +1,5 @@
+debian/wpa_gui/netdev_wrapper usr/share/wpagui/
+debian/wpa_gui/wpa_gui*.xpm usr/share/pixmaps/
+wpa_supplicant/wpa_gui-qt4/wpa_gui usr/sbin/
+wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop usr/share/applications/
+wpa_supplicant/wpa_gui-qt4/icons/wpa_gui.svg usr/share/icons/hicolor/scalable/apps/

Modified: wpasupplicant/trunk/debian/wpasupplicant.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.install?rev=1430&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.install (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.install Sun Nov  1 11:41:23 2009
@@ -1,3 +1,4 @@
+debian/ifupdown/*.sh etc/wpa_supplicant/
 wpa_supplicant/wpa_cli sbin/
 wpa_supplicant/wpa_passphrase usr/bin/
 wpa_supplicant/wpa_supplicant sbin/

More information about the Pkg-wpa-devel mailing list