[Pkg-voip-commits] r4860 - in /zaptel-firmware/trunk/debian: control rules watch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Fri Nov 23 11:03:58 2007
New Revision: 4860

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4860
Log:
Make zaptel-firmware build.

Modified:
    zaptel-firmware/trunk/debian/control
    zaptel-firmware/trunk/debian/rules
    zaptel-firmware/trunk/debian/watch

Modified: zaptel-firmware/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel-firmware/trunk/debian/control?rev=4860&op=diff
==============================================================================
--- zaptel-firmware/trunk/debian/control (original)
+++ zaptel-firmware/trunk/debian/control Fri Nov 23 11:03:58 2007
@@ -10,7 +10,6 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/zaptel-firmware/?op=log
 
 Package: zaptel-firmware
-Section: comm
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: zapata telephony firmware

Modified: zaptel-firmware/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel-firmware/trunk/debian/rules?rev=4860&op=diff
==============================================================================
--- zaptel-firmware/trunk/debian/rules (original)
+++ zaptel-firmware/trunk/debian/rules Fri Nov 23 11:03:58 2007
@@ -9,10 +9,14 @@
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
+#UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
+# in a variable, in case we'll ever have dfsg.1 and such:
+DFSG_STR:=dfsg
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
+DEBVERSION_DFSG:=$(echo $(DEBVERSION) | sed -e 's/^$(UPVERSION)/&~$(DFSG_STR)/')
 
-FILENAME := zaptel-firmware_$(UPVERSION)~dfsg.orig.tar.gz
-URL := http://download.digium.com/pub/zaptel/releases/zaptel-$(UPVERSION).tar.gz
+FILENAME := zaptel-firmware_$(UPVERSION).orig.tar.gz
+URL := http://downloads.digium.com/pub/zaptel/releases/zaptel-$(UPVERSION).tar.gz
 
 
 build: build-stamp
@@ -26,6 +30,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f *-stamp
+	echo 
 	
 	dh_clean
 

Modified: zaptel-firmware/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel-firmware/trunk/debian/watch?rev=4860&op=diff
==============================================================================
--- zaptel-firmware/trunk/debian/watch (original)
+++ zaptel-firmware/trunk/debian/watch Fri Nov 23 11:03:58 2007
@@ -1,8 +1,9 @@
 # format version number, currently 2; this line is compulsory!
 version=3
 
+# This one is still broken. See http://bugs.debian.org/449673 .
 # Full-site-with-pattern  [Version  [Action]]
 #opts=pasv ftp://ftp.asterisk.org/pub/telephony/zaptel/ zaptel-(.*)\.tar\.gz \
 #	debian  svn-upgrade
-opts=dversionmangle=s/\~dfsg// \
+#opts=dversionmangle=s/\~dfsg// \
 	http://ftp.digium.com/pub/zaptel/ zaptel-(1.4.*)\.tar\.gz debian svn-upgrade