[Pkg-voip-commits] r9447 - in /siproxd/trunk/debian: changelog control patches/series patches/siproxd-libtool-2.4.patch rules source/ source/format

[msp at alioth.debian.org]

Author: msp
Date: Tue Jan 24 07:29:42 2012
New Revision: 9447

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9447
Log:
* source/format 3.0 (quilt)
* Add siproxd-libtool-2.4.patch - Thanks to Chí-Thanh Christopher
  Nguyễn for the gentoo workaround (Closes: #657070)
  - Fixes "embedded library ltdl" 

Added:
    siproxd/trunk/debian/patches/series
    siproxd/trunk/debian/patches/siproxd-libtool-2.4.patch
    siproxd/trunk/debian/source/
    siproxd/trunk/debian/source/format
Modified:
    siproxd/trunk/debian/changelog
    siproxd/trunk/debian/control
    siproxd/trunk/debian/rules

Modified: siproxd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/changelog?rev=9447&op=diff
==============================================================================
--- siproxd/trunk/debian/changelog (original)
+++ siproxd/trunk/debian/changelog Tue Jan 24 07:29:42 2012
@@ -1,3 +1,12 @@
+siproxd (1:0.8.1-2) UNRELEASED; urgency=low
+
+  * source/format 3.0 (quilt)
+  * Add siproxd-libtool-2.4.patch - Thanks to Chí-Thanh Christopher
+    Nguyá»
n for the gentoo workaround (Closes: #657070)
+    - Fixes "embedded library ltdl" 
+
+ -- Mark Purcell <msp at debian.org>  Tue, 24 Jan 2012 18:25:58 +1100
+
 siproxd (1:0.8.1-1) unstable; urgency=low
 
   * New upstream release

Modified: siproxd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/control?rev=9447&op=diff
==============================================================================
--- siproxd/trunk/debian/control (original)
+++ siproxd/trunk/debian/control Tue Jan 24 07:29:42 2012
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org> 
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, libosip2-dev (>= 3.1.0), automake, autotools-dev, autoconf, docbook-utils
-Build-Conflicts: libltdl3-dev
+Build-Depends: debhelper (>= 7), cdbs, libosip2-dev (>= 3.1.0), automake, autotools-dev, autoconf, docbook-utils, libltdl3-dev
 Standards-Version: 3.8.4
 Homepage: http://siproxd.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/siproxd/trunk/

Added: siproxd/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/patches/series?rev=9447&op=file
==============================================================================
--- siproxd/trunk/debian/patches/series (added)
+++ siproxd/trunk/debian/patches/series Tue Jan 24 07:29:42 2012
@@ -1,0 +1,1 @@
+siproxd-libtool-2.4.patch

Added: siproxd/trunk/debian/patches/siproxd-libtool-2.4.patch
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/patches/siproxd-libtool-2.4.patch?rev=9447&op=file
==============================================================================
--- siproxd/trunk/debian/patches/siproxd-libtool-2.4.patch (added)
+++ siproxd/trunk/debian/patches/siproxd-libtool-2.4.patch Tue Jan 24 07:29:42 2012
@@ -1,0 +1,15 @@
+Index: siproxd-0.8.1/src/plugins.h
+===================================================================
+--- siproxd-0.8.1.orig/src/plugins.h	2011-05-29 01:47:15.000000000 +1000
++++ siproxd-0.8.1/src/plugins.h	2012-01-24 18:18:25.000000000 +1100
+@@ -28,6 +28,10 @@
+    #include <ltdl.h>
+ #endif
+ 
++#ifndef lt__PROGRAM__LTX_preloaded_symbols
++#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
++extern const void *lt_preloaded_symbols[];
++#endif
+ 
+ /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */
+ 

Modified: siproxd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/rules?rev=9447&op=diff
==============================================================================
--- siproxd/trunk/debian/rules (original)
+++ siproxd/trunk/debian/rules Tue Jan 24 07:29:42 2012
@@ -9,7 +9,7 @@
 #
 # Preferred configure flag, but currently FTBFS
 #
-#DEB_CONFIGURE_EXTRA_FLAGS := --disable-ltdl-convenience
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-ltdl-convenience
 
 install/siproxd::
 	mv debian/siproxd/etc/siproxd.conf.example debian/siproxd/etc/siproxd.conf

Added: siproxd/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/source/format?rev=9447&op=file
==============================================================================
--- siproxd/trunk/debian/source/format (added)
+++ siproxd/trunk/debian/source/format Tue Jan 24 07:29:42 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)