[Pkg-voip-commits] r7091 - in /dahdi-tools/trunk/debian: changelog control patches/echocan_oslec

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Apr 29 22:29:43 2009
New Revision: 7091

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7091
Log:
* New upstream release (2.2.0-rc2)
* A matching dahdi-source is needed.

Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/control
    dahdi-tools/trunk/debian/patches/echocan_oslec

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=7091&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Wed Apr 29 22:29:43 2009
@@ -1,6 +1,7 @@
-dahdi-tools (1:2.1.0.2-2) UNRELEASED; urgency=low
+dahdi-tools (1:2.2.0~rc2-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream release. A matching dahdi-source is needed.
   * Patch echocan_oslec: set oslec as default EC in generated config
   * A proper README.Debian
 

Modified: dahdi-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/control?rev=7091&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/control (original)
+++ dahdi-tools/trunk/debian/control Wed Apr 29 22:29:43 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Mark Purcell <msp at debian.org>
 # groff, man-db and asciidoc are required for generating documentation
-Build-Depends: debhelper, dahdi-source, libnewt-dev, quilt, bzip2, libusb-dev, 
+Build-Depends: debhelper, dahdi-source (>= 1:2.2.0~dfsg~rc2), libnewt-dev, quilt, bzip2, libusb-dev, 
  asciidoc, groff, man-db
 Standards-Version: 3.8.0
 Homepage: http://www.asterisk.org/

Modified: dahdi-tools/trunk/debian/patches/echocan_oslec
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/echocan_oslec?rev=7091&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/echocan_oslec (original)
+++ dahdi-tools/trunk/debian/patches/echocan_oslec Wed Apr 29 22:29:43 2009
@@ -2,16 +2,14 @@
 canceller than those included with DAHDI. Thus we should make it the 
 default echo canceller in generated configurations.
 
-(Future noe: for dahdi-tools >= 2.2.x, the place to patch will be 
-xpp/perl_modules/Dahdi/Config/Params.pm )
---- a/xpp/dahdi_genconf
-+++ b/xpp/dahdi_genconf
-@@ -75,7 +75,7 @@ my $brint_overlap = 'no';
- my $pri_termtype = 'SPAN/* TE';
- my $pri_connection_type = 'PRI'; # PRI or R2
- my $r2_idle_bits = '1101';
--my $echo_can = 'mg2';
-+my $echo_can = 'oslec';
- my $bri_hardhdlc= 'no';
- 
- my %dahdi_default_vars = (
+--- a/xpp/perl_modules/Dahdi/Config/Params.pm
++++ b/xpp/perl_modules/Dahdi/Config/Params.pm
+@@ -105,7 +105,7 @@ sub item($$) {
+ 			group_lines		=> '0',
+ 			brint_overlap		=> 'no',
+ 			bri_sig_style		=> 'bri_ptmp',
+-			echo_can		=> 'mg2',
++			echo_can		=> 'oslec',
+ 			bri_hardhdlc		=> 'no',
+ 			pri_connection_type	=> 'PRI',
+ 			r2_idle_bits		=> '1101',