------------------------------------------------------------
revno: 1952
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2010-04-21 19:22:52 +0200
message:
fix build with new dpkg 1.15.27
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-04-20 11:34:40 +0000
+++ b/changelog 2010-04-21 17:22:52 +0000
@@ -13,6 +13,7 @@
- enable kfreebsd-{i386,amd64}
- run dpkg-checkbuilddeps in control: as we rely on build-deps being
there in some rules (like the LDAP_LIB one)
+ - fix build with new dpkg 1.15.27
* debian/scripts/vars.kfreebsd-*: add PLATFORMID
* debian/shlibs.override.libc: force libc0.1 dependency to (>= 2.10.2-7)
* merge from Ubuntu:
=== modified file 'rules'
--- a/rules 2010-04-19 11:47:04 +0000
+++ b/rules 2010-04-21 17:22:52 +0000
@@ -864,7 +864,7 @@
CONFIGURE_FLAGS += --enable-wiki-publisher
ifeq "$(USE_SYSTEM_APACHE_COMMONS)" "y"
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java [$(OOO_JAVA_ARCHS)],
libcommons-httpclient-java [$(OOO_JAVA_ARCHS)], libcommons-lang-java
[$(OOO_JAVA_ARCHS)], libcommons-logging-java [$(OOO_JAVA_ARCHS)]
- MEDIAWIKI_JAR_DEPENDS := $(MEDIAWIKI_BUILD_DEPS)
+ MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
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"
@@ -879,13 +879,13 @@
# report-builder
ifeq "$(USE_SYSTEM_JFREEREPORT)" "y"
REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org
[$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)],
libxml-java-openoffice.org [$(OOO_JAVA_ARCHS)], libflute-java-openoffice.org
[$(OOO_JAVA_ARCHS)], libpentaho-reporting-flow-engine-java-openoffice.org
[$(OOO_JAVA_ARCHS)], liblayout-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libloader-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libformula-java-openoffice.org [$(OOO_JAVA_ARCHS)],
librepository-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libfonts-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libserializer-java-openoffice.org [$(OOO_JAVA_ARCHS)]
- REPORT_BUILDER_JAR_DEPENDS := $(REPORT_BUILDER_BUILD_DEPS)
+ REPORT_BUILDER_JAR_DEPENDS := $(shell $(REPORT_BUILDER_BUILD_DEPS) |
sed -e 's/\(.*\)\[.*\]/\1/')
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport
--with-libbase-jar=/usr/share/java/openoffice/libbase.jar
--with-libxml-jar=/usr/share/java/openoffice/libxml.jar
--with-flute-jar=/usr/share/java/openoffice/flute.jar
--with-jfreereport-jar=/usr/share/java/openoffice/flow-engine.jar
--with-liblayout-jar=/usr/share/java/openoffice/liblayout.jar
--with-libloader-jar=/usr/share/java/openoffice/libloader.jar
--with-libformula-jar=/usr/share/java/openoffice/libformula.jar
--with-librepository-jar=/usr/share/java/openoffice/librepository.jar
--with-libfonts-jar=/usr/share/java/openoffice/libfonts.jar
--with-libserializer-jar=/usr/share/java/openoffice/libserializer.jar
endif
ifeq "$(USE_SYSTEM_APACHE_COMMONS)" "y"
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java
[$(OOO_JAVA_ARCHS)]
- REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
[$(OOO_JAVA_ARCHS)]
+ REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
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$$)
