[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.1.0-2-6-gb335fe7
The following commit has been merged in the master branch:
commit d93a589b06117b21fb996c0bf52ef0b612d8980c
Author: Rene Engelhard <rene@debian.org>
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
diff --git a/changelog b/changelog
index 001fe2b..cb57a2c 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.1.0-3) unstable; urgency=low
+
+ * debian/rules:
+ - use system-clucene again now that it's in sid
+
+ -- Rene Engelhard <rene@debian.org> Mon 29 Jul 2013 14:39:36 +0200
+
libreoffice (1:4.1.0-2) unstable; urgency=low
* debian/rules:
diff --git a/control b/control
index 38acf51..96ca62b 100644
--- a/control
+++ b/control
@@ -33,6 +33,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,
@@ -4459,6 +4460,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 0139aa4..6ed030d 100755
--- a/rules
+++ b/rules
@@ -353,7 +353,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: