[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.7_dfsg-2-31-g348d434

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit fc8a00317e0e92b6d6b66257f5d0505db74a72dd
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Thu May 17 14:47:30 2012 +0000

    Remove useless patch about --prepare_db option of sympa.pl

diff --git a/debian/patches/1001_sympa.pl_add_prepare_db_option.patch b/debian/patches/1001_sympa.pl_add_prepare_db_option.patch
deleted file mode 100644
index a3077b1..0000000
--- a/debian/patches/1001_sympa.pl_add_prepare_db_option.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: add --prepare_db option to sympa.pl
-Author: Stefan Hornburg (Racke) <racke at linuxia.de>
-Last-Update: 2010-01-19
---- a/src/sympa.pl.in
-+++ b/src/sympa.pl.in
-@@ -86,6 +86,7 @@
-    --lowercase                           : lowercase email addresses in database
-    --sync_list_db [--list=listname]      : syncs filesystem list configs to the database cache of list configs, optionally sync an individual list if specified.
-    --md5_encode_password                 : rewrite password in database using md5 fingerprint. YOU CAN'T UNDO unless you save this table first
-+   --prepare_db                          : prepares database
-    --create_list --robot=robot_name --input_file=/path/to/file.xml 
-                                          : create a list with the xml file under robot_name
-    --instantiate_family=family_name  --robot=robot_name --input_file=/path/to/file.xml [--close_unknown] [--quiet]
-@@ -127,7 +128,7 @@
- my %options;
- unless (&GetOptions(\%main::options, 'dump=s', 'debug|d', ,'log_level=s','foreground', 'service=s','config|f=s', 
-             'lang|l=s', 'mail|m', 'keepcopy|k=s', 'help', 'version', 'import=s','make_alias_file','lowercase','sync_list_db','md5_encode_password',
--		    'close_list=s','rename_list=s','new_listname=s','new_listrobot=s','purge_list=s','create_list','instantiate_family=s','robot=s','add_list=s','modify_list=s','close_family=s','md5_digest=s',
-+		    'close_list=s','rename_list=s','new_listname=s','new_listrobot=s','purge_list=s', 'prepare_db', 'create_list','instantiate_family=s','robot=s','add_list=s','modify_list=s','close_family=s','md5_digest=s',
- 		    'input_file=s','sync_include=s','upgrade','upgrade_shared','from=s','to=s','reload_list_config','list=s','quiet','close_unknown','test_database_message_buffer','conf_2_db')) {
-     &fatal_err("Unknown options.");
- }
-@@ -145,6 +146,7 @@
- 				$main::options{'md5_encode_password'} ||
- 				$main::options{'close_list'} ||
- 				$main::options{'purge_list'} ||
-+				$main::options{'prepare_db'} ||
- 				$main::options{'create_list'} ||
- 				$main::options{'rename_list'} ||
- 				$main::options{'instantiate_family'} ||
-@@ -209,6 +211,10 @@
-    
- }
- 
-+if ($main::options{'prepare_db'}) {
-+    exit 0;
-+}
-+
- ## Apply defaults to %List::pinfo
- &List::_apply_defaults();
- 
diff --git a/debian/patches/series b/debian/patches/series
index a130a59..733cc40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-1001_sympa.pl_add_prepare_db_option.patch
 1002_mysql_default_charset_engine.patch
 1004_wizard_support_batch_and_display_mode.patch
 1005_wizard_emit_cmd_and_newline_when_dying.patch
diff --git a/debian/sympa.postinst b/debian/sympa.postinst
index e690307..424c621 100644
--- a/debian/sympa.postinst
+++ b/debian/sympa.postinst
@@ -409,9 +409,11 @@ if [ "$restart" = "true" ]; then
 	fi
 fi
 
-su -s /bin/sh -c "/usr/lib/sympa/bin/sympa.pl -f $conf --prepare_db" -l sympa
+su -l sympa -s /bin/sh -c "/usr/lib/sympa/bin/sympa.pl --upgrade"
 
 ## End up with debconf
 db_stop
 
 #DEBHELPER#
+
+exit 0

-- 
sympa Debian packaging