[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-148-g7ced91c



The following commit has been merged in the debian-experimental-4.1 branch:
commit 7ced91c13cde4e7b56119fd938a48dd27b533824
Author: Rene Engelhard <rene@debian.org>
Date:   Wed May 22 21:41:18 2013 +0200

    enable system-clucene again

diff --git a/changelog b/changelog
index 1e26d89..9871199 100644
--- a/changelog
+++ b/changelog
@@ -11,10 +11,11 @@ libreoffice (1:4.1.0~beta1-1) UNRELEASED; urgency=low
     - build with explicit --enable-python=system
     - enable the tightended binutils build-dep, we're in experimental anyway
       and need harfbuzz, orcus and mdds from experimental, too
+    - enable system-clucene again
     - temporarily disable cleandupes for -l10n-* as it's broken right nwo
   * debian/uno-libs3.symbols: update
 
- -- Rene Engelhard <rene@debian.org>  Wed, 22 May 2013 16:36:53 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 22 May 2013 21:40:45 +0200
 
 libreoffice (1:4.0.3-3) unstable; urgency=low
 
diff --git a/control b/control
index b11eed7..b97a2ef 100644
--- a/control
+++ b/control
@@ -32,6 +32,7 @@ Build-Depends: ant (>= 1.7.0),
                libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
                libcairo2-dev,
                libcdr-dev,
+               libclucene-dev (>= 2.3.3.4-2),
                libcmis-dev (>= 0.3.1),
                libcppunit-dev (>= 1.12),
                libcups2-dev,
@@ -4431,6 +4432,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 559b2c9..3835c3e 100755
--- a/rules
+++ b/rules
@@ -358,7 +358,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

-- 
LibreOffice packaging repository


Reply to: