[Pkg-voip-commits] r8425 - in /opal/branches/opal-3.6/debian: changelog control rules

[msp at alioth.debian.org]

Author: msp
Date: Fri May 28 22:55:19 2010
New Revision: 8425

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8425
Log:
Drop libptX.X.X-plugins - included in libptX.X.X library binary

Modified:
    opal/branches/opal-3.6/debian/changelog
    opal/branches/opal-3.6/debian/control
    opal/branches/opal-3.6/debian/rules

Modified: opal/branches/opal-3.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/changelog?rev=8425&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/changelog (original)
+++ opal/branches/opal-3.6/debian/changelog Fri May 28 22:55:19 2010
@@ -8,8 +8,9 @@
   [ Mark Purcell ]
   * Fix "opal should build-depend on libsrtp-dev, and libopal-dev should
     depend on libsrtp0-dev"  Build Depends added (Closes: #575195)
-
- -- Mark Purcell <msp at debian.org>  Sat, 15 May 2010 07:14:41 +1000
+  * Drop libptX.X.X-plugins - included in libptX.X.X library binary
+
+ -- Mark Purcell <msp at debian.org>  Sat, 15 May 2010 14:48:52 +1000
 
 opal (3.6.6~dfsg-6) unstable; urgency=low
 

Modified: opal/branches/opal-3.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/control?rev=8425&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/control (original)
+++ opal/branches/opal-3.6/debian/control Fri May 28 22:55:19 2010
@@ -16,8 +16,6 @@
 Package: libopal3.6.8
 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.
  .
@@ -32,9 +30,9 @@
 Package: libopal-dev
 Section: libdevel
 Architecture: any
-Conflicts: openmpi-dev, libopal-snapshot-dev, libopal3.3-beta1-dev
+Conflicts: openmpi-dev
 Depends: ${misc:Depends}, libopal3.6.8 (= ${binary:Version}), libpt-dev (>= 2.6.7), libspeexdsp-dev,
- libopal0-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390]
+ 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
@@ -49,7 +47,7 @@
 Package: simpleopal
 Section: comm
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopal3.6.8 (= ${binary:Version}), libpt2.6.7-plugins
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopal3.6.8 (= ${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.

Modified: opal/branches/opal-3.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/rules?rev=8425&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/rules (original)
+++ opal/branches/opal-3.6/debian/rules Fri May 28 22:55:19 2010
@@ -2,7 +2,7 @@
 
 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