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

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon May 16 10:38:46 2011
New Revision: 8939

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8939
Log:
2.1.0-rc1: Finally a tarball release

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

Modified: asterisk-gui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/changelog?rev=8939&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/changelog (original)
+++ asterisk-gui/trunk/debian/changelog Mon May 16 10:38:46 2011
@@ -1,4 +1,4 @@
-asterisk-gui (2.0.4.9.svn.4991-1) UNRELEASED; urgency=low
+asterisk-gui (2.1.0~rc1-1) UNRELEASED; urgency=low
 
   [ Tzafrir Cohen ]
   * Initial release from digium SVN (Closes: #496258).

Modified: asterisk-gui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/rules?rev=8939&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/rules (original)
+++ asterisk-gui/trunk/debian/rules Mon May 16 10:38:46 2011
@@ -3,14 +3,15 @@
 PACKAGE:=$(shell sed -nre 's/^Source: (.*)$$/\1/p' debian/control)
 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$$//')
+DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9~.a-z]*$$//')
+UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/[~+]dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
 SVN_REV:=$(shell echo $(UPVERSION) | sed -e 's/^.*svn\.//')
 SVN_BRANCH:=branches/2.0
 SVN_URL:=http://svn.asterisk.org/svn/asterisk-gui/$(SVN_BRANCH)
 DIR_NAME:=$(PACKAGE)-$(UPVERSION)
 TARBALL:=$(PACKAGE)_$(UPVERSION).orig.tar.gz
 
-FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
+FILENAME := $(PACKAGE)_$(DEB_BASE_VERSION).orig.tar.gz
 URL := http://downloads.digium.com/pub/telephony/$(PACKAGE)/releases/$(PACKAGE)-$(UPVERSION).tar.gz
 
 
@@ -54,10 +55,7 @@
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@#echo Downloading $(FILENAME) from $(URL) ...
-	@@#wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-	@echo "Exporting rev. $(SVN_REV) to $(TARBALL_DIR)/$(DIR_NAME)"
-	@svn export -q -r $(SVN_REV) $(SVN_URL) $(TARBALL_DIR)/$(DIR_NAME)
-	@tar czf ../tarballs/$(TARBALL) -C $(TARBALL_DIR) $(DIR_NAME)
-	@echo "Cleaning up..."
-	@rm -rf $(TARBALL_DIR)
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
+.PHONY: get-orig-source