[Pkg-voip-commits] r9240 - in /gnugk/trunk/debian: changelog rules watch

[kilian at alioth.debian.org]

Author: kilian
Date: Sat Aug  6 21:17:56 2011
New Revision: 9240

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9240
Log:
DFSG repack due to configure.exe binary

Modified:
    gnugk/trunk/debian/changelog
    gnugk/trunk/debian/rules
    gnugk/trunk/debian/watch

Modified: gnugk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/changelog?rev=9240&op=diff
==============================================================================
--- gnugk/trunk/debian/changelog (original)
+++ gnugk/trunk/debian/changelog Sat Aug  6 21:17:56 2011
@@ -1,6 +1,7 @@
-gnugk (2:2.3.5-1) unstable; urgency=low
-
-  * New upstream release
+gnugk (2:2.3.5~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+   - DFSG repack due to configure.exe binary
   * Replace get-orig-source target with our own version instead of including
     pkg-gnome makefile sniplet to avoid warnings with dh targets.
   * Make sure to use autotools-dev

Modified: gnugk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/rules?rev=9240&op=diff
==============================================================================
--- gnugk/trunk/debian/rules (original)
+++ gnugk/trunk/debian/rules Sat Aug  6 21:17:56 2011
@@ -1,18 +1,25 @@
 #!/usr/bin/make -f
 
-FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
-URL := http://qa.debian.org/watch/sf.php/openh323gk/gnugk-$(UPVERSION).tar.gz
+PACKAGE := gnugk
+DEBVERSION := $(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
+DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[^-]\+$$//')
+UPVERSION := $(shell echo $(DEB_SRC_VERSION) | sed 's/~dfsg//')
+FILENAME := $(PACKAGE)_$(DEB_SRC_VERSION).orig.tar.gz
+UPFILENAME := $(PACKAGE)-$(UPVERSION).tar.gz
+URL := http://qa.debian.org/watch/sf.php/openh323gk/$(UPFILENAME)
+
 
 ## pwlib_compat.h does not set this on OpenH323 >= 1.19 by mistake
 export STDCCFLAGS+= -DhasSRV=1
-
 
 export PREFIX=/usr/
 export OPENH323DIR=/usr/share/openh323
 export OPENH323MAKEDIR=/usr/share/openh323
 export OH323_LIBDIR=/usr/lib
 export PTLIB_CONFIG=/usr/bin/ptlib-config
-export PTLIBDIR=$(shell /usr/bin/ptlib-config --ptlibdir)
+export PTLIBDIR=$(shell [ -x /usr/bin/ptlib-config ]&&/usr/bin/ptlib-config --ptlibdir)
 
 %:
 	dh $@ --parallel --with autotools_dev
@@ -46,8 +53,16 @@
 	chmod -x debian/gnugk/usr/share/doc/gnugk/examples/odbc.ini
 
 get-orig-source:
-	@if [ -x /usr/bin/uscan ];then \
-		uscan --no-conf --rename --force-download --download-current-version --destdir=. ; \
-	else; \
-		echo "Please install uscan and run again."; \
+	@@if [ -x /usr/bin/wget ];then \
+		echo 'Grabbing original upstream tarball...' ; \
+		wget -nv --content-disposition $(URL) ; \
+		echo 'Repacking as DFSG-free (removing configure.exe)' ; \
+		mkdir gnugk-tmp ; cd gnugk-tmp ; tar xf "../$(UPFILENAME)" ; \
+		rm -f gnugk*/configure.exe ../$(UPFILENAME) ; \
+		echo "Writing new archive $(FILENAME)" ; \
+		tar cfz ../$(FILENAME) gnugk-* ; \
+		echo "Cleaning up..." ; \
+		cd .. ; rm -rf gnugk-tmp ; \
+	else \
+		echo "Please install wget and run again."; \
 	fi

Modified: gnugk/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/watch?rev=9240&op=diff
==============================================================================
--- gnugk/trunk/debian/watch (original)
+++ gnugk/trunk/debian/watch Sat Aug  6 21:17:56 2011
@@ -1,4 +1,4 @@
 version=3
-
+opts=dversionmangle=s/\~dfsg// \
 http://sf.net/openh323gk/gnugk-([\d\.-]+)\.tar\.gz	debian	svn-upgrade