[Pkg-voip-commits] r7188 - in /callweaver/trunk/debian: changelog rules

[kilian at alioth.debian.org]

Author: kilian
Date: Sat May  9 22:10:39 2009
New Revision: 7188

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7188
Log:
Add get-orig-source target grabbing the SVN - TODO: check if we need to
weed out some stuff...

Modified:
    callweaver/trunk/debian/changelog
    callweaver/trunk/debian/rules

Modified: callweaver/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/changelog?rev=7188&op=diff
==============================================================================
--- callweaver/trunk/debian/changelog (original)
+++ callweaver/trunk/debian/changelog Sat May  9 22:10:39 2009
@@ -1,8 +1,10 @@
-callweaver (1.2.1~dfsg~rc1-1) UNRELEASED; urgency=low
+callweaver (1.2.1~rc1-1) UNRELEASED; urgency=low
 
   * Initial package.
   * Imported from openpbx.org original package.
   * Replace GnomeMeeting by Ekiga
   * Add Homepage field as added in dpkg-dev 1.14.6.
+  * Add get-orig-source target grabbing the SVN - TODO: check if we need to
+    weed out some stuff...
 
- -- Kilian Krause <kilian at debian.org>  Sat, 22 Sep 2007 12:08:45 +0200
+ -- Kilian Krause <kilian at debian.org>  Sun, 10 May 2009 00:05:49 +0200

Modified: callweaver/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/rules?rev=7188&op=diff
==============================================================================
--- callweaver/trunk/debian/rules (original)
+++ callweaver/trunk/debian/rules Sat May  9 22:10:39 2009
@@ -29,11 +29,14 @@
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 ORIGVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
-UPVERSION:=$(shell echo $(ORIGVERSION) | sed -e 's/~rc/_rc/')
-
-FILENAME := callweaver_$(ORIGVERSION)~dfsg.orig.tar.gz
+UPVERSION:=$(shell echo $(ORIGVERSION) | sed -e 's/~rc/-rc/')
+
+FILENAME := callweaver_$(ORIGVERSION).orig.tar.gz
 UPFILENAME := callweaver_$(UPVERSION).orig.tar.gz
 URL := http://devs.callweaver.org/release/callweaver-$(UPVERSION).tgz
+
+SVN_TAGREV := 5389
+SVN_URL := http://svn.callweaver.org/callweaver/tags/$(UPVERSION)/
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -192,24 +195,26 @@
 	@@echo "Upstream version:        $(UPVERSION)"
 
 get-orig-source:
-	echo BROKEN. CALLWEAVER DOES NOT PROVIDE TARBALLS
-	echo USE svn export MANUALLY FOR NOW
-	exit 1
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(UPFILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
-	@@echo Repacking as DFSG-free...
-	@@mkdir -p ../tarballs/callweaver-$(UPVERSION).tmp/
-	@@cd ../tarballs/callweaver-$(UPVERSION).tmp ; \
-	tar xfz ../$(UPFILENAME) 
-	# move opstream's debian/ out of the way while we're doing the DFSG repack anyway.
-	@@cd ../tarballs/callweaver-$(UPVERSION).tmp/callweaver-$(UPVERSION) ; \
-	mkdir packaging;mv debian packaging
-	@@cd ../tarballs/callweaver-$(UPVERSION).tmp ; \
-	tar cfz ../$(FILENAME) *
-	@@echo Cleaning up...
-	@@$(RM) -rf ../tarballs/callweaver-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+	@@svn export -r $(SVN_TAGREV) $(SVN_URL) ../tarballs/callweaver-$(UPVERSION)
+	@@cd ../tarballs;tar cfz $(FILENAME) callweaver-$(UPVERSION)
+	@@$(RM) -rf ../tarballs/callweaver-$(UPVERSION)
+	#DONE doing SVN checkout.
+	
+	#@@echo Downloading $(UPFILENAME) from $(URL) ...
+	#@@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	#@@echo Repacking as DFSG-free...
+	#@@mkdir -p ../tarballs/callweaver-$(UPVERSION).tmp/
+	#@@cd ../tarballs/callweaver-$(UPVERSION).tmp ; \
+	#tar xfz ../$(UPFILENAME) 
+	## move opstream's debian/ out of the way while we're doing the DFSG repack anyway.
+	#@@cd ../tarballs/callweaver-$(UPVERSION).tmp/callweaver-$(UPVERSION) ; \
+	#mkdir packaging;mv debian packaging
+	#@@cd ../tarballs/callweaver-$(UPVERSION).tmp ; \
+	#tar cfz ../$(FILENAME) *
+	#@@echo Cleaning up...
+	#@@$(RM) -rf ../tarballs/callweaver-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
 
 binary: binary-indep binary-arch
 .PHONY: build clean clean-patched patch unpatch binary-indep binary-arch binary install