The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 780ca0e812f92d00a5a0673831b6b87d311e6a55
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Jul 13 10:25:59 2012 +0200
lp#1023405: switch to libservlet 3.0 API
diff --git a/changelog b/changelog
index 51dcb8f..19a59d6 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:3.6.0~rc1-0ubuntu1~ppa1) quantal; urgency=low
* new upstream rc
+ * switch to libservlet 3.0 API (LP: #1023405)
-- Bjoern Michaelsen <[email protected]> Thu, 12 Jul 2012
12:05:56 +0200
diff --git a/rules b/rules
index b41657b..f5ab292 100755
--- a/rules
+++ b/rules
@@ -511,6 +511,11 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
#temp. hacks
ENABLE_EVO2:=n
+ # temp. force libservlet versio for lp#1023405
+ FORCE_LIBSERVLET3:=n
+ ifeq ($(DISTREL),quantal)
+ FORCE_LIBSERVLET3:=y
+ endif
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@ -861,8 +866,13 @@ export JAVA_HOME
BUILD_DEPS_INDEP += $(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
+ ifeq ($(FORCE_LIBSERVLET3),y)
+ BUILD_DEPS_INDEP += (>= 1.1.1-9), libservlet3.0-java
+ CONFIGURE_FLAGS +=
--with-servlet-api-jar=/usr/share/java/servlet-api-3.0.jar
+ else
BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
+ endif
endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
