[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-2-8-g202e245
The following commit has been merged in the debian-experimental-4.0 branch:
commit 202e24523462f4603690e9005bd06f97c795310d
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 10 23:15:18 2013 +0200
Use internal clucene until clucene 2.x is in unstable.
diff --git a/changelog b/changelog
index 62a47c7..461a916 100644
--- a/changelog
+++ b/changelog
@@ -6,7 +6,8 @@ libreoffice (1:4.0.2-1) UNRELEASED; urgency=low
- actually use ${pyuno-depends}...
* debian/rules:
- enable liblangtag on arm*, too now that it's available there
- - Remove arm* hack for internal clucene as it seems to work in the
+ - Use internal clucene until clucene 2.x is in unstable. Remove
+ arm* hack for internal clucene as it seems to work in the
meanwhile
-- Rene Engelhard <rene@debian.org> Tue, 02 Apr 2013 12:39:08 +0200
diff --git a/control b/control
index 0d23b03..55bbeaa 100644
--- a/control
+++ b/control
@@ -34,7 +34,6 @@ 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,
@@ -4439,7 +4438,6 @@ Depends: ant (>= 1.7.0),
libboost-dev (>= 1.38),
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 5ef0902..97e45df 100755
--- a/rules
+++ b/rules
@@ -348,7 +348,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: