Imported Debian patch 0.2~stable-2

diff --git a/debian/changelog b/debian/changelog
index 8e65e4019fcb8e967867f8c179b70236c6e65d70..5cc61b26f95675da1ce2a96a2c50eab9025f6129 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+roundcube (0.2~stable-2) unstable; urgency=low
+
+  * Update debconf translations:
+      + French, thanks to Christian Perrier. Closes: #515806.
+      + Swedish, thanks to Martin Bagge. Closes: #516683.
+  * Drop virtual package roundcube-db and add dependencies on real package
+    instead: this way, we can have versioned dependencies on those to avoid
+    version mismatch between packages.
+  * Add a patch to not use a MDB2 feature not present in the Debian
+    package. Thanks to Grzegorz Sobański for the patch. Closes: #519104.
+
+ -- Vincent Bernat <bernat@debian.org>  Wed, 11 Mar 2009 18:49:32 +0100
+
 roundcube (0.2~stable-1) unstable; urgency=low
 
   * New upstream version. Closes: #503573, #504570.

diff --git a/debian/control b/debian/control
index a3f90b872a0db13145fc62babd89baafd9667429..a7432002031b2078856b3dd3e43336c7d427e163 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
 Package: roundcube-core
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-db, php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
@@ -27,7 +27,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 
 Package: roundcube
 Architecture: all
-Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}), ${misc:Depends}
+Depends: roundcube-core (= ${source:Version}), ${misc:Depends}
 Description: skinnable AJAX based webmail solution for IMAP servers - metapackage
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
@@ -42,7 +42,6 @@ Package: roundcube-mysql
 Architecture: all
 Depends: php-mdb2-driver-mysql, mysql-client | virtual-mysql-client, ${misc:Depends}
 Suggests: mysql-server
-Provides: roundcube-db
 Description: metapackage providing MySQL dependencies for RoundCube
  This package provides MySQL dependencies for RoundCube Webmail, a
  skinnable AJAX based webmail solution for IMAP servers. Install this
@@ -52,7 +51,6 @@ Package: roundcube-pgsql
 Architecture: all
 Depends: php-mdb2-driver-pgsql, postgresql-client-8.1 | postgresql-client, ${misc:Depends}
 Suggests: postgresql-server
-Provides: roundcube-db
 Description: metapackage providing PostgreSQL dependencies for RoundCube
  This package provides PostgreSQL dependencies for RoundCube Webmail,
  a skinnable AJAX based webmail solution for IMAP servers. Install
@@ -61,7 +59,6 @@ Description: metapackage providing PostgreSQL dependencies for RoundCube
 Package: roundcube-sqlite
 Architecture: all
 Depends: php-mdb2-driver-sqlite, sqlite, ${misc:Depends}
-Provides: roundcube-db
 Description: metapackage providing sqlite dependencies for RoundCube
  This package provides sqlite dependencies for RoundCube Webmail, a
  skinnable AJAX based webmail solution for IMAP servers. Install this

diff --git a/debian/control.in b/debian/control.in
index d59c7d16d1d1895fba8800070711d2c95f2eb61a..46da5237d49f56b4d8bc0a1bd60bb8628094537e 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
 Package: roundcube-core
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-db, php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
@@ -27,7 +27,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 
 Package: roundcube
 Architecture: all
-Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}), ${misc:Depends}
+Depends: roundcube-core (= ${source:Version}), ${misc:Depends}
 Description: skinnable AJAX based webmail solution for IMAP servers - metapackage
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
@@ -42,7 +42,6 @@ Package: roundcube-mysql
 Architecture: all
 Depends: php-mdb2-driver-mysql, mysql-client | virtual-mysql-client, ${misc:Depends}
 Suggests: mysql-server
-Provides: roundcube-db
 Description: metapackage providing MySQL dependencies for RoundCube
  This package provides MySQL dependencies for RoundCube Webmail, a
  skinnable AJAX based webmail solution for IMAP servers. Install this
@@ -52,7 +51,6 @@ Package: roundcube-pgsql
 Architecture: all
 Depends: php-mdb2-driver-pgsql, postgresql-client-8.1 | postgresql-client, ${misc:Depends}
 Suggests: postgresql-server
-Provides: roundcube-db
 Description: metapackage providing PostgreSQL dependencies for RoundCube
  This package provides PostgreSQL dependencies for RoundCube Webmail,
  a skinnable AJAX based webmail solution for IMAP servers. Install
@@ -61,7 +59,6 @@ Description: metapackage providing PostgreSQL dependencies for RoundCube
 Package: roundcube-sqlite
 Architecture: all
 Depends: php-mdb2-driver-sqlite, sqlite, ${misc:Depends}
-Provides: roundcube-db
 Description: metapackage providing sqlite dependencies for RoundCube
  This package provides sqlite dependencies for RoundCube Webmail, a
  skinnable AJAX based webmail solution for IMAP servers. Install this

diff --git a/debian/patches/series b/debian/patches/series
index 9753d888e0a24483e9bcc5b7d8ceb121b7d7f8ac..8e2bd18f676236384d72f4919573822bda4f0e6c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ correct_install_path.patch
 use_packaged_tinymce.patch
 correct-magic-path.patch
 cve-2009-0413.patch
+too-old-mdb2.patch

diff --git a/debian/patches/too-old-mdb2.patch b/debian/patches/too-old-mdb2.patch
new file mode 100644 (file)
index 0000000..b724772
--- /dev/null
+++ b/debian/patches/too-old-mdb2.patch
@@ -0,0 +1,14 @@
+Don't use disable_smart_seqname which is not present in our version of MDB2.
+
+--- roundcube-0.2~stable/program/include/rcube_mdb2.php        2008-10-14 14:49:44.000000000 +0200
++++ roundcube-0.2~stable-patched/program/include/rcube_mdb2.php        2009-03-11 11:16:43.000000000 +0100
+@@ -86,7 +86,8 @@
+         'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
+ 
+     if ($this->db_provider == 'pgsql') {
+-      $db_options['disable_smart_seqname'] = true;
++    // commented out due toa php-mdb2-driver-pgsql < 1.5.0a in debian 
++    //  $db_options['disable_smart_seqname'] = true;
+       $db_options['seqname_format'] = '%s';
+     }
+ 

diff --git a/debian/po/fr.po b/debian/po/fr.po
index e4bc44a78ab876a1429e1a8a84a015b527268d53..01a094c6f8502179b5c10de46ac58649705ff0e0 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -79,10 +79,8 @@ msgstr "Serveur(s) IMAP à utiliser avec 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 "Veuillez choisir le serveur IMAP que doit utiliser RoundCube."
+msgstr "Veuillez choisir le(s) serveur(s) IMAP que doit utiliser RoundCube."
 
 #. Type: string
 #. Description

diff --git a/debian/po/sv.po b/debian/po/sv.po
index 3d890e641c6a0fbe52ede8dfc6beda7d207852f1..cb5dfa2d27c102b047a02e1d427624b8c63c34e7 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,6 +1,6 @@
-# translation of roundcube.po to swedish
+# translation of debconf messages for Roundcube to Swedish
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Roundcube package.
 #
 # Martin Bagge <brother@bsnet.se>, 2008.
 msgid ""
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: roundcube\n"
 "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n"
 "POT-Creation-Date: 2009-02-15 17:05+0100\n"
-"PO-Revision-Date: 2008-12-15 00:54+0100\n"
+"PO-Revision-Date: 2009-02-23 01:41+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -76,10 +76,8 @@ msgstr "IMAP-värd/-ar som ska användas med 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 "Ange IMAP-servern som ska användas med RoundCube:"
+msgstr "Ange den/de IMAP-server/-servrar som ska användas med RoundCube:"
 
 #. Type: string
 #. Description