[Pkg-voip-commits] r9571 - in /opal/trunk/debian: changelog libopal-doc.docs libopal-doc.examples patches/disable-samples-ftbfs.diff patches/series rules simpleopal.install

msp at alioth.debian.org msp at alioth.debian.org
Thu Mar 8 11:26:38 UTC 2012


Author: msp
Date: Thu Mar  8 11:26:37 2012
New Revision: 9571

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9571
Log:
* disable-samples-ftbfs too not build samples that currently FTBFS 
* Add libopal-doc.examples - samples

Added:
    opal/trunk/debian/libopal-doc.examples
    opal/trunk/debian/patches/disable-samples-ftbfs.diff
Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/libopal-doc.docs
    opal/trunk/debian/patches/series
    opal/trunk/debian/rules
    opal/trunk/debian/simpleopal.install

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=9571&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Thu Mar  8 11:26:37 2012
@@ -1,6 +1,6 @@
-opal (3.10.4~dfsg-1) UNRELEASED; urgency=low
-
-  * New Upstream Release
+opal (3.10.4~dfsg-1) unstable; urgency=low
+
+  * New Upstream Release 
     - NEW package libopal3.10.4 - soname change
 
   [ Eugen Dedu ]
@@ -8,8 +8,10 @@
 
   [ Mark Purcell ]
   * Drop symbol support - few rdepends and exporting lots of symbols (C++)
-
- -- Mark Purcell <msp at debian.org>  Sat, 08 Oct 2011 21:17:13 +1100
+  * disable-samples-ftbfs too not build samples that currently FTBFS 
+  * Add libopal-doc.examples - samples
+
+ -- Mark Purcell <msp at debian.org>  Thu, 08 Mar 2012 22:26:07 +1100
 
 opal (3.10.1~dfsg-1) experimental; urgency=low
 

Modified: opal/trunk/debian/libopal-doc.docs
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal-doc.docs?rev=9571&op=diff
==============================================================================
--- opal/trunk/debian/libopal-doc.docs (original)
+++ opal/trunk/debian/libopal-doc.docs Thu Mar  8 11:26:37 2012
@@ -1,1 +1,2 @@
-samples
+docs
+html

Added: opal/trunk/debian/libopal-doc.examples
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal-doc.examples?rev=9571&op=file
==============================================================================
--- opal/trunk/debian/libopal-doc.examples (added)
+++ opal/trunk/debian/libopal-doc.examples Thu Mar  8 11:26:37 2012
@@ -1,0 +1,1 @@
+samples

Added: opal/trunk/debian/patches/disable-samples-ftbfs.diff
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/disable-samples-ftbfs.diff?rev=9571&op=file
==============================================================================
--- opal/trunk/debian/patches/disable-samples-ftbfs.diff (added)
+++ opal/trunk/debian/patches/disable-samples-ftbfs.diff Thu Mar  8 11:26:37 2012
@@ -1,0 +1,14 @@
+Index: opal-3.10.4~dfsg/Makefile.in
+===================================================================
+--- opal-3.10.4~dfsg.orig/Makefile.in	2012-02-22 10:08:36.000000000 +1100
++++ opal-3.10.4~dfsg/Makefile.in	2012-03-08 08:32:44.000000000 +1100
+@@ -45,8 +45,7 @@
+            samples/codectest \
+            samples/callgen \
+            samples/opalecho \
+-           samples/faxopal \
+-           samples/c_api
++           samples/faxopal 
+ ifeq ($(OPAL_IVR),yes)
+ SUBDIRS += samples/opalmcu \
+            samples/ivropal \

Modified: opal/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/series?rev=9571&op=diff
==============================================================================
--- opal/trunk/debian/patches/series (original)
+++ opal/trunk/debian/patches/series Thu Mar  8 11:26:37 2012
@@ -1,2 +1,3 @@
+disable-samples-ftbfs.diff
 plugins_clean_target.patch
 #spandsp_autoconf_cppflags.patch

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=9571&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Thu Mar  8 11:26:37 2012
@@ -22,12 +22,11 @@
 	if [ -d plugins/audio/iLBC ];then \
 	   echo "DFSG ERROR: iLBC code must be removed from upstream sources" ; false ; \
 	fi
-	dh_auto_configure -- --disable-samples --disable-spandsp
+	dh_auto_configure -- --enable-samples --enable-spandsp
 
 override_dh_auto_build:
 	sed -e 's#^Libs: #Libs: -L$(OPAL_LIBDIR) #' opal.pc >samples/opal.pc
-	dh_auto_build 
-#	dh_auto_build -- PKG_CONFIG_PATH=$(CURDIR)/samples opt docs
+	dh_auto_build -- PKG_CONFIG_PATH=$(CURDIR)/samples opt docs
 
 #override_dh_auto_test:
 #	if (samples/simple/obj*/simpleopal --help >/dev/null);then \

Modified: opal/trunk/debian/simpleopal.install
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/simpleopal.install?rev=9571&op=diff
==============================================================================
--- opal/trunk/debian/simpleopal.install (original)
+++ opal/trunk/debian/simpleopal.install Thu Mar  8 11:26:37 2012
@@ -1,1 +1,1 @@
-#samples/simple/obj*/simpleopal usr/bin
+samples/simple/obj*/simpleopal usr/bin




More information about the Pkg-voip-commits mailing list