r320 - in /unstable/madwifi-tools/debian: changelog rules

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

Author: kelmo-guest
Date: Mon Feb 11 10:50:20 2008
New Revision: 320

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=320
Log:
* New upstream release candidate.
* Cleanup debian/rules get-orig-source target. [debian/rules]

Modified:
    unstable/madwifi-tools/debian/changelog
    unstable/madwifi-tools/debian/rules

Modified: unstable/madwifi-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/changelog?rev=320&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/changelog (original)
+++ unstable/madwifi-tools/debian/changelog Mon Feb 11 10:50:20 2008
@@ -1,5 +1,6 @@
-madwifi-tools (1:0.9.3+dfsg-4) UNRELEASED; urgency=low
+madwifi-tools (1:0.9.4~rc2+dfsg-1) unstable; urgency=low
 
+  * New upstream release candidate.
   * Convert debian/rules to debhelper only from cdbs. Drop build dependency on
     cdbs. [debian/control, debian/rules]
   * debian/dirs is no longer required, adjust installation of file in install
@@ -15,8 +16,9 @@
     debian/rules]
   * Drop Alex Wallis from Uploaders, he hasn't been active for too long.
     [debian/control]
+  * Cleanup debian/rules get-orig-source target. [debian/rules]
 
- -- Kel Modderman <kel at otaku42.de>  Fri, 01 Feb 2008 22:55:59 +1000
+ -- Kel Modderman <kel at otaku42.de>  Mon, 11 Feb 2008 20:49:00 +1000
 
 madwifi-tools (1:0.9.3+dfsg-3) unstable; urgency=low
 

Modified: unstable/madwifi-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/rules?rev=320&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/rules (original)
+++ unstable/madwifi-tools/debian/rules Mon Feb 11 10:50:20 2008
@@ -64,39 +64,33 @@
 
 # DFSG tarball variables
 DEBVERS := $(shell dpkg-parsechangelog | sed -n 's/^Version.*:\(.*\)-.*/\1/p')
-UPSVERS := $(shell echo $(DEBVERS) | cut -d'+' -f1)
-SNAPVERS := $(shell echo $(DEBVERS) | sed -n 's/.*+\(.*\)+dfsg.*/\1/p')
-ifneq "$(SNAPVERS)" ""
-SVNVERS := $(shell echo $(SNAPVERS) | sed -n 's/\./-/p')
-UPSTAR := madwifi-ng-$(SVNVERS).tar.gz
-ORIGDIR := madwifi-ng-$(SVNVERS)
-UPSURL := http://snapshots.madwifi.org/madwifi-ng/$(UPSTAR)
-else
-UPSTAR := madwifi-$(UPSVERS).tar.gz
+UPSVERS := $(shell echo $(DEBVERS) | cut -d'+' -f1 | tr '~' '-')
+ORIGTAR := madwifi-$(UPSVERS).tar.gz
 ORIGDIR := madwifi-$(UPSVERS)
-UPSURL := http://optusnet.dl.sourceforge.net/sourceforge/madwifi/$(UPSTAR)
-endif
+#ORIGURL := http://optusnet.dl.sourceforge.net/sourceforge/madwifi/
+ORIGURL := http://snapshots.madwifi.org/special/
 DFSGDIR := madwifi-tools-$(DEBVERS)
 DFSGTAR := madwifi-tools_$(DEBVERS).orig.tar.gz
 
 get-orig-source:
 	@dh_testdir
+	
 	@test -d ../tarballs || mkdir -p ../tarballs
 	@rm -rf ../tarballs/$(DFSGDIR) ../tarballs/$(ORIGDIR)
 	
-	@wget -Nc -O ../tarballs/$(UPSTAR) $(UPSURL)
+	@wget -Nc -O ../tarballs/$(ORIGTAR) $(ORIGURL)$(ORIGTAR)
 	
-	@test -f ../tarballs/$(UPSTAR)
-	@tar xzf ../tarballs/$(UPSTAR) -C ../tarballs
-	@test -d ../tarballs/$(ORIGDIR)
+	@tar xzf ../tarballs/$(ORIGTAR) -C ../tarballs
 	
+	@echo "Extracting dfsg-free files:"
 	@mkdir -p ../tarballs/$(DFSGDIR)
-	@tar -C ../tarballs/$(ORIGDIR) -cf - \
-		-T debian/dfsg.files | \
+	@tar -C ../tarballs/$(ORIGDIR) -cf - -T debian/dfsg.files | \
 		tar -C ../tarballs/$(DFSGDIR) -xvf-
+	@echo ""
 	
+	@echo "Creating dfsg-free tarball:"
 	@tar czf ../tarballs/$(DFSGTAR) -C ../tarballs $(DFSGDIR)
+	@echo "../tarballs/$(DFSGTAR)"
+	@echo ""
+	
 	@rm -rf ../tarballs/$(DFSGDIR) ../tarballs/$(ORIGDIR)
-	@echo ""
-	@echo ../tarballs/$(DFSGTAR)
-	@echo ""