[Pkg-voip-commits] r7065 - in /opal/trunk/debian: changelog control libopal-dev.install libopal3.6.1.install rules simpleopal.install watch

msp at alioth.debian.org msp at alioth.debian.org
Mon Apr 27 03:59:04 UTC 2009 

Author: msp
Date: Mon Apr 27 03:59:03 2009
New Revision: 7065

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7065
Log:
* Use dh_install; Add [libopal-dev,simpleopal,libopal3.6.1].install
* TODO: libopal3.6.1-dbg

Added:
    opal/trunk/debian/libopal3.6.1.install
    opal/trunk/debian/simpleopal.install
Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/control
    opal/trunk/debian/libopal-dev.install
    opal/trunk/debian/rules
    opal/trunk/debian/watch

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=7065&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Mon Apr 27 03:59:03 2009
@@ -12,7 +12,9 @@
   [ Mark Purcell ]
   * NEW packages; libopal-dev, libopal2.6.1, libopal-doc, libopal2.6.1-dbg
   * debian/compat -> 7
-  * Use dh_install; Add libopal-dev.install, simpleopal.install
+  * Use dh_install; Add [libopal-dev,simpleopal,libopal3.6.1].install
+ 
+  * TODO: libopal3.6.1-dbg
 
  -- Mark Purcell <msp at debian.org>  Mon, 27 Apr 2009 12:37:07 +1000
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7065&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Mon Apr 27 03:59:03 2009
@@ -3,9 +3,9 @@
 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, libpt-dev (>= 2.6.1), dpatch, doxygen, autotools-dev, pkg-config,  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev
+Build-Depends: debhelper (>= 7), libpt-dev (>= 2.6.1), dpatch, doxygen, autotools-dev, pkg-config,  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev
 Build-Conflicts: 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
-Standards-Version: 3.8.0.0
+Standards-Version: 3.8.1
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/opal/?op=log

Modified: opal/trunk/debian/libopal-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal-dev.install?rev=7065&op=diff
==============================================================================
--- opal/trunk/debian/libopal-dev.install (original)
+++ opal/trunk/debian/libopal-dev.install Mon Apr 27 03:59:03 2009
@@ -1,5 +1,5 @@
-usr/include
-usr/lib/pkgconfig
-usr/lib/libopal_s.a
-usr/lib/libopal.so*
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
 version.h usr/include/opal/

Added: opal/trunk/debian/libopal3.6.1.install
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal3.6.1.install?rev=7065&op=file
==============================================================================
--- opal/trunk/debian/libopal3.6.1.install (added)
+++ opal/trunk/debian/libopal3.6.1.install Mon Apr 27 03:59:03 2009
@@ -1,0 +1,2 @@
+usr/lib/lib*.so.*
+usr/lib/opal*

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=7065&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Mon Apr 27 03:59:03 2009
@@ -112,25 +112,21 @@
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_prep -i
 	dh_installdirs -i
 
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -a
+	dh_prep -a
 	dh_installdirs -a
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 	#remove non-free video codecs (if any)
-	-rm debian/tmp/usr/lib/opal-*/codecs/video/h264*
-	-rm debian/tmp/usr/lib/opal-*/codecs/video/h263-1998*
-	-rm debian/tmp/usr/lib/opal-*/codecs/video/mpeg4*
-
-	mkdir debian/$(PACKAGE)/usr/lib
-	mv debian/tmp/usr/lib/libopal.so.*.*[.-]* debian/$(PACKAGE)/usr/lib
-	mv debian/tmp/usr/lib/opal* debian/$(PACKAGE)/usr/lib
+	-rm -f debian/tmp/usr/lib/opal-*/codecs/video/h264*
+	-rm -f debian/tmp/usr/lib/opal-*/codecs/video/h263-1998*
+	-rm -f debian/tmp/usr/lib/opal-*/codecs/video/mpeg4*
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi
@@ -143,6 +139,7 @@
 	dh_installman
 	dh_installexamples -p$(PACKAGE)
 	dh_installchangelogs -N$(PACKAGE)-dbg
+
 	dh_install
 
 	dh_link

Added: opal/trunk/debian/simpleopal.install
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/simpleopal.install?rev=7065&op=file
==============================================================================
--- opal/trunk/debian/simpleopal.install (added)
+++ opal/trunk/debian/simpleopal.install Mon Apr 27 03:59:03 2009
@@ -1,0 +1,1 @@
+samples/simple/obj*/simpleopal usr/bin

Modified: opal/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/watch?rev=7065&op=diff
==============================================================================
--- opal/trunk/debian/watch (original)
+++ opal/trunk/debian/watch Mon Apr 27 03:59:03 2009
@@ -2,5 +2,5 @@
 #  http://www.voxgratia.org/releases/opal-v(\d+)_(\d?[02468]+)([\d_]+)-src[\.-]tar\.gz	debian	svn-upgrade
 
 opts=dversionmangle=s/[\.~]dfsg(\d+)?//,uversionmangle=s/[_\.]+/\./g \
-  http://sf.net/opalvoip/opal-(\d.\d.\d).tar.gz debian svn-upgrade
+  http://sf.net/opalvoip/opal-(\d.\d.\d).tar.bz2 debian svn-upgrade

More information about the Pkg-voip-commits mailing list