[Pkg-voip-commits] r8333 - in /opal/trunk/debian: changelog control rules

Mon Apr 26 05:32:38 UTC 2010

Author: msp
Date: Mon Apr 26 05:32:37 2010
New Revision: 8333

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8333
Log:
Merge changes from branches/ opal (3.6.6~dfsg-5)

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/control
    opal/trunk/debian/rules

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=8333&op=diff
==============================================================================

--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Mon Apr 26 05:32:37 2010
@@ -1,9 +1,20 @@
-opal (3.8.0~dfsg-1) experimental; urgency=low
+opal (3.8.0~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * NEW package libopal3.8.0 - soname bump
-
- -- Mark Purcell <msp at debian.org>  Sun, 07 Mar 2010 09:33:46 +1100
+    - NEW package libopal3.8.0 - soname bump
+  * Merge changes from branches/ opal (3.6.6~dfsg-5)
+
+ -- Mark Purcell <msp at debian.org>  Mon, 26 Apr 2010 15:31:20 +1000
+
+opal (3.6.6~dfsg-5) unstable; urgency=low
+
+  * Constrain debian/watch to track 3.6 series (Lalande release)
+  * Move to svn://svn.debian.org/pkg-voip/opal/branches/opal-3.6/
+  * Switch to debhelper 7
+  * Drop unused dpatch, cdbs
+  * Do not exclude simpleopal from dh_strip 
+
+ -- Mark Purcell <msp at debian.org>  Mon, 26 Apr 2010 11:55:39 +1000
 
 opal (3.6.6~dfsg-4) unstable; urgency=low
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=8333&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Mon Apr 26 05:32:37 2010
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
-Build-Depends: debhelper (>= 7), cdbs, dpatch, doxygen, autotools-dev, pkg-config,
+Build-Depends: debhelper (>= 7.0.50~), doxygen, autotools-dev, pkg-config,
  libpt-dev (>= 2.8.0),
  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
  libcapi20-dev
-Build-Conflicts: libopal3.8.0, libopal3.6.4, libopal3.6.3, libopal3.6.1, libopal3.4.2, libopal3.4.1, libopal3.3-beta1, libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop,
+Build-Conflicts: libopal3.8.0, libopal3.6.6, libopal-2.2,
  libx264-dev, libcelt-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=8333&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Mon Apr 26 05:32:37 2010
@@ -1,33 +1,32 @@
 #!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 DEBVERSION := $(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~dfsg//')
-REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
 
 FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
 UPFILENAME := opal_$(UPVERSION).orig.tar.gz
-#URL := http://ftp.gnome.org/pub/gnome/sources/opal/3.6/opal-$(UPVERSION).tar.gz
 URL := http://transact.dl.sourceforge.net/sourceforge/opalvoip/opal-$(UPVERSION).tar.bz2
 
-DEB_MAKE_BUILD_TARGET := opt docs
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog*.txt
-DEB_DH_STRIP_ARGS += --exclude=simpleopal
+%:
+	dh $@
 
-# celt changes its API too fast, so upstream does not keep track with them
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-celt
 
-makebuilddir/libopal-dev::
+override_dh_auto_configure:
 	if [ -d plugins/audio/iLBC ];then \
 	   echo "ERROR: iLBC code must be removed from upstream sources" ; false ; \
 	fi
+# celt changes its API too fast, so upstream does not keep track with them
+	dh_auto_configure -- --disable-celt
 
-build/simpleopal::
+override_dh_auto_build:
+	dh_auto_build -- opt docs
 	$(MAKE) PTLIBDIR=/usr OPALDIR=$(CURDIR) -C samples/simple
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog*.txt
+
+override_dh_auto_test:
 	if (samples/simple/obj*/simpleopal --help >/dev/null);then \
 		echo shared simpleopal incorrectly compiled static; false;\
 	else \
@@ -35,6 +34,9 @@
 	fi
 	ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj*/simpleopal --help >/dev/null
 	rm lib
+
+override_dh_strip:
+	dh_strip -a --dbg-package=libopal3.6.6-dbg
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
@@ -55,16 +57,3 @@
 	@@cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
 	@@echo Cleaning up...
 	@@$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
-
-get-orig-source-svn:
-	@@#and this is for SVN
-	@@#echo 'Checking out for repacking (might take 15 min) ...'
-	@@#svn export 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; tar zcf ../opal_$(UPVERSION).orig.tar.gz *
-	@@#rm -rf ../tarballs/opal-$(REV).tmp
-	@@echo Ready for packaging.


