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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_rc3-1-3-ga27102b



The following commit has been merged in the debian-experimental-4.1 branch:
commit 094f7ff1d6529cb48961b56f1cbadb7a1b59304f
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jul 23 19:03:46 2013 +0200

    use internal clucene again...

diff --git a/changelog b/changelog
index 4dba7c2..b7125fc 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.1.0~rc3-1) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - use internal clucene again; still no action from the clucene
+      maintainers...
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 23 Jul 2013 18:10:09 +0200
+
 libreoffice (1:4.1.0~rc3-1) experimental; urgency=low
 
   * new upstream release candidate 
diff --git a/control b/control
index 96ca62b..38acf51 100644
--- a/control
+++ b/control
@@ -33,7 +33,6 @@ 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,
@@ -4460,7 +4459,6 @@ 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 a5b8b1f..5bf8801 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: