[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-4-3-gf4e4652
The following commit has been merged in the master branch:
commit 773299466a3cfd41b3cdfdde2b2bfcc5508ed517
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Wed Apr 18 16:34:58 2012 +0200
debian/patches/db5.3.diff: add 5.3 to checked db versions
diff --git a/changelog b/changelog
index 20ffe3c..86b6156 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
+
+ * debian/patches/db5.3.diff: add 5.3 to checked db versions
+
+ -- Rene Engelhard <rene@debian.org> Mon, 16 Apr 2012 09:02:21 +0200
+
libreoffice (1:3.5.2-4) unstable; urgency=medium
* debian/patches/icu-4.9.diff: backport fix from libreoffice-3-5
diff --git a/patches/db5.3.diff b/patches/db5.3.diff
new file mode 100644
index 0000000..a76255b
--- /dev/null
+++ b/patches/db5.3.diff
@@ -0,0 +1,22 @@
+From 3d2333d362a7f02eef4c0d826ae17581e84ec479 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Tue, 17 Apr 2012 15:46:03 +0000
+Subject: add 5.3 into the db check for-loop
+
+Signed-off-by: Petr Mladek <pmladek@suse.cz>
+---
+diff --git a/configure.in b/configure.in
+index ea9dee1..d01e82f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5110,7 +5110,7 @@ if test "$with_system_db" = "yes"; then
+ AC_MSG_RESULT([external])
+
+ db_header=
+- for dbver in 5.1 5.0 5 4.8 4.7 4; do
++ for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do
+ for dash in - ''; do
+ AC_CHECK_HEADER([db$dash$dbver/db.h],
+ [ db_header="db$dash$dbver/db.h"; break 2 ])
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index cdea811..9fdf704 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ gcc-4.7-i386.diff
gcc-4.7-amd64.diff
icu-4.9.diff
tests-fix-build-with-jdk7.diff
+db5.3.diff
--
LibreOffice packaging repository
Reply to: