[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-1-4-g3f75e63
The following commit has been merged in the master branch:
commit 0e2271957c92708cb5ab3757e533b1e503348d3a
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 16 19:39:17 2012 +0000
use correct --with-servlet-api-jar
diff --git a/changelog b/changelog
index a9a867b..7277674 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,11 @@ libreoffice (1:3.4.5-2) UNRELEASED; urgency=low
* debian/patches/jdbc-driver-threading.diff: backport fix for
Attach/Detach-CurrentThread slowness from libreoffice-3-5
(closes: #644957)
+ * debian/rules:
+ - specify correct --with-servlet-api= after recent libcommons-logging-java
+ changes
- -- Rene Engelhard <rene@debian.org> Sun, 15 Jan 2012 23:11:52 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 16 Jan 2012 19:37:47 +0000
libreoffice (1:3.4.5-1) unstable; urgency=medium
diff --git a/rules b/rules
index c69de1d..de4acde 100755
--- a/rules
+++ b/rules
@@ -823,11 +823,13 @@ export MINGWSTRIP = i686-w64-mingw32-strip
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-commons-codec-jar=/usr/share/java/commons-codec.jar --with-commons-lang-jar=/usr/share/java/commons-lang.jar --with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar --with-commons-logging-jar=/usr/share/java/commons-logging.jar
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
+ CONFIGURE_FLAGS += --with-system-servlet-api
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
else
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }') (>= 1.1.1-9)
+ CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
endif
endif
--
LibreOffice packaging repository
Reply to: