[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.1_dfsg-2-23-g23bd360

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit 8474342f456b6938343f9fc449e49ced0a6d1e0d
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Sat May 28 23:19:58 2011 +0000

    Refresh patches

diff --git a/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch b/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch
index de84dfc..42c0d6e 100644
--- a/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch
+++ b/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch
@@ -1,14 +1,23 @@
 Description: emit command name and newline when dying in sympa_wizard.pl
 Author: Stefan Hornburg (Racke) <racke at linuxia.de>
-Last-Update: 2010-01-19
+Last-Update: 2011-05-07
 --- a/src/sympa_wizard.pl.in
 +++ b/src/sympa_wizard.pl.in
+@@ -84,7 +84,7 @@
+     if (/^([\w]+)+=(.+)/) {
+         $user_param{$1} = $2;
+     } else {
+-        die "Invalid commandline argument: $_";
++        die "$0: Invalid commandline argument: $_";
+     }
+ }
+ 
 @@ -119,7 +119,7 @@
      }
  
      unless (open (NEWF,"> $conf")){
 -        die "Unable to open $conf : $!";
-+        die "$0: unable to open $conf : $!\n";
++        die "$0: Unable to open $conf : $!";
      };
  
      if ($options{create} eq 'sympa.conf') {
@@ -17,27 +26,29 @@ Last-Update: 2010-01-19
      ## Load config 
      unless ($wwsconf = wwslib::load_config($wwsympa_conf)) {
 -        die("Unable to load config file $wwsympa_conf");
-+        die("$0: unable to load config file $wwsympa_conf\n");
++        die("$0: Unable to load config file $wwsympa_conf");
      }
  
      ## Load sympa config (but not using database)
      unless (Conf::load( $sympa_conf,'nodb')) {
 -        die("Unable to load sympa config file $sympa_conf");
-+        die("$0: unable to load sympa config file $sympa_conf\n");
++        die("$0: Unable to load sympa config file $sympa_conf");
      }
  
      if ($options{display}) {
-@@ -309,11 +309,11 @@
+@@ -309,13 +309,13 @@
  
          ## Write new config files
          unless (open (WWSYMPA,"> $wwsympa_conf")){
--            die "unable to open $new_wwsympa_conf : $!";
-+            die "$0: unable to open $new_wwsympa_conf : $!\n";
+-            die "unable to open $wwsympa_conf : $!";
++            die "$0: unable to open $wwsympa_conf : $!";
          };
  
+         my $umask = umask 037;
          unless (open (SYMPA,"> $sympa_conf")){
--            die "unable to open $new_sympa_conf : $!";
-+            die "$0: unable to open $new_sympa_conf : $!\n";
+             umask $umask;
+-            die "unable to open $sympa_conf : $!";
++            die "$0: unable to open $sympa_conf : $!";
          };
- 
-         print SYMPA @new_sympa_conf;
+         umask $umask;
+         chown [getpwnam(Sympa::Constants::USER)]->[2], [getgrnam(Sympa::Constants::GROUP)]->[2], $sympa_conf;
diff --git a/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch b/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch
index d413fea..af79c1c 100644
--- a/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch
+++ b/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch
@@ -3,7 +3,7 @@ Author: Stefan Hornburg (Racke) <racke at linuxia.de>
 Last-Update: 2010-01-19
 --- a/src/lib/confdef.pm
 +++ b/src/lib/confdef.pm
-@@ -876,6 +876,13 @@
+@@ -883,6 +883,13 @@
          edit    => '1',
      },
      {
@@ -17,7 +17,7 @@ Last-Update: 2010-01-19
          name    => 'title',
          default => 'Mailing lists service',
          query   => 'Title of main web page',
-@@ -892,6 +899,12 @@
+@@ -899,6 +906,12 @@
          edit   => '1',
      },
      {
diff --git a/debian/patches/1007_wizard_probe_currently_supported_locales.patch b/debian/patches/1007_wizard_probe_currently_supported_locales.patch
index 45b3851..5fc828f 100644
--- a/debian/patches/1007_wizard_probe_currently_supported_locales.patch
+++ b/debian/patches/1007_wizard_probe_currently_supported_locales.patch
@@ -8,11 +8,11 @@ Last-Update: 2010-01-19
      }
  
 +    fix_supported_languages(@confdef::params);
-+	
++
      foreach my $param (@confdef::params) {
  
          if ($param->{'title'}) {
-@@ -774,3 +776,46 @@
+@@ -775,3 +777,46 @@
      $ENV{'LANG'} = $lang if (defined $lang);
  
  }
diff --git a/debian/patches/1010_db_port.patch b/debian/patches/1010_db_port.patch
index 40d8d4e..5f491d3 100644
--- a/debian/patches/1010_db_port.patch
+++ b/debian/patches/1010_db_port.patch
@@ -3,7 +3,7 @@ Author: Stefan Hornburg (Racke) <racke at linuxia.de>
 Last-Update: 2010-04-11
 --- a/src/lib/confdef.pm
 +++ b/src/lib/confdef.pm
-@@ -806,9 +806,10 @@
+@@ -813,9 +813,10 @@
      },
      {
          name   => 'db_port',

-- 
sympa Debian packaging