[Pkg-voip-commits] r8236 - in /dahdi-tools/trunk/debian: changelog control patches/echocan_oslec patches/hardware_rescan patches/init_unload_modules patches/perl_fix_noserial patches/perl_fix_transportdir patches/series patches/wcb4xxp_extra_trunk patches/zaptel_perl
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Thu Mar 25 17:21:10 UTC 2010
Author: tzafrir-guest
Date: Thu Mar 25 17:21:03 2010
New Revision: 8236
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8236
Log:
* New minor upstream release.
* Patch wcb4xxp_extra_trunk: recognize some extra HFC-[248]S PCI IDs.
* DEP3 heaaders for all patches in use.
* Refreshed some patches.
* Standards version 3.8.4 (no change needed).
Added:
dahdi-tools/trunk/debian/patches/wcb4xxp_extra_trunk
Modified:
dahdi-tools/trunk/debian/changelog
dahdi-tools/trunk/debian/control
dahdi-tools/trunk/debian/patches/echocan_oslec
dahdi-tools/trunk/debian/patches/hardware_rescan
dahdi-tools/trunk/debian/patches/init_unload_modules
dahdi-tools/trunk/debian/patches/perl_fix_noserial
dahdi-tools/trunk/debian/patches/perl_fix_transportdir
dahdi-tools/trunk/debian/patches/series
dahdi-tools/trunk/debian/patches/zaptel_perl
Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Thu Mar 25 17:21:03 2010
@@ -1,8 +1,15 @@
-dahdi-tools (1:2.2.1-2) UNRELEASED; urgency=low
+dahdi-tools (1:2.2.1.1-1) UNRELEASED; urgency=low
* NOT RELEASED YET
- -- Mark Purcell <msp at debian.org> Sun, 07 Mar 2010 04:46:18 +1100
+ [ Tzafrir Cohen ]
+ * New minor upstream release.
+ * Patch wcb4xxp_extra_trunk: recognize some extra HFC-[248]S PCI IDs.
+ * DEP3 heaaders for all patches in use.
+ * Refreshed some patches.
+ * Standards version 3.8.4 (no change needed).
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Thu, 25 Mar 2010 19:17:46 +0200
dahdi-tools (1:2.2.1-1) unstable; urgency=low
Modified: dahdi-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/control?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/control (original)
+++ dahdi-tools/trunk/debian/control Thu Mar 25 17:21:03 2010
@@ -6,7 +6,7 @@
# groff, man-db and asciidoc are required for generating documentation
Build-Depends: debhelper (>= 7), dahdi-source (>= 1:2.2.0~dfsg~rc2), libnewt-dev, quilt, bzip2, libusb-dev,
asciidoc, groff, man-db
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.asterisk.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/dahdi-tools/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/?op=log
Modified: dahdi-tools/trunk/debian/patches/echocan_oslec
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/echocan_oslec?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/echocan_oslec (original)
+++ dahdi-tools/trunk/debian/patches/echocan_oslec Thu Mar 25 17:21:03 2010
@@ -1,10 +1,16 @@
+Subject: Make OSLEC the default DAHDI echo canceller
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Forwarded: no
+
Our dahdi-linux packages provide OSLEC, which is generally a better echo
canceller than those included with DAHDI. Thus we should make it the
default echo canceller in generated configurations.
+Debian-specific configuration tweak.
+
--- a/xpp/perl_modules/Dahdi/Config/Params.pm
+++ b/xpp/perl_modules/Dahdi/Config/Params.pm
-@@ -105,7 +105,7 @@ sub item($$) {
+@@ -106,7 +106,7 @@ sub item($$) {
group_lines => '0',
brint_overlap => 'no',
bri_sig_style => 'bri_ptmp',
Modified: dahdi-tools/trunk/debian/patches/hardware_rescan
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/hardware_rescan?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/hardware_rescan (original)
+++ dahdi-tools/trunk/debian/patches/hardware_rescan Thu Mar 25 17:21:03 2010
@@ -1,9 +1,10 @@
-xpp: Dahdi::Hardware->rescan() - refresh hardware list
-
+Subject: xpp: Dahdi::Hardware->rescan() - refresh hardware list
+Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7012
+
Allow refreshing the list of hardware even after the initial scan.
(E.g. a script that resets firmware for Astribanks)
-Source: http://svn.digium.com/svn/dahdi/tools/trunk@7012
+Backport from current trunk. Will be included in dahdi-tools 2.3.
--- a/xpp/perl_modules/Dahdi/Hardware.pm
+++ b/xpp/perl_modules/Dahdi/Hardware.pm
Modified: dahdi-tools/trunk/debian/patches/init_unload_modules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/init_unload_modules?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/init_unload_modules (original)
+++ dahdi-tools/trunk/debian/patches/init_unload_modules Thu Mar 25 17:21:03 2010
@@ -23,8 +23,6 @@
init.conf.sample | 5 +++++
2 files changed, 17 insertions(+), 2 deletions(-)
-diff --git a/dahdi.init b/dahdi.init
-index cbc9dc7..91ae44e 100755
--- a/dahdi.init
+++ b/dahdi.init
@@ -37,6 +37,10 @@ XPP_SYNC=auto
@@ -38,7 +36,7 @@
#
# Determine which kind of configuration we're using
#
-@@ -99,6 +103,12 @@ unload_module() {
+@@ -86,6 +90,12 @@ unload_module() {
rmmod $module
}
@@ -51,7 +49,7 @@
# In (xpp) hotplug mode, the init script is also executed from the
# hotplug hook. In that case it should not attempt to loade modules.
#
-@@ -275,7 +285,7 @@ case "$1" in
+@@ -262,7 +272,7 @@ case "$1" in
# Unload drivers
#shutdown_dynamic # FIXME: needs test from someone with dynamic spans
echo -n "Unloading DAHDI hardware modules: "
@@ -60,7 +58,7 @@
echo "done"
else
echo "error"
-@@ -285,7 +295,7 @@ case "$1" in
+@@ -272,7 +282,7 @@ case "$1" in
fi
;;
unload)
@@ -69,8 +67,6 @@
;;
restart|force-reload)
$0 stop
-diff --git a/init.conf.sample b/init.conf.sample
-index 9fb6393..58edec5 100644
--- a/init.conf.sample
+++ b/init.conf.sample
@@ -8,6 +8,11 @@
@@ -85,6 +81,3 @@
# Override settings for xpp_fxloader
#XPP_FIRMWARE_DIR=/usr/share/dahdi
#XPP_HOTPLUG_DISABLED=yes
---
-1.6.5
-
Modified: dahdi-tools/trunk/debian/patches/perl_fix_noserial
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/perl_fix_noserial?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/perl_fix_noserial (original)
+++ dahdi-tools/trunk/debian/patches/perl_fix_noserial Thu Mar 25 17:21:03 2010
@@ -1,7 +1,9 @@
From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Subject: [PATCH 1/2] Not all Astribanks have a 'serial' attribute. Make it optional.
+Subject: Not all Astribanks have a 'serial' attribute. Make it optional.
Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7953
Last-Update: 2010-01-24
+
+Backport from current trunk. Will be included in dahdi-tools 2.3.
---
xpp/perl_modules/Dahdi/Hardware/USB.pm | 11 ++++++++++-
Modified: dahdi-tools/trunk/debian/patches/perl_fix_transportdir
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/perl_fix_transportdir?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/perl_fix_transportdir (original)
+++ dahdi-tools/trunk/debian/patches/perl_fix_transportdir Thu Mar 25 17:21:03 2010
@@ -1,5 +1,5 @@
From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Subject: [PATCH 2/2] A better test for the Astribank transport directory
+Subject: A better test for the Astribank transport directory
Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7954
Last-Update: 2010-01-24
@@ -7,6 +7,7 @@
node. Use 'idVendor' which is far less likely to fail.
* Actively resolve the symlink 'transport' to its name (e.g. '1-2').
+Backport from current trunk. Will be included in dahdi-tools 2.3.
---
xpp/perl_modules/Dahdi/Hardware/USB.pm | 5 +++--
Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Thu Mar 25 17:21:03 2010
@@ -8,3 +8,4 @@
astribank_allow_ignoreend
init_unload_modules
init_unload_oslec
+wcb4xxp_extra_trunk
Added: dahdi-tools/trunk/debian/patches/wcb4xxp_extra_trunk
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/wcb4xxp_extra_trunk?rev=8236&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/wcb4xxp_extra_trunk (added)
+++ dahdi-tools/trunk/debian/patches/wcb4xxp_extra_trunk Thu Mar 25 17:21:03 2010
@@ -1,0 +1,35 @@
+Subject: extra PCI IDs for wcb4xxp from trunk
+Origin: http://svnview.digium.com/svn/dahdi/tools/trunk/?pathrev=8437
+Last-Changed: 2010-03-25
+
+Following the patch with the same name in dahdi-linux, also include those
+extra PCI IDs in our database.
+
+Backport from current trunk. Will be included in dahdi-tools 2.3.
+
+--- a/xpp/perl_modules/Dahdi/Hardware/PCI.pm
++++ b/xpp/perl_modules/Dahdi/Hardware/PCI.pm
+@@ -106,9 +106,20 @@ my %pci_ids = (
+
+ # Cologne Chips:
+ # (Still a partial list)
+- '1397:08b4/b556' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns DuoBRI ISDN card' },
+- '1397:08b4' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns QuadBRI ISDN card' },
+- '1397:16b8' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns OctoBRI ISDN card' },
++ '1397:08b4/1397:b540' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Swyx 4xS0 SX2 QuadBri' },
++ '1397:08b4/1397:b556' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns DuoBRI ISDN card' },
++ '1397:08b4/1397:b520' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns QuadBRI ISDN card' },
++ '1397:08b4/1397:b550' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns QuadBRI ISDN card' },
++ '1397:16b8/1397:b552' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns OctoBRI ISDN card' },
++ '1397:16b8/1397:b55b' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns OctoBRI ISDN card' },
++ '1397:08b4/1397:e884' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B200P' },
++ '1397:08b4/1397:e888' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B400P' },
++ '1397:16b8/1397:e998' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B800P' },
++ '1397:08b4/1397:b566' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN2S0' },
++ '1397:08b4/1397:b560' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN4S0' },
++ '1397:16b8/1397:b562' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN8S0' },
++ '1397:08b4' => { DRIVER => 'qozap', DESCRIPTION => 'Generic Cologne ISDN card' },
++ '1397:16b8' => { DRIVER => 'qozap', DESCRIPTION => 'Generic OctoBRI ISDN card' },
+ '1397:30b1' => { DRIVER => 'cwain', DESCRIPTION => 'HFC-E1 ISDN E1 card' },
+ '1397:2bd0' => { DRIVER => 'zaphfc', DESCRIPTION => 'HFC-S ISDN BRI card' },
+ # Has three submodels. Tested with 0675:1704:
Modified: dahdi-tools/trunk/debian/patches/zaptel_perl
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/zaptel_perl?rev=8236&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/zaptel_perl (original)
+++ dahdi-tools/trunk/debian/patches/zaptel_perl Thu Mar 25 17:21:03 2010
@@ -1,14 +1,17 @@
-## zaptel_perl by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## Point Zaptel PERL modules to the right directory under
-## which to install perl modules.
-## (sitelib in Debian is under /usr/local. We don't want to install
-## there)
+Subject: Set perl installation path to vendorlib
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Forwarded: no
-diff -urNad zaptel-1.4.5~dfsg~/xpp/utils/Makefile zaptel-1.4.5~dfsg/xpp/utils/Makefile
---- zaptel-1.4.5~dfsg~/xpp/Makefile 2007-08-01 23:41:21.000000000 +0100
-+++ zaptel-1.4.5~dfsg/xpp/Makefile 2007-08-19 20:09:48.000000000 +0100
-@@ -23,7 +23,7 @@
+Point Zaptel PERL modules to the right directory under which to install
+perl modules.
+
+(sitelib in Debian is under /usr/local. We don't want to install there)
+
+Debian-specific configuration.
+
+--- a/xpp/Makefile
++++ b/xpp/Makefile
+@@ -28,7 +28,7 @@ SBINDIR = $(prefix)/sbin
DATADIR = $(datadir)/dahdi
MANDIR = $(mandir)/man8
HOTPLUG_USB_DIR = /etc/hotplug/usb
@@ -16,4 +19,4 @@
+PERLLIBDIR := $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
PERL_DIRS := $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs)
PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm)
- PERL_MODS := $(shell cd zconf; echo $(PERL_MODS_PAT))
+ PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT))
More information about the Pkg-voip-commits
mailing list