[Pkg-voip-commits] r7224 - in /zaptel/trunk/debian: TODO.Debian changelog patches/series rules

Sat May 16 14:06:53 UTC 2009

Author: tzafrir-guest
Date: Sat May 16 14:06:53 2009
New Revision: 7224

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7224
Log:
* Using A SVN snapshot, as there won't be newer releases (Closes: #518017).
  - dropping applied patches: chan_release_check xpp_fxs_power 
    xpp_fxs_dtmf_leak wctdm_fix_alarm device_class_2626 xpp_fxo_cid_always
    headers_2627 wcte12xp_flags fix_sync_validation

Modified:
    zaptel/trunk/debian/TODO.Debian
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/series
    zaptel/trunk/debian/rules

Modified: zaptel/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/TODO.Debian?rev=7224&op=diff
==============================================================================

--- zaptel/trunk/debian/TODO.Debian (original)
+++ zaptel/trunk/debian/TODO.Debian Sat May 16 14:06:53 2009
@@ -1,6 +1,1 @@
-* Set the list of utilities to build. Probably through some menuselect var.
-* Rename sethdlc-new to sethdlc.
-* Missing man page for fxstest .
-* Missing man page for ztdiag .
-* Add ds1x1f.c to the list of modules (note: it breaks kernel 2.4 building).
-* Apply the conglomerate_fixes patch from trunk.
+* The SVN does not have an upstream changelog.

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=7224&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Sat May 16 14:06:53 2009
@@ -1,16 +1,16 @@
-zaptel (1:1.4.12.1~dfsg-1) UNRELEASED; urgency=low
-
-  * New upstream version.
-
-  [ Tzafrir Cohen ]
+zaptel (1:1.4.12.9.svn.r4635~dfsg-1) UNRELEASED; urgency=low
+
+  [ Tzafrir Cohen ]
+  * Using A SVN snapshot, as there won't be newer releases (Closes: #518017).
+    - dropping applied patches: chan_release_check xpp_fxs_power 
+      xpp_fxs_dtmf_leak wctdm_fix_alarm device_class_2626 xpp_fxo_cid_always
+      headers_2627 wcte12xp_flags fix_sync_validation
   * Fix typo 'status' init.d command. It now does something useful 
     (By Lars Bensmann)
-  * Patch hrtimer_2628: Fix building ztdummy with kernel 2.6.28 
-    (Closes: #518017)
   * Tell Zaptel we do want our custom OSLEC echo canceller (Closes: #510858).
   * Fix download URL. 
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 12 May 2009 10:53:53 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 16 May 2009 15:11:44 +0300
 
 zaptel (1:1.4.11~dfsg-3) unstable; urgency=high
 

Modified: zaptel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/series?rev=7224&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/series (original)
+++ zaptel/trunk/debian/patches/series Sat May 16 14:06:53 2009
@@ -5,15 +5,5 @@
 ztcfg-start_stop
 zaphfc-florz
 zaptel_perl
-chan_release_check
 florz-vmalloc
-xpp_fxs_power
-xpp_fxs_dtmf_leak
-wctdm_fix_alarm
-device_class_2626
-xpp_fxo_cid_always
-headers_2627 
 vzaphfc_proc_root_dir
-wcte12xp_flags 
-fix_sync_validation
-hrtimer_2628

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=7224&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Sat May 16 14:06:53 2009
@@ -33,7 +33,10 @@
 
 UPFILENAME := zaptel_$(UPVERSION).orig.tar.gz
 FILENAME := zaptel_$(UPVERSION)~dfsg.orig.tar.gz
+SVN_REV := $(shell echo $(UPVERSION) | sed -e 's/.*\.svn\.r\([0-9]*\)$$/\1/')
 URL := http://downloads.digium.com/pub/zaptel/releases/zaptel-$(UPVERSION).tar.gz
+TARBALL_SCRIPT		:= zaptel_svn_tarball
+TARBALL_SCRIPT_URL	:= http://svn.digium.com/svn/zaptel/branches/1.4/build_tools/$(TARBALL_SCRIPT)
 
 # If the makefile was properly-writen, there was a good separation 
 # between kernel and userspace. As things stand now I'd like to work
@@ -210,7 +213,7 @@
 	dh_testroot
 	
 	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs -i
 	dh_installexamples -i $(BRISTUFF_EXAMPLES)
 	dh_link -i
 	dh_compress -i
@@ -236,7 +239,7 @@
 
 	
 	#dh_installmodules -a
-	dh_installchangelogs -a ChangeLog
+	dh_installchangelogs -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
@@ -251,13 +254,17 @@
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
+	@@echo "Subversion revision:     $(SVN_REV)"
 
 TARBALL_DIR=../tarballs/zaptel-$(UPVERSION).tmp
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(UPFILENAME) from $(URL) ...
-	@@wget  -nv -T10 -t3 --verbose -O ../tarballs/$(UPFILENAME) $(URL)
+	@@echo Creating $(UPFILENAME) from SVN rev. $(SVN_REV) ...
+	@@wget -q -O $(TARBALL_SCRIPT) $(TARBALL_SCRIPT_URL)
+	@@sh $(TARBALL_SCRIPT) -r $(SVN_REV)
+	@@mv zaptel-$(UPVERSION).tar.gz ../tarballs/$(UPFILENAME)
+	@@#wget  -nv -T10 -t3 --verbose -O ../tarballs/$(UPFILENAME) $(URL)
 	@@echo Repacking as DFSG-free...
 	@@mkdir -p $(TARBALL_DIR)/
 	@@cd $(TARBALL_DIR) ; \
@@ -270,6 +277,7 @@
 	@@echo Cleaning up...
 	@@$(RM) -rf $(TARBALL_DIR)/
 	@@$(RM) -f ../tarballs/$(UPFILENAME)
+	@@$(RM) -f $(TARBALL_SCRIPT)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure patch unpatch


