[Pkg-voip-commits] r4934 - in /asterisk/trunk/debian: changelog patches/bristuff/bristuff-notice rules

[paravoid at alioth.debian.org]

Author: paravoid
Date: Fri Nov 30 16:01:11 2007
New Revision: 4934

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4934
Log:
* Use DEBVERSION as asterisk's version string.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/bristuff/bristuff-notice
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=4934&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Nov 30 16:01:11 2007
@@ -19,12 +19,13 @@
     cards. (Closes: #396499)
   * Fix debian/watch by using a pkg-voip wrapper to avoid upstream's silly
     redirections. (Closes: #449706)
+  * Use DEBVERSION as asterisk's version string.
 
   [ Tzafrir Cohen ]
   * Provide a custom sounds directory under /var/lib - user-modifieble at
     runtime and hence not under /usr .
 
- -- Faidon Liambotis <paravoid at debian.org>  Fri, 30 Nov 2007 17:26:37 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Fri, 30 Nov 2007 18:00:56 +0200
 
 asterisk (1:1.4.13~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/bristuff/bristuff-notice
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/bristuff-notice?rev=4934&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/bristuff-notice (original)
+++ asterisk/trunk/debian/patches/bristuff/bristuff-notice Fri Nov 30 16:01:11 2007
@@ -9,11 +9,6 @@
  ================================================================
  
  * SECURITY
---- asterisk-1.4.12.orig/.version
-+++ asterisk-1.4.12/.version
-@@ -1 +1 @@
--1.4.15
-+1.4.15-BRIstuffed-0.4.0-test4
 --- asterisk-1.4.12.orig/LICENSE
 +++ asterisk-1.4.12/LICENSE
 @@ -1,7 +1,7 @@

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=4934&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Fri Nov 30 16:01:11 2007
@@ -45,6 +45,7 @@
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 FILENAME := asterisk_$(UPVERSION)~dfsg.orig.tar.gz
@@ -69,6 +70,9 @@
 	
 config.status: check-sounds patch
 	dh_testdir
+
+	[ -f .version.bak ] || cp -a .version .version.bak
+	echo $(DEB_NOEPOCH_VERSION) > .version
 
 	if [ ! -r configure.debian_sav ]; then cp -a configure configure.debian_sav; fi
 	#./bootstrap.sh # also runs autoonf. TODO: currently not needed.
@@ -138,6 +142,8 @@
 	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi
 	-test -d configs && chmod -x configs/*.sample
 	-$(RM) -f build-arch-stamp build-indep-stamp config.status check-sounds menuselect.makeopts
+
+	[ ! -f .version.bak ] || mv .version.bak .version
 
 	dh_clean