This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-testing-4.0 in repository libreoffice.
commit 6b56d861ece4ba78b19b3c2cf473241bef34ca24 Author: Rene Engelhard <[email protected]> Date: Mon Jul 29 14:39:23 2013 +0200 use system-clucene again now that it's in sid This reverts commit 094f7ff1d6529cb48961b56f1cbadb7a1b59304f. Conflicts: changelog --- changelog | 1 + control | 2 ++ rules | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index d7bf67a..b849691 100644 --- a/changelog +++ b/changelog @@ -5,6 +5,7 @@ libreoffice (1:4.0.5~rc2-1) UNRELEASED; urgency=low * debian/rules: - temporarily use internal orcus and mdds as the new 4.1-usable versions already are in unstable & testing + - use system-clucene again now that it's in sid & testing -- Rene Engelhard <[email protected]> Wed, 08 Jul 2013 22:01:08 +0200 diff --git a/control b/control index 9669732..b07b6ad 100644 --- a/control +++ b/control @@ -36,6 +36,7 @@ Build-Depends: ant (>= 1.7.0), libc6 (>= 2.17-6) [mips mipsel], libcairo2-dev, libcdr-dev, + libclucene-dev (>= 2.3.3.4-2), libcmis-dev (>= 0.3.1), libcppunit-dev (>= 1.12), libcups2-dev, @@ -4477,6 +4478,7 @@ Depends: ant (>= 1.7.0), libboost1.53-dev, libcairo2-dev, libcdr-dev, + libclucene-dev (>= 2.3.3.4-2), libcmis-dev (>= 0.3.1), libcommons-codec-java, libcommons-httpclient-java, diff --git a/rules b/rules index 49cc4fc..0838213 100755 --- a/rules +++ b/rules @@ -347,7 +347,7 @@ SYSTEM_STUFF += mesa-headers SYSTEM_STUFF += poppler SYSTEM_STUFF += libpng SYSTEM_STUFF += nss -#SYSTEM_STUFF += clucene +SYSTEM_STUFF += clucene ENABLE_HELP=y SYSTEM_STUFF += lcms2 SYSTEM_STUFF += openldap -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
