From 52a5551397c5aaf8bef386cb6891970aa564c959 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Wed, 11 Mar 2009 17:45:39 +0000 Subject: [PATCH] =?utf8?q?Add=20a=20patch=20to=20not=20use=20a=20MDB2=20fe?= =?utf8?q?ature=20not=20present=20in=20the=20Debian=20package.=20Thanks=20?= =?utf8?q?to=20Grzegorz=20Soba=C5=84ski=20for=20the=20patch.=20Closes:=20#?= =?utf8?q?519104.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 +++- debian/patches/series | 1 + debian/patches/too-old-mdb2.patch | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 debian/patches/too-old-mdb2.patch diff --git a/debian/changelog b/debian/changelog index f9cde24..d691100 100644 --- 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 Tue, 17 Feb 2009 20:17:11 +0100 diff --git a/debian/patches/series b/debian/patches/series index 9753d88..708432a 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 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 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'; + } + -- 2.39.2