The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit e690f9a91c37a83a9997434c251372aa6f794271
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Jun 21 12:41:40 2013 +0200
hardcode java build deps as script creates faulty outpu
diff --git a/rules b/rules
index 9ab6913..383a73c 100755
--- a/rules
+++ b/rules
@@ -917,12 +917,13 @@ export JAVA_HOME
ifeq "$(ENABLE_MEDIAWIKI)" "y"
CONFIGURE_FLAGS += --enable-ext-wiki-publisher
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
- MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS),
libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS),
libcommons-lang-java$(OOO_NO_JAVA_ARCHS),
libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
+ MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS),
libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS),
libcommons-lang-java$(OOO_NO_JAVA_ARCHS),
libcommons-logging-java$(OOO_NO_JAVA_ARCHS) (>= 1.1.1-9)
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
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
- BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }')
+ #BUILD_DEPS_INDEP += , $(shell dpkg -s libcommons-logging-java | grep
Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
+ BUILD_DEPS_INDEP += , libservlet3.0-java
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
@@ -935,10 +936,11 @@ export JAVA_HOME
CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar
--with-libxml-jar=/usr/share/java/libxml.jar
--with-flute-jar=/usr/share/java/flute.jar
--with-jfreereport-jar=/usr/share/java/flow-engine.jar
--with-liblayout-jar=/usr/share/java/liblayout.jar
--with-libloader-jar=/usr/share/java/libloader.jar
--with-libformula-jar=/usr/share/java/libformula.jar
--with-librepository-jar=/usr/share/java/librepository.jar
--with-libfonts-jar=/usr/share/java/libfonts.jar
--with-libserializer-jar=/usr/share/java/libserializer.jar
endif
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
- REPORT_BUILDER_BUILD_DEPS += ,
libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
- REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
+ REPORT_BUILDER_BUILD_DEPS += ,
libcommons-logging-java$(OOO_NO_JAVA_ARCHS) (>= 1.1.1-9)
+ REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java (>=1.1.1-9)
CONFIGURE_FLAGS +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
- BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }')
+ #BUILD_DEPS_INDEP += , $(shell dpkg -s libcommons-logging-java | grep
Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
+ BUILD_DEPS_INDEP += , libservlet3.0-java
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
else
--
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]
