[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-1-5-g205f64b
The following commit has been merged in the master branch:
commit 205f64bdf4c6cba8247b8eedc4889dbcb3e596db
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 16 21:17:49 2012 +0100
one more --with-servlet-api-jar place
diff --git a/rules b/rules
index 96744ed..f5f42c4 100755
--- a/rules
+++ b/rules
@@ -845,8 +845,13 @@ export MINGWSTRIP = i686-w64-mingw32-strip
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS += --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)
+ 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
CONFIGURE_FLAGS += --enable-ext-report-builder
endif
--
LibreOffice packaging repository
Reply to: