From: Vincent Bernat <bernat@luffy.cx>
Date: Sat, 19 Apr 2008 14:50:28 +0000 (+0200)
Subject: Imported Debian patch 0.1.1-2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ab56472162a34ca4d507b4df5f02c0e42cb7d467;p=roundcube.git

Imported Debian patch 0.1.1-2
---

diff --git a/debian/changelog b/debian/changelog
index cde4a3c..34e5dac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+roundcube (0.1.1-2) unstable; urgency=low
+
+  * Comment by default Alias directive for tinymce in Apache configuration
+    file (Closes: #476162).
+  * Allow to preseed language value (Closes: #476803).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Sat, 19 Apr 2008 16:50:28 +0200
+
 roundcube (0.1.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index a5e0562..79e3d41 100644
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -1,7 +1,9 @@
-# Uncomment this to use tinymce (you need tinymce package)
-# See README.Debian for more details
+# Those aliases do not work properly with several hosts on your apache server
+# Uncomment them to use it or adapt them to your configuration
+#    Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+#    Alias /roundcube /var/lib/roundcube
 
-Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+# Access to tinymce files
 <Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride None
@@ -9,10 +11,6 @@ Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
       allow from all
 </Directory>
 
-# This alias does not work properly with several hosts on your apache server
-# Uncomment it to use it
-#    Alias /roundcube /var/lib/roundcube
-
 <Directory /var/lib/roundcube/>
         Options +FollowSymLinks
         AllowOverride All
diff --git a/debian/control b/debian/control
index cb1c41f..f2843b8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.or
 Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.7.3
-DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
diff --git a/debian/control.in b/debian/control.in
index df7455f..a6dae44 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,6 @@ Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.or
 Build-Depends: @cdbs@, po-debconf
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.7.3
-DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/pkg-roundcube/roundcube
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
diff --git a/debian/roundcube-core.config b/debian/roundcube-core.config
index c5ef209..c85dc70 100644
--- a/debian/roundcube-core.config
+++ b/debian/roundcube-core.config
@@ -15,17 +15,24 @@ db_metaget roundcube/language languages && oldchoices="$RET"
 if [ ! "$oldchoices" ] || [ "$instd_langs" != "$oldchoices" ]; then
        db_subst roundcube/language languages $instd_langs
        db_fset roundcube/language seen false
-       # Try to guess the locale
-       locale=$(echo $LANG | sed 's/[@\.].*//')
-       if [ -d /usr/share/roundcube/program/localization/$locale ]; then
+       # Firs try to get the current choice in case of preseeding
+       db_get roundcube/language || true
+       locale="$RET"
+       if [ -n $locale -a -d /usr/share/roundcube/program/localization/$locale ]; then
 	   db_set roundcube/language $locale
        else
-	   locale=$(echo $locale | sed 's/_.*//')
-	   if [ -d /usr/share/roundcube/program/localization/$locale ]; then
-	       db_set roundcube/language $locale
-	   else
-	       db_set roundcube/language en_US
-	   fi
+              # Try to guess the locale
+              locale=$(echo $LANG | sed 's/[@\.].*//')
+              if [ -d /usr/share/roundcube/program/localization/$locale ]; then
+       		      db_set roundcube/language $locale
+	      else
+		      locale=$(echo $locale | sed 's/_.*//')
+		      if [ -d /usr/share/roundcube/program/localization/$locale ]; then
+			      db_set roundcube/language $locale
+		      else
+			      db_set roundcube/language en_US
+		      fi
+	      fi
        fi
 fi
 # Ask the question