[Pkg-voip-commits] r6128 - in /opal/branches/experimental/debian: changelog patches/00list patches/remove_ilbc.dpatch rules

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Wed Sep  3 16:24:17 2008
New Revision: 6128

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6128
Log:
Remove iLBC sources and modified package version accordingly.

Removed:
    opal/branches/experimental/debian/patches/remove_ilbc.dpatch
Modified:
    opal/branches/experimental/debian/changelog
    opal/branches/experimental/debian/patches/00list
    opal/branches/experimental/debian/rules

Modified: opal/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/changelog?rev=6128&op=diff
==============================================================================
--- opal/branches/experimental/debian/changelog (original)
+++ opal/branches/experimental/debian/changelog Wed Sep  3 16:24:17 2008
@@ -1,4 +1,4 @@
-opal (0.svn20080816-1) experimental; urgency=low
+opal (0.svn20080816.dfsg-1) experimental; urgency=low
 
   * First upload to debian.
 

Modified: opal/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/patches/00list?rev=6128&op=diff
==============================================================================
--- opal/branches/experimental/debian/patches/00list (original)
+++ opal/branches/experimental/debian/patches/00list Wed Sep  3 16:24:17 2008
@@ -1,4 +1,3 @@
 libname
-#remove_ilbc
 speexcodec
 speex-remove-version-cmp

Modified: opal/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/rules?rev=6128&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Wed Sep  3 16:24:17 2008
@@ -66,7 +66,7 @@
 	touch autotools
 
 check-ilbc:
-	if [ -d src/codec/iLBC ];then \
+	if [ -d plugins/audio/iLBC ];then \
 	   echo "ERROR: iLBC code must be removed from upstream sources" ; false ; \
 	fi
 	touch $@
@@ -148,8 +148,6 @@
 	mkdir debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
 	#- because cannot move a directory into itself
 	-mv debian/$(PACKAGE)/usr/lib/ptlib/* debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
-	#iLBC is not DFSG
-	rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/audio/ilbc*
 	#remove non-free video codecs (if any)
 	-rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/video/h264*
 	-rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/video/h263-1998*
@@ -260,6 +258,8 @@
 	@@svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk@$(REV) ../tarballs/opal-$(REV).tmp
 	@@echo 'Getting the changelog (might take 15 min) ...'
 	@@cd ../tarballs/opal-$(REV).tmp; svn2cl -o changelog
+	@@echo Removing iLBC non-free code...
+	@@cd ../tarballs/opal-$(REV).tmp; rm -rf plugins/audio/iLBC
 	@@echo Creating the tarball ...
 	@@cd ../tarballs/opal-$(REV).tmp; find . -name .svn -exec rm -rf {} \; ; tar zcf ../opal.orig.tar.gz *
 	@@rm -rf ../tarballs/opal-$(REV).tmp