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.

diff --git a/debian/changelog b/debian/changelog
index f9cde24d99333fbd1a7fedd2c0b3b0c074a995b6..d69110035a065d49247d50a3d695ddaf0421d774 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ roundcube (0.2~stable-2) UNRELEASED; urgency=low
       + 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 versioned dependencies on those to avoid
+    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>  Tue, 17 Feb 2009 20:17:11 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index 9753d888e0a24483e9bcc5b7d8ceb121b7d7f8ac..708432aa1df407b5c6f9776ada4c7ae440b0a700 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-md2.patch

diff --git a/debian/patches/too-old-mdb2.patch b/debian/patches/too-old-mdb2.patch
new file mode 100644 (file)
index 0000000..ae25ffd
--- /dev/null
+++ b/debian/patches/too-old-mdb2.patch
@@ -0,0 +1,14 @@
+Only in roundcube-0.2~stable/debian/patches: 519104-workaround.patch
+diff -ur roundcube-0.2~stable/program/include/rcube_mdb2.php roundcube-0.2~stable-patched/program/include/rcube_mdb2.php
+--- 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';
+     }
+