r304 - in /unstable/madwifi/debian: changelog control madwifi-source.dirs rules

Thu Jan 31 10:50:07 UTC 2008

Author: kelmo-guest
Date: Thu Jan 31 10:50:07 2008
New Revision: 304

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=304
Log:
* Convert debian/rules to debhelper, drop build-dependency on cdbs. Remove
  debian/madwifi-source.dirs, it is no longer required. [debian/rules,
  debian/control, debian/madwifi-source.dirs]

Removed:
    unstable/madwifi/debian/madwifi-source.dirs
Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/control
    unstable/madwifi/debian/rules

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=304&op=diff
==============================================================================

--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Thu Jan 31 10:50:07 2008
@@ -12,8 +12,11 @@
     debian/control, debian/rules]
   * Add debian/patches/02_get-arch-mk-x86.patch to fix failure to build
     against linux-headers-2.6.24-*. (Closes: #463353)
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 31 Jan 2008 19:59:05 +1000
+  * Convert debian/rules to debhelper, drop build-dependency on cdbs. Remove
+    debian/madwifi-source.dirs, it is no longer required. [debian/rules,
+    debian/control, debian/madwifi-source.dirs]
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 31 Jan 2008 20:48:29 +1000
 
 madwifi (1:0.9.3.2-2) unstable; urgency=high
 

Modified: unstable/madwifi/debian/control
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/control?rev=304&op=diff
==============================================================================
--- unstable/madwifi/debian/control (original)
+++ unstable/madwifi/debian/control Thu Jan 31 10:50:07 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian madwifi team <pkg-madwifi-maintainers at lists.alioth.debian.org>
 Uploaders: Loic Minier <lool at dooz.org>, Kel Modderman <kel at otaku42.de>, Matt Brown <mattb at debian.org>, Alex Wallis <awol at otaku42.de>
-Build-Depends: cdbs, debhelper (>= 5.0.37), bzip2, quilt
+Build-Depends: debhelper (>= 5.0.37), bzip2, quilt
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-madwifi/unstable/madwifi
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/

Modified: unstable/madwifi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/rules?rev=304&op=diff
==============================================================================
--- unstable/madwifi/debian/rules (original)
+++ unstable/madwifi/debian/rules Thu Jan 31 10:50:07 2008
@@ -1,62 +1,60 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_DOCS_ALL := -XTHANKS
+include /usr/share/quilt/quilt.make
 
-# Please use one of the following version scheme/URL combinations, and
-# use 'debian/rules get-orig-source' to obtain the orig.tar.gz
-#
-# Upstream Major Release
-# Version:	1:0.9.2-1
-# URL:		sf.net/madwifi
-# or
-# Upstream SVN snapshot
-# Version:	1:0.9.2+r1711.20060914-1
-# URL:		snapshots.madwifi.org/madwifi
-#
-DEBVERS := $(shell dpkg-parsechangelog | sed -n 's/^Version: .*:\(.*\)-.*/\1/p')
-UPSVERS := $(shell echo $(DEBVERS) | cut -d'+' -f1)
-SNAPVERS := $(shell echo $(DEBVERS) | sed -n 's/.*+\(.*\)/\1/p')
-ifneq "$(SNAPVERS)" ""
-SVNVERS := $(shell echo $(SNAPVERS) | sed -n 's/\./-/p')
-UPBRAN := ng
-UPSTAR := madwifi-$(UPBRAN)-$(SVNVERS).tar.gz
-UPSURL := http://snapshots.madwifi.org/madwifi-$(UPBRAN)/$(UPSTAR)
-else
-UPSTAR := madwifi-$(UPSVERS).tar.gz
-UPSURL := http://optusnet.dl.sourceforge.net/sourceforge/madwifi/$(UPSTAR)
-endif
-ORIGTAR := madwifi_$(DEBVERS).orig.tar.gz
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+	dh_testdir
+	touch @
 
-install/madwifi-source::
-	# Enforce executable bit on debian/rules, and create directory 
-	# structure for modules source
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp install-stamp
+
+install: build install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	
 	install -D -m 0755 debian/rules.modules \
 		debian/tmp/modules/madwifi/debian/rules
 	
-	# Prepare the other debian stuff
 	for f in *.modules.in control compat copyright changelog; do \
 		install -m 0644 debian/$$f \
 			debian/tmp/modules/madwifi/debian/; \
 	done
 	
-	# Prepare upstream source
 	find . -path ./debian/\* -type d -prune -o -printf "%P\n" | \
 		egrep -v 'debian|contrib|regression|.svn' | \
 		cpio -admp debian/tmp/modules/madwifi/
 	
-	# Prepare the debian source tarball
+	mkdir -p debian/madwifi-source/usr/src/
 	tar jcf debian/madwifi-source/usr/src/madwifi.tar.bz2 \
 		-C debian/tmp modules
+	
+	touch @
 
-get-orig-source:
-	@dh_testdir
-	@echo -e "Deb version:\t$(DEBVERS)"
-	@echo -e "Upstream MV:\t$(UPSVERS)"
-ifneq "$(SNAPVERS)" ""
-	@echo -e "SVN version:\t$(SVNVERS)"
-endif
-	@test -d ../tarballs || mkdir -p ../tarballs
-	@wget -Nc -T10 -O ../tarballs/$(ORIGTAR) $(UPSURL)
+binary-arch:
+# We have nothing to do by default.
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installdocs
+	dh_installchangelogs
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary


