[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-163-ged06f67
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 737fe2599adcd07d0410a4dc8ed695e598ab1e0c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jul 23 10:58:17 2012 +0200
Revert "lp#1023405: switch to libservlet 3.0 API"
This reverts commit 780ca0e812f92d00a5a0673831b6b87d311e6a55.
Not needed anymore as the package has moved to 3.0 too.
Conflicts:
changelog
rules
diff --git a/changelog b/changelog
index 58d3337..da32173 100644
--- a/changelog
+++ b/changelog
@@ -16,9 +16,12 @@ libreoffice (1:3.6.0~rc2-0ubuntu2) quantal; urgency=low
libreoffice (1:3.6.0~rc2-0ubuntu1) quantal; urgency=low
* new upstream rc
+<<<<<<< HEAD
* switch to libservlet 3.0 API (LP: #1023405)
* revert 78c2f91bd0ba744ddacb908457a18ca6537c8017
* temp. disable reportbuilder for it needs 17 MIRs still
+=======
+>>>>>>> parent of 780ca0e... lp#1023405: switch to libservlet 3.0 API
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 18 Jul 2012 12:54:24 +0200
diff --git a/rules b/rules
index ac0abbc..362a850 100755
--- a/rules
+++ b/rules
@@ -511,11 +511,6 @@ 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
# too much MIRs for the initial upload
ENABLE_REPORTDESIGN=n
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
@@ -871,13 +866,8 @@ export JAVA_HOME
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
- ifeq ($(FORCE_LIBSERVLET3),y)
- BUILD_DEPS += (>= 1.1.1-9), libservlet3.0-java
- CONFIGURE_FLAGS += --with-servlet-api-jar=/usr/share/java/servlet-api-3.0.jar
- else
BUILD_DEPS += (>= 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
Reply to: