[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.11_dfsg-5-12-gc847c76

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit 6434ac24e2eb573f44dff845a70fa50761f5412f
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Tue Jul 2 19:25:35 2013 +0000

    Switch the default locale from en_US to en (update debconf templates accordingly)

diff --git a/debian/config b/debian/config
index 764a529..570b7b2 100644
--- a/debian/config
+++ b/debian/config
@@ -17,8 +17,8 @@ wwconf="/etc/sympa/wwsympa.conf"
 
 # Language selection
 # - currently supported languages
-possible_langs="ca cs de el es et_EE fr hu it ja_JP ko nl oc pt_BR ru sv tr zh_CN zh_TW"
-supported_langs="en_US"
+possible_langs="ar bg br ca cs da de el en es et eu fi fr gl hu id it ja ko la ml nb_NO nl oc pl pt pt_BR ro ru sv tr vi zh_CN zh_TW"
+supported_langs="en"
 locales=$(locale -a)
 
 for lang in $possible_langs ; do
@@ -69,12 +69,12 @@ fi
 # Set default values
 
 # Ask for language
-if [ "$supported_langs" != "en_US" ]; then
+if [ "$supported_langs" != "en" ]; then
 	db_subst sympa/language supported_langs $supported_langs
 	db_input medium sympa/language || [ $? -eq 30 ]
 	db_go
 else
-	db_set sympa/language en_US
+	db_set sympa/language en
 fi
 
 db_get sympa/hostname
diff --git a/debian/rules b/debian/rules
index 6ae3965..b9c5120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,10 +67,6 @@ DEB_FIXPERMS_EXCLUDE = /usr/lib/sympa/bin/queue /usr/lib/sympa/bin/bouncequeue
 # “maintainer-clean” target will also remove po{,-wwsympa}/{stamp-po,*.gmo} files
 DEB_MAKE_CLEAN_TARGET = maintainer-clean
 
-localenames = af ar bg br ca cs de el en_US es et eu fi fr hu id it ja ko
-localenames +=  ml nb_NO nl nn_NO oc pl pt pt_BR ro ru sv tr vi zh_CN zh_TW
-upstreamtmpfiles += $(localenames:%=po/%.gmo)
-upstreamtmpfiles += $(localenames:%=po-wwsympa/%.gmo)
 upstreamtmpfiles += src/etc/list_aliases.tt2 src/lib/Sympa/Constants.pm sympa.spec
 upstreamtmpfiles += po-wwsympa/stamp-po po/stamp-po
 pre-build:: debian/stamp-upstreamtmpstuff
diff --git a/debian/templates b/debian/templates
index eef436e..b0841ce 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,7 +1,7 @@
 Template: sympa/language
 Type: select
 Choices: ${supported_langs}
-DefaultChoice: en_US
+DefaultChoice: en
 _Description: Default language for Sympa:
 
 Template: sympa/hostname

-- 
sympa Debian packaging