[Pkg-voip-commits] r2591 - in openh323: branches/sarge/debian
trunk/debian
Kilian Krause
kilian at costa.debian.org
Sun Oct 22 11:12:32 UTC 2006
Author: kilian
Date: 2006-10-22 11:12:32 +0000 (Sun, 22 Oct 2006)
New Revision: 2591
Modified:
openh323/branches/sarge/debian/changelog
openh323/branches/sarge/debian/rules
openh323/trunk/debian/changelog
openh323/trunk/debian/rules
Log:
do a full DFSG-repack including removal of iLBC. Let's hope this compiles through as should. Testing now. ;)
Modified: openh323/branches/sarge/debian/changelog
===================================================================
--- openh323/branches/sarge/debian/changelog 2006-10-22 10:53:24 UTC (rev 2590)
+++ openh323/branches/sarge/debian/changelog 2006-10-22 11:12:32 UTC (rev 2591)
@@ -1,19 +1,19 @@
-openh323 (1.18.0-3) UNRELEASED; urgency=high
+openh323 (1.18.0.dfsg-1) unstable; urgency=high
[ Kilian Krause ]
- * NOT RELEASED YET
* Correct the versioned dependency to the lib we're building right now to
overcome problems like #392522. Setting urgency=high, for we're closing an
RC-bug.
+ * Remove IETF drafts and iLBC. Therefore DFSG-repacking. (Closes: #393402)
* Add get-orig-source target.
* Minor cleanups to debian/rules like renaming Makefile target to
config.status and making the autotools target somewhat more violent to
- keep somewhat a consistency among the libs.
+ keep somewhat a consistency among the libs. (Closes: #393647)
[ Mark Purcell ]
* Update debian/watch for numerics
- -- Kilian Krause <kilian at debian.org> Sun, 22 Oct 2006 11:17:20 +0200
+ -- Kilian Krause <kilian at debian.org> Sun, 22 Oct 2006 13:10:53 +0200
openh323 (1.18.0-2) unstable; urgency=low
Modified: openh323/branches/sarge/debian/rules
===================================================================
--- openh323/branches/sarge/debian/rules 2006-10-22 10:53:24 UTC (rev 2590)
+++ openh323/branches/sarge/debian/rules 2006-10-22 11:12:32 UTC (rev 2591)
@@ -32,7 +32,7 @@
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
-FILENAME := openh323_$(UPVERSION)~dfsg.orig.tar.gz
+FILENAME := openh323_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := openh323_$(UPVERSION).orig.tar.gz
URL := http://www.voxgratia.org/releases/openh323-v$(URLVERSION)-src-tar.gz
@@ -191,9 +191,32 @@
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ifneq (,$(findstring dfsg,$(DEBVERSION)))
+ @@echo Downloading $(UPFILENAME) from $(URL) for repacking ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ @@echo Repacking as DFSG-free...
+ @@mkdir -p ../tarballs/openh323-$(UPVERSION).tmp/
+ @@cd ../tarballs/openh323-$(UPVERSION).tmp ; \
+ tar xfz ../$(UPFILENAME)
+ @@rm -rf ../tarballs/openh323-$(UPVERSION).tmp/openh323*/plugins/audio/iLBC/
+ @@for conffile in plugins/configure.ac plugins/configure plugins/Makefile;do \
+ sed -i -e '/iLBC/d' ../tarballs/openh323-$(UPVERSION).tmp/openh323*/$$conffile;\
+ done
+ @@echo Writing archive ../tarballs/$(FILENAME)
+ @@cd ../tarballs/openh323-$(UPVERSION).tmp ; \
+ tar cfz ../$(FILENAME) *
+ @@echo Cleaning up...
+ @@$(RM) -rf ../tarballs/openh323-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+else
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
- @@echo Ready for packaging.;\
+ @@if ( tar tfvz ../tarballs/$(UPFILENAME)|grep -q draft-ietf- );then \
+ echo Upstream release not DFSG-clean, removing.; \
+ $(RM) ../tarballs/$(UPFILENAME);false; \
+ else \
+ echo Ready for packaging.;\
+ fi
+endif
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched
+.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch
Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog 2006-10-22 10:53:24 UTC (rev 2590)
+++ openh323/trunk/debian/changelog 2006-10-22 11:12:32 UTC (rev 2591)
@@ -1,18 +1,19 @@
-openh323 (1.18.0-3) unstable; urgency=high
+openh323 (1.18.0.dfsg-1) unstable; urgency=high
[ Kilian Krause ]
* Correct the versioned dependency to the lib we're building right now to
overcome problems like #392522. Setting urgency=high, for we're closing an
RC-bug.
+ * Remove IETF drafts and iLBC. Therefore DFSG-repacking. (Closes: #393402)
* Add get-orig-source target.
* Minor cleanups to debian/rules like renaming Makefile target to
config.status and making the autotools target somewhat more violent to
- keep somewhat a consistency among the libs.
+ keep somewhat a consistency among the libs. (Closes: #393647)
[ Mark Purcell ]
* Update debian/watch for numerics
- -- Kilian Krause <kilian at debian.org> Sun, 22 Oct 2006 11:17:20 +0200
+ -- Kilian Krause <kilian at debian.org> Sun, 22 Oct 2006 13:10:53 +0200
openh323 (1.18.0-2) unstable; urgency=low
Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules 2006-10-22 10:53:24 UTC (rev 2590)
+++ openh323/trunk/debian/rules 2006-10-22 11:12:32 UTC (rev 2591)
@@ -32,7 +32,7 @@
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
-FILENAME := openh323_$(UPVERSION)~dfsg.orig.tar.gz
+FILENAME := openh323_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := openh323_$(UPVERSION).orig.tar.gz
URL := http://www.voxgratia.org/releases/openh323-v$(URLVERSION)-src-tar.gz
@@ -191,9 +191,32 @@
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ifneq (,$(findstring dfsg,$(DEBVERSION)))
+ @@echo Downloading $(UPFILENAME) from $(URL) for repacking ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ @@echo Repacking as DFSG-free...
+ @@mkdir -p ../tarballs/openh323-$(UPVERSION).tmp/
+ @@cd ../tarballs/openh323-$(UPVERSION).tmp ; \
+ tar xfz ../$(UPFILENAME)
+ @@rm -rf ../tarballs/openh323-$(UPVERSION).tmp/openh323*/plugins/audio/iLBC/
+ @@for conffile in plugins/configure.ac plugins/configure plugins/Makefile;do \
+ sed -i -e '/iLBC/d' ../tarballs/openh323-$(UPVERSION).tmp/openh323*/$$conffile;\
+ done
+ @@echo Writing archive ../tarballs/$(FILENAME)
+ @@cd ../tarballs/openh323-$(UPVERSION).tmp ; \
+ tar cfz ../$(FILENAME) *
+ @@echo Cleaning up...
+ @@$(RM) -rf ../tarballs/openh323-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+else
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
- @@echo Ready for packaging.;\
+ @@if ( tar tfvz ../tarballs/$(UPFILENAME)|grep -q draft-ietf- );then \
+ echo Upstream release not DFSG-clean, removing.; \
+ $(RM) ../tarballs/$(UPFILENAME);false; \
+ else \
+ echo Ready for packaging.;\
+ fi
+endif
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched
+.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch
More information about the Pkg-voip-commits
mailing list