[Pkg-voip-commits] r6386 - in /dahdi-tools/trunk/debian: control patches/series patches/soname

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Nov  4 15:36:49 2008
New Revision: 6386

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6386
Log:
Patch soname: bump SONAME because we're DAHDI and not Zaptel.
(Already applied in upstream SVN)

Added:
    dahdi-tools/trunk/debian/patches/soname
Modified:
    dahdi-tools/trunk/debian/control
    dahdi-tools/trunk/debian/patches/series

Modified: dahdi-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/control?rev=6386&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/control (original)
+++ dahdi-tools/trunk/debian/control Tue Nov  4 15:36:49 2008
@@ -12,9 +12,8 @@
 Package: dahdi
 Section: comm
 Architecture: any
-# Xorcom packages depend on xpp-firmware. Debian zaptel will probably 
-# just recommend it.
 Depends: ${shlibs:Depends}, procps, fxload
+Conflicts: zaptel
 Description: utilities for using the DAHDI kernel modules
  Userspace utilities for configuring the Zapata telephony kernel driver, 
  which supports various telephony hardware, such as Wildcard series of
@@ -22,7 +21,7 @@
  .
  Includes ztcfg and zttool utils.
 
-Package: libtonezone1
+Package: libtonezone2.0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -32,7 +31,7 @@
 Package: libtonezone-dev
 Section: libdevel
 Architecture: any
-Depends: libtonezone1 (= ${binary:Version})
+Depends: libtonezone2.0 (= ${binary:Version})
 Description: tonezone library (development)
  A library for generating tones used for telephone signalling.
  .

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=6386&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Tue Nov  4 15:36:49 2008
@@ -1,3 +1,4 @@
 # Patch needs to be revised anyway:
 #ztcfg-start_stop
 zaptel_perl
+soname

Added: dahdi-tools/trunk/debian/patches/soname
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/soname?rev=6386&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/soname (added)
+++ dahdi-tools/trunk/debian/patches/soname Tue Nov  4 15:36:49 2008
@@ -1,0 +1,18 @@
+Bump SONAME of libtonezone. While the API and ABI have not changed from
+the Zaptel version, the DAHDI libtonezone applies tonezones using DAHDI
+ioctl calls. Hence it is incompatible with the Zaptel libtonezone.
+
+This patch has already been applied upstream and should be included in
+dahdi-tools 2.1.0 (though not yet included in rc1).
+
+--- a/Makefile
++++ b/Makefile
+@@ -90,7 +90,7 @@ LTZ_A:=libtonezone.a
+ LTZ_A_OBJS:=zonedata.o tonezone.o version.o
+ LTZ_SO:=libtonezone.so
+ LTZ_SO_OBJS:=zonedata.lo tonezone.lo version.o
+-LTZ_SO_MAJOR_VER:=1
++LTZ_SO_MAJOR_VER:=2
+ LTZ_SO_MINOR_VER:=0
+ 
+ # sbindir, libdir, includedir and mandir are defined in makeopts