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

[msp at alioth.debian.org]

Author: msp
Date: Sun May 30 08:54:29 2010
New Revision: 8437

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8437
Log:
Releasing

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=8437&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun May 30 08:54:29 2010
@@ -1,10 +1,10 @@
-opal (3.8.1~dfsg-1) UNRELEASED; urgency=low
+opal (3.8.1~dfsg-1) experimental; urgency=low
 
   * New upstream release
     - NEW packages libopal[3.8.1,-dbg] - soname bump
   * Merge from branches/opal3.6
 
- -- Mark Purcell <msp at debian.org>  Sun, 30 May 2010 16:13:58 +1000
+ -- Mark Purcell <msp at debian.org>  Sun, 30 May 2010 17:29:57 +1000
 
 opal (3.6.8~dfsg-1) unstable; urgency=low
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=8437&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Sun May 30 08:54:29 2010
@@ -9,7 +9,8 @@
  libcelt-dev,
  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
  libcapi20-dev
-Build-Conflicts: libx264-dev
+Build-Conflicts: libopal-dev, libx264-dev,
+ libopal3.8.1, libopal3.6.8, libopal3.6.6
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/
@@ -34,7 +35,7 @@
 Section: libdevel
 Architecture: any
 Conflicts: openmpi-dev
-Depends: ${misc:Depends}, libopal3.8.1 (= ${binary:Version}), libpt-dev (>= 2.8.1), libspeexdsp-dev
+Depends: ${misc:Depends}, libopal3.8.1 (= ${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
@@ -63,6 +64,8 @@
 Section: debug
 Priority: extra
 Depends: ${misc:Depends}, libopal3.8.1 (= ${binary:Version})
+Conflicts: libopal3.6.8-dbg, libopal3.6.6-dbg
+Replaces: libopal3.6.8-dbg, libopal3.6.6-dbg
 Architecture: any
 Description: OPAL library debug symbols
  This package contains the shared and static debug symbols of the

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=8437&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Sun May 30 08:54:29 2010
@@ -22,8 +22,9 @@
 	dh_auto_build -- opt docs
 	$(MAKE) PTLIBDIR=/usr OPALDIR=$(CURDIR) -C samples/simple
 
-override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog*.txt
+# Upstream dropped ChangeLog :-(
+#override_dh_installchangelogs:
+#	dh_installchangelogs ChangeLog*.txt
 
 override_dh_auto_test:
 	if (samples/simple/obj*/simpleopal --help >/dev/null);then \