[Pkg-voip-commits] r5575 - in /zaptel/trunk/debian: changelog patches/series patches/zaptel_config_nodie rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Apr 22 07:22:48 2008
New Revision: 5575

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5575
Log:
* Patch zaptel_config_nodie: A bit of perl that fell off in the merges.
* Properly fix generation of tonezones.txt .

Added:
    zaptel/trunk/debian/patches/zaptel_config_nodie
Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/series
    zaptel/trunk/debian/rules

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5575&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Tue Apr 22 07:22:48 2008
@@ -6,8 +6,9 @@
   [ Tzafrir Cohen ]
   * Note the buid "error" from http://bugs.digium.com/12426 .
   * Fix the generation of tonezone.txt.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 17 Apr 2008 01:14:22 +0300
+  * Patch zaptel_config_nodie: A bit of perl that fell off in the merges.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 22 Apr 2008 10:10:49 +0300
 
 zaptel (1:1.4.10~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/series?rev=5575&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/series (original)
+++ zaptel/trunk/debian/patches/series Tue Apr 22 07:22:48 2008
@@ -6,3 +6,4 @@
 ztcfg-start_stop
 zaphfc-florz
 zaptel_perl
+zaptel_config_nodie

Added: zaptel/trunk/debian/patches/zaptel_config_nodie
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/zaptel_config_nodie?rev=5575&op=file
==============================================================================
--- zaptel/trunk/debian/patches/zaptel_config_nodie (added)
+++ zaptel/trunk/debian/patches/zaptel_config_nodie Tue Apr 22 07:22:48 2008
@@ -1,0 +1,20 @@
+If Zaptel::Config::Defaults does not find any configuration file it
+should return an empty configuration rather than dying.
+
+This is a fix that was accidentally left out of the commit to Zaptel
+1.4.10 (it did get into 1.2.25) and will be included in Zaptel 1.4.11 .
+svn diff -c 4187 http://svn.digium.com/svn/zaptel/branches/1.4
+
+--- zaptel-1.4.10~dfsg.orig/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
++++ zaptel-1.4.10~dfsg/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
+@@ -46,7 +46,9 @@ sub source_vars {
+ 			}
+ 		}
+ 	}
+-	die "No default_file" unless $default_file;
++	if (! $default_file) {
++		return ("", ());
++	}
+ 	my %vars = Zaptel::Config::Defaults::do_source($default_file, @vars);
+ 	return ($default_file, %vars);
+ }

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=5575&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Tue Apr 22 07:22:48 2008
@@ -95,7 +95,7 @@
 tonezones.txt: zonedata.c
 	echo >$@ "# A list of tonezones supported by this copy of zaptel and libtonezones:"
 	perl -ne 'next unless (/\.(country|description) = *"([^"]*)/); \
-		print (($1 eq "country")? "$2\t":"$2\n");' $<  \
+		print (($$1 eq "country")? "$$2\t":"$$2\n");' $<  \
 	>>$@
 
 # A workaround for version incompatibility of asciidoc to fix Sarge build.