Imported Debian patch 0.3.1-6

diff --git a/debian/changelog b/debian/changelog
index 6b987e7f0c951bc2ed0a1383f0086eeee1268168..a82c6a1b8c427a25d6d20f6fcd7f5c86291af266 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+roundcube (0.3.1-6) unstable; urgency=low
+
+  * Update Arabic debconf translation, thanks to Ossama Khayat.
+    Closes: #596181.
+  * Update Portuguese debconf translation, thanks to Christian Perrier.
+    Closes: #599575.
+  * Add a patch to avoid duplicate boundaries in headers when adding an
+    attachment. Closes: #599586.
+
+ -- Vincent Bernat <bernat@debian.org>  Mon, 18 Oct 2010 23:14:37 +0200
+
 roundcube (0.3.1-5) unstable; urgency=low
 
   * Depends on php-mail-mime 1.7.0 or more recent to handle correctly

diff --git a/debian/patches/fix-599586.patch b/debian/patches/fix-599586.patch
new file mode 100644 (file)
index 0000000..2ac3d77
--- /dev/null
+++ b/debian/patches/fix-599586.patch
@@ -0,0 +1,21 @@
+Fix #599586 which was caused by duplicate boundaries. The fix is to
+simply use _addMixedPart from original Mail_Mime class which is recent
+enough in our case.
+
+--- roundcube/program/include/rcube_mail_mime.php~     2009-05-01 19:58:12.000000000 +0200
++++ roundcube/program/include/rcube_mail_mime.php      2010-10-18 19:31:33.751930400 +0200
+@@ -102,12 +102,12 @@
+    * @return object  The multipart/mixed mimePart object
+    * @access private
+    */
+-  function &_addMixedPart()
++  /* function &_addMixedPart()
+   {
+     $params['content_type'] = $this->_headers['Content-Type'] ? $this->_headers['Content-Type'] : 'multipart/mixed';
+     $ret = new Mail_mimePart('', $params);
+     return $ret;
+-  }
++  } */
+   
+   
+   /**

diff --git a/debian/patches/series b/debian/patches/series
index b2874f4af9c0299780bbc4dc0d17a61fff1c508e..8d2af0057cc0c69853e6682869811533eeacd2ec 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ dont-limit-email-local-part.patch
 disable-dns-prefetch.patch
 default-charset-utf8.patch
 received-headers-sa.patch
+fix-599586.patch

diff --git a/debian/po/ar.po b/debian/po/ar.po
index 45403105e77c73feaf448e1fd436470dcdddf11b..eee0fa2d125d5989ec59ac354aa4f8257e530606 100644 (file)
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -2,20 +2,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Ossama M. Khayat <okhayat@yahoo.com>, 2007, 2008.
+# Ossama M. Khayat <okhayat@yahoo.com>, 2007, 2008, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n"
 "POT-Creation-Date: 2009-02-15 17:05+0100\n"
-"PO-Revision-Date: 2008-03-18 15:29+0300\n"
+"PO-Revision-Date: 2010-09-09 05:05+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. Type: multiselect
 #. Choices
@@ -77,10 +79,8 @@ msgstr "خادمات IMAP المستخدمة مع RoundCube:"
 #. Type: string
 #. Description
 #: ../templates:4001
-#, fuzzy
-#| msgid "Please select the IMAP server that should be used with RoundCube."
 msgid "Please select the IMAP server(s) that should be used with RoundCube."
-msgstr "اÙ\84رجاء اختÙ\8aار خادم IMAP الذي يجب استخدامه مع RoundCube."
+msgstr "رجاء اختر خادم IMAP الذي يجب استخدامه مع RoundCube."
 
 #. Type: string
 #. Description

diff --git a/debian/po/pt.po b/debian/po/pt.po
index bd0304abf3ee343d47f349660dc57bda42ffb45c..9f301bff2c91103ec134b52f9a695e0ed79172c4 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -80,11 +80,10 @@ msgstr "Servidor(es) IMAP utilizado(s) com o RoundCube:"
 #. Type: string
 #. Description
 #: ../templates:4001
-#, fuzzy
-#| msgid "Please select the IMAP server that should be used with RoundCube."
 msgid "Please select the IMAP server(s) that should be used with RoundCube."
 msgstr ""
-"Por favor escolha o servidor IMAP que deve ser utilizado com o RoundCube."
+"Por favor escolha o(s) servidor(es) IMAP que deve(m) ser utilizado(s) com o "
+"RoundCube."
 
 #. Type: string
 #. Description