From a1b6217b1a1265c2be08b10df1f43d5e9c96b6fe Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 27 Sep 2009 11:26:56 +0200 Subject: [PATCH] Imported Debian patch 0.3-2 --- debian/changelog | 8 ++++++++ debian/patches/loginbox-size.patch | 13 +++++++++++++ debian/patches/series | 1 + debian/roundcube-core.postinst | 2 +- 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 debian/patches/loginbox-size.patch diff --git a/debian/changelog b/debian/changelog index 51699f9..a77c67f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +roundcube (0.3-2) unstable; urgency=low + + * Really fix #544579 since the default value is null without + quotes. This really Closes: #544579. + * Enlarge login box to accommodate sk_SK locale. Closes: #542933. + + -- Vincent Bernat Sun, 27 Sep 2009 11:26:56 +0200 + roundcube (0.3-1) unstable; urgency=low * New upstream release. Closes: #545498. diff --git a/debian/patches/loginbox-size.patch b/debian/patches/loginbox-size.patch new file mode 100644 index 0000000..7e04ce5 --- /dev/null +++ b/debian/patches/loginbox-size.patch @@ -0,0 +1,13 @@ +Fix size of login box to accommodate sk_SK locale + +--- r/skins/default/common.css~ 2009-09-04 12:42:24.000000000 +0200 ++++ r/skins/default/common.css 2009-09-27 11:27:25.000000000 +0200 +@@ -494,7 +494,7 @@ + margin-left: auto; + margin-right: auto; + margin-top: 50px; +- width: 400px; ++ width: 420px; + border: 1px solid #999; + } + diff --git a/debian/patches/series b/debian/patches/series index f899621..055d904 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ correct_install_path.patch use_packaged_tinymce.patch correct-magic-path.patch use_pspell.patch +loginbox-size.patch diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst index b41830d..07e961f 100644 --- a/debian/roundcube-core.postinst +++ b/debian/roundcube-core.postinst @@ -71,7 +71,7 @@ case "$1" in cat /usr/share/roundcube/main.inc.php.dist | \ sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \ -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \ - -e "s+^\(\$rcmail_config\['language'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp + -e "s+^\(\$rcmail_config\['language'\] = \).*\(;\)\$+\1'${language}'\2+" >> $CONFFILE.ucftmp ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE chown root:www-data $CONFFILE -- 2.39.5