[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-4-5-g426304a
The following commit has been merged in the master branch:
commit 426304aaf79667e7befa9559d5f428e028e5d513
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 20 01:03:32 2012 +0200
Revert "debian/patches/db5.3.diff: add 5.3 to checked db versions"
This reverts commit 773299466a3cfd41b3cdfdde2b2bfcc5508ed517.
We actually don't need it.
diff --git a/changelog b/changelog
index f1eff39..fc7aa4d 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,6 @@
libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * debian/patches/db5.3.diff: add 5.3 to checked db versions
* debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
* debian/libreoffice-common.links: move ...
diff --git a/patches/db5.3.diff b/patches/db5.3.diff
deleted file mode 100644
index a76255b..0000000
--- a/patches/db5.3.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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 029cb51..45cb627 100644
--- a/patches/series
+++ b/patches/series
@@ -36,5 +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
lp-926940-visio-mime-for-draw.diff
--
LibreOffice packaging repository
Reply to: