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

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Fri May 14 19:58:12 2010
New Revision: 8385

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8385
Log:
Remove Build-Conflict with its own runtime

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=8385&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/changelog (original)
+++ opal/branches/opal-3.6/debian/changelog Fri May 14 19:58:12 2010
@@ -1,3 +1,10 @@
+opal (3.6.7~dfsg-1) UNRELEASED; urgency=low
+
+  [Eugen Dedu]
+  * Remove Build-Conflict with its own runtime
+
+ -- Mark Purcell <msp at debian.org>  Sat, 01 May 2010 07:37:48 +1000
+
 opal (3.6.6~dfsg-6) unstable; urgency=low
 
   * Include *.mak in /usr/include/opal/

Modified: opal/branches/opal-3.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/control?rev=8385&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/control (original)
+++ opal/branches/opal-3.6/debian/control Fri May 14 19:58:12 2010
@@ -7,8 +7,7 @@
  libpt-dev (>= 2.6.5),
  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
  libcapi20-dev
-Build-Conflicts: libopal3.6.6, libopal-2.2,
- libx264-dev, libcelt-dev
+Build-Conflicts: libx264-dev, libcelt-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/branches/opal-3.6/

Modified: opal/branches/opal-3.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/rules?rev=8385&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/rules (original)
+++ opal/branches/opal-3.6/debian/rules Fri May 14 19:58:12 2010
@@ -26,15 +26,6 @@
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog*.txt
 
-override_dh_auto_test:
-	if (samples/simple/obj*/simpleopal --help >/dev/null);then \
-		echo shared simpleopal incorrectly compiled static; false;\
-	else \
-		echo shared simpleopal correctly compiled non-static; \
-	fi
-	ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj*/simpleopal --help >/dev/null
-	rm lib
-
 override_dh_strip:
 	dh_strip -a --dbg-package=libopal3.6.6-dbg