[Pkg-voip-commits] r8384 - in /ptlib/branches/ptlib-2.6/debian: changelog control rules

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Fri May 14 19:39:46 2010
New Revision: 8384

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8384
Log:
  - Fix FTBFS on GNU/kFreeBSD (Closes: #545948)
* Remove Build-Conflict with its own runtime (Closes: #459712)

Modified:
    ptlib/branches/ptlib-2.6/debian/changelog
    ptlib/branches/ptlib-2.6/debian/control
    ptlib/branches/ptlib-2.6/debian/rules

Modified: ptlib/branches/ptlib-2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.6/debian/changelog?rev=8384&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.6/debian/changelog (original)
+++ ptlib/branches/ptlib-2.6/debian/changelog Fri May 14 19:39:46 2010
@@ -1,12 +1,17 @@
 ptlib (2.6.6-1) UNRELEASED; urgency=low
 
+  [Mark Purcell]
   * New upstream release
     - NEW package libpt2.6.6 - soname bump
+    - Fix FTBFS on GNU/kFreeBSD (Closes: #545948)
   * Constrain debian/watch to just track 2.6 series (Lalande release)
     - Move to svn://svn.debian.org/pkg-voip/ptlib/branches/ptlib-2.6
   * Switch to dh (7) - drop cdbs
   * Depreciate libpt2.4.5-plugins -> libpt2.4.5
     - Makes dependent packages binNMU safe
+
+  [Eugen Dedu]
+  * Remove Build-Conflict with its own runtime (Closes: #459712)
 
  -- Mark Purcell <msp at debian.org>  Sat, 01 May 2010 13:52:11 +1000
 

Modified: ptlib/branches/ptlib-2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.6/debian/control?rev=8384&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.6/debian/control (original)
+++ ptlib/branches/ptlib-2.6/debian/control Fri May 14 19:39:46 2010
@@ -5,13 +5,10 @@
 Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, doxygen, pkg-config, bison, flex,
  unixodbc-dev, libssl-dev, libldap2-dev, libsasl2-dev, libkrb5-dev, libexpat1-dev,
- libsdl1.2-dev, libdv4-dev, 
+ libsdl1.2-dev, libdv4-dev,
  libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libasound2-dev  [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Build-Conflicts:
-  libpt2.6.5,
-  libpt-1.10.10, libpt-1.10.10-ptrace, libpt-1.10.10-develop,
-  libpt-dev
+Build-Conflicts: libpt-dev
 Standards-Version: 3.8.4
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/ptlib/branches/ptlib-2.6

Modified: ptlib/branches/ptlib-2.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.6/debian/rules?rev=8384&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.6/debian/rules (original)
+++ ptlib/branches/ptlib-2.6/debian/rules Fri May 14 19:39:46 2010
@@ -11,16 +11,3 @@
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libpt2.6.6-dbg
-
-override_dh_auto_test:
-	$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world clean
-	$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world opt
-	if (samples/hello_world/obj*/hello 2>/dev/null);then \
-	   echo opt hello_world sample incorrectly compiled static; false ; \
-	else \
-	   echo opt hello_world sample correctly compiled non-static; \
-	fi
-	ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj*/hello
-	# if this won't work, we needn't even try going any further...
-	rm lib
-