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

[kilian at alioth.debian.org]

Author: kilian
Date: Wed Sep 19 10:17:44 2007
New Revision: 4516

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4516
Log:
* Fix dh_strip call using libopal-ptrace rather than $(PACKAGE)-ptrace
  (Closes: #442975)
* Conflict with our own binary library packages to fix false negative build
  checks (Closes: #440928)

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=4516&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Wed Sep 19 10:17:44 2007
@@ -10,13 +10,17 @@
   * Update debian/watch.
   * Fix remaining debian-rules-ignores-make-clean-error
   * Don't set DH_COMPAT in rules.
+  * Fix dh_strip call using libopal-ptrace rather than $(PACKAGE)-ptrace
+    (Closes: #442975)
+  * Conflict with our own binary library packages to fix false negative build
+    checks (Closes: #440928)
 
   [ Faidon Liambotis ]
   * Adapt shlibs to depend on the upstream's version number and not the Debian
     version number, since we don't extend the ABI. This also imitates
     debhelper's behavior.
 
- -- Kilian Krause <kilian at debian.org>  Tue, 18 Sep 2007 08:26:01 +0200
+ -- Kilian Krause <kilian at debian.org>  Wed, 19 Sep 2007 12:15:18 +0200
 
 opal (2.2.8~dfsg1-2) unstable; urgency=low
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=4516&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Wed Sep 19 10:17:44 2007
@@ -5,7 +5,7 @@
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
 Build-Depends: debhelper (>= 4.0.2), libpt-dev (>= 1.10.10~), g++ (>= 2.95), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev (>= 1.1.11), dpkg-dev (>= 1.13.19)
 Build-Depends-Indep: doxygen
-Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopal-dev
+Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop
 Standards-Version: 3.6.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/opal/?op=log

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=4516&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Wed Sep 19 10:17:44 2007
@@ -247,7 +247,7 @@
 	dh_testdir
 	dh_testroot
 ifneq (4,$(DH_COMPAT))
-	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libopal-dbg
+	dh_strip -Nlibopal-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libopal-dbg
 	# can't ship those in libopal-dbg due to namespace overlap
 	dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-ptrace
 	dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=$(PACKAGE)-develop