[Pkg-voip-commits] r8434 - in /opal/trunk/debian: changelog control libopal-dev.install rules

msp at alioth.debian.org msp at alioth.debian.org
Sun May 30 06:13:15 UTC 2010


Author: msp
Date: Sun May 30 06:13:11 2010
New Revision: 8434

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8434
Log:
  - NEW packages libopal[3.8.0,-dbg] - soname bump
* Merge from branches/opal3.6
* New upstream release (Closes: #572384, #583420)
  - NEW packages libopal3.6.8[-dbg] - soname bump
* Remove Build-Conflict with its own runtime
* add back celt building
* Fix "opal should build-depend on libsrtp-dev, and libopal-dev should
  depend on libsrtp0-dev"  Build Depends added (Closes: #575195)
* Drop libptX.X.X-plugins - included in libptX.X.X library binary
* Include *.mak in /usr/include/opal/
* simpleopal Depends: back to libpt2.6.5-plugins
  - "simpleopal: Depends on unavailable libpt2.6.6-plugins" (Closes: #579765)

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/control
    opal/trunk/debian/libopal-dev.install
    opal/trunk/debian/rules

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=8434&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun May 30 06:13:11 2010
@@ -1,10 +1,34 @@
 opal (3.8.0~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
-    - NEW package libopal3.8.0 - soname bump
-  * Merge changes from branches/ opal (3.6.6~dfsg-5)
+    - NEW packages libopal[3.8.0,-dbg] - soname bump
+  * Merge from branches/opal3.6
 
  -- Mark Purcell <msp at debian.org>  Mon, 26 Apr 2010 15:31:20 +1000
+
+opal (3.6.8~dfsg-1) unstable; urgency=low
+
+  * New upstream release (Closes: #572384, #583420)
+    - NEW packages libopal3.6.8[-dbg] - soname bump
+
+  [ Eugen Dedu ]
+  * Remove Build-Conflict with its own runtime
+  * add back celt building
+
+  [ Mark Purcell ]
+  * Fix "opal should build-depend on libsrtp-dev, and libopal-dev should
+    depend on libsrtp0-dev"  Build Depends added (Closes: #575195)
+  * Drop libptX.X.X-plugins - included in libptX.X.X library binary
+
+ -- Mark Purcell <msp at debian.org>  Sat, 29 May 2010 10:42:18 +1000
+
+opal (3.6.6~dfsg-6) unstable; urgency=low
+
+  * Include *.mak in /usr/include/opal/
+  * simpleopal Depends: back to libpt2.6.5-plugins
+    - "simpleopal: Depends on unavailable libpt2.6.6-plugins" (Closes: #579765)
+
+ -- Mark Purcell <msp at debian.org>  Sat, 01 May 2010 07:37:48 +1000
 
 opal (3.6.6~dfsg-5) unstable; urgency=low
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=8434&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Sun May 30 06:13:11 2010
@@ -4,22 +4,21 @@
 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.0.50~), doxygen, autotools-dev, pkg-config,
- libpt-dev (>= 2.8.0),
+ libpt-dev (>= 2.8.1),
+ libsrtp-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390],
+ libcelt-dev,
  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
  libcapi20-dev
-Build-Conflicts: libopal3.8.0, libopal3.6.6, libopal-2.2,
- libx264-dev, libcelt-dev
+Build-Conflicts: libx264-dev
 Standards-Version: 3.8.3
 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
+DM-Upload-Allowed: yes
 
 Package: libopal3.8.0
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libspeex1, libspeexdsp1
-Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal3.3-beta1
-Replaces: libopal3.3-beta1
 Description: Open Phone Abstraction Library - successor of OpenH323
  This package contains the shared version of the OPAL library.
  .
@@ -34,11 +33,11 @@
 Package: libopal-dev
 Section: libdevel
 Architecture: any
-Conflicts: openmpi-dev, libopal-snapshot-dev, libopal3.3-beta1-dev
-Depends: ${misc:Depends}, libopal3.8.0 (= ${binary:Version}), libpt-dev (>= 2.6.5), libspeexdsp-dev
+Conflicts: openmpi-dev
+Depends: ${misc:Depends}, libopal3.8.0 (= ${binary:Version}), libpt-dev (>= 2.8.1), libspeexdsp-dev
+ libsrtp0-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390]
 Suggests: pkg-config
 Recommends: libopal-doc
-Replaces: libopal-snapshot-dev, libopal3.3-beta1-dev
 Description: OPAL library header files
  This package contains the headers and a static version of the OPAL library.
  .
@@ -50,7 +49,7 @@
 Package: simpleopal
 Section: comm
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopal3.8.0 (= ${binary:Version}), libpt2.8.0-plugins
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopal3.8.0 (= ${binary:Version})
 Description: Simple example from the OPAL project
  This package contains a small H323 and SIP client given as an example. You
  can find its code on the doc package.
@@ -60,12 +59,10 @@
  everybody.  These protocols are most used for Voice over IP (VoIP)
  conferencing.
 
-Package: libopal3.8.0-dbg
+Package: libopal-dbg
 Section: debug
 Priority: extra
 Depends: ${misc:Depends}, libopal3.8.0 (= ${binary:Version})
-Replaces: libopal3.3-beta1-dbg
-Conflicts: libopal3.3-beta1-dbg
 Architecture: any
 Description: OPAL library debug symbols
  This package contains the shared and static debug symbols of the

Modified: opal/trunk/debian/libopal-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal-dev.install?rev=8434&op=diff
==============================================================================
--- opal/trunk/debian/libopal-dev.install (original)
+++ opal/trunk/debian/libopal-dev.install Sun May 30 06:13:11 2010
@@ -3,3 +3,4 @@
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 version.h usr/include/opal/
+*.mak usr/include/opal/

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=8434&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Sun May 30 06:13:11 2010
@@ -2,22 +2,21 @@
 
 DEBVERSION := $(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~dfsg//')
+UPVERSION := $(shell echo $(DEBVERSION) | sed 's/~dfsg-.//')
 
 FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
 UPFILENAME := opal_$(UPVERSION).orig.tar.gz
 URL := http://transact.dl.sourceforge.net/sourceforge/opalvoip/opal-$(UPVERSION).tar.bz2
 
 %:
-	dh $@
+	dh $@ --parallel
 
 
 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
+	dh_auto_configure 
 
 override_dh_auto_build:
 	dh_auto_build -- opt docs
@@ -36,7 +35,7 @@
 	rm lib
 
 override_dh_strip:
-	dh_strip -a --dbg-package=libopal3.6.6-dbg
+	dh_strip -a --dbg-package=libopal-dbg
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"




More information about the Pkg-voip-commits mailing list