[Pkg-voip-commits] r7918 - in /asterisk/trunk/debian: changelog rules

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun Dec 27 12:18:42 2009
New Revision: 7918

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7918
Log:
Relax Debian revision parsing regexp in debian/rules to help with parsing
derivatives (e.g. Ubuntu) and backports.org revisions.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7918&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Dec 27 12:18:42 2009
@@ -1,3 +1,10 @@
+asterisk (1:1.6.2.0-2) UNRELEASED; urgency=low
+
+  * Relax Debian revision parsing regexp in debian/rules to help with parsing
+    derivatives (e.g. Ubuntu) and backports.org revisions.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 27 Dec 2009 14:18:21 +0200
+
 asterisk (1:1.6.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=7918&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Sun Dec 27 12:18:42 2009
@@ -32,10 +32,9 @@
 	INSTALL_PROGRAM += -s
 endif
 
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+DEBVERSION:=$(shell dpkg-parsechangelog | sed -n -e 's/Version: //p')
 DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
-DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[0-9.]*$$//')
+DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[^-]\+$$//')
 UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg//' -e 's/~\(\(rc\|beta\)[0-9]\)/-\1/')
 
 FILENAME := asterisk_$(DEB_SRC_VERSION).orig.tar.gz
@@ -185,7 +184,6 @@
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
 
-TMP_TARBALL_TOP=../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs