./packages/openofficeorg/3.2/unstable r1865: readd old servlet detection stuff (we need it for lenny-backports)
------------------------------------------------------------
revno: 1865
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2010-03-18 15:36:09 +0100
message:
readd old servlet detection stuff (we need it for lenny-backports)
modified:
README.Debian-source
rules
=== modified file 'README.Debian-source'
--- a/README.Debian-source 2010-03-17 16:59:18 +0000
+++ b/README.Debian-source 2010-03-18 14:36:09 +0000
@@ -14,12 +14,12 @@
are still in ooo-build/src, though ooo-build/ is not used anymore.
Then we add ooo-build (as downloaded from http://download.go-oo.org/OOO320)
-into the tree as ooo-build-MAJOR-MINOR-MICRO-NANO and have that in a
+into the tree as ooo-build-MAJOR-MINOR-MICRO[-NAN and have that in a
openoffice.org_3.2.0.orig-ooo-build-MAJOR-MINOR-MICRO-NANO.tar.gz file
in the same dir as the orig (which we use as "component" in dpkg sense and
thefore is mentioned in debian/source/components). Also we add the extra
stuff this ooo-build release needs into ext-sources-<ooo-build-dir>. That step
-unfortunately is manual; the same as the translation-updates.*
+unfortunately is manual; the same as the translation-updates-YYYMMDD
(ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/OOO320/
is where we get those)
=== modified file 'rules'
--- a/rules 2010-03-17 22:36:12 +0000
+++ b/rules 2010-03-18 14:36:09 +0000
@@ -811,8 +811,12 @@
MEDIAWIKI_JAR_DEPENDS := $(MEDIAWIKI_BUILD_DEPS)
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-apache-commons --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
+ ifeq "$(LENNY_BACKPORT)" "y"
+ CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ else
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ endif
endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
@@ -827,8 +831,12 @@
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java [$(OOO_JAVA_ARCHS)]
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java [$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
+ ifeq "$(LENNY_BACKPORT)" "y"
+ CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ else
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ endif
endif
CONFIGURE_FLAGS += --enable-report-builder
endif
Reply to: