[Pkg-voip-commits] r7506 - in /dahdi-tools/trunk/debian: changelog patches/series patches/xpp_no_extra_at

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Aug 16 20:20:10 2009
New Revision: 7506

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7506
Log:
Patch no_extra_at: backport of a per/xpp fix. 

Added:
    dahdi-tools/trunk/debian/patches/xpp_no_extra_at
Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/patches/series

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=7506&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Sun Aug 16 20:20:10 2009
@@ -6,8 +6,9 @@
   * New upstream release.
   * Patch bashism: fixes bashism in waitfor_xpds (Closes: #535865).
   * Patch hardware_rescan: backport Dahdi::Hardware->rescan()
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 16 Aug 2009 21:44:06 +0300
+  * Patch no_extra_at: backport of a per/xpp fix. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 16 Aug 2009 23:10:48 +0300
 
 dahdi-tools (1:2.2.0~rc3-1) unstable; urgency=low
 

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=7506&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Sun Aug 16 20:20:10 2009
@@ -4,3 +4,4 @@
 echocan_oslec
 bashism
 hardware_rescan
+xpp_no_extra_at

Added: dahdi-tools/trunk/debian/patches/xpp_no_extra_at
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/xpp_no_extra_at?rev=7506&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/xpp_no_extra_at (added)
+++ dahdi-tools/trunk/debian/patches/xpp_no_extra_at Sun Aug 16 20:20:10 2009
@@ -1,0 +1,18 @@
+dahdi-perl: don't re-append '@' when testing the Astribank connector string
+    
+Source: http://svn.digium.com/svn/dahdi/tools/trunk@7000
+
+--- a/xpp/perl_modules/Dahdi/Xpp.pm
++++ b/xpp/perl_modules/Dahdi/Xpp.pm
+@@ -206,10 +206,9 @@ sub add_xpporder(@) {
+ 	# Overrides from config file
+ 	foreach my $xbus (@xbuses) {
+ 		my $label = $xbus->label;
+-		my $connector = '@' . $xbus->connector;
+ 		my $val;
+ 		$val = $order{$label};
+-		$val = $order{$connector} unless defined $val;
++		$val = $order{$xbus->connector} unless defined $val;
+ 		$xbus->{XPPORDER} = $val if defined $val;
+ 	}
+ }