./packages/libreoffice/3.3.0/experimental r2276: * debian/rules:
------------------------------------------------------------
revno: 2276
committer: Matthias Klose <doko@canonical.com>
branch nick: 3.3
timestamp: Thu 2010-12-30 18:34:26 +0100
message:
* debian/rules:
- Add a helper macro gen_no_archs to generate macros OOO_NO_<foo>_ARCHS
from OOO_<foo>_ARCHS. Use these macros in build dependencies.
* debian/control.in:
- Adjust for slightly changed OOO_NO_BASE_ARCHS macro.
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-12-30 15:33:22 +0000
+++ b/changelog 2010-12-30 17:34:26 +0000
@@ -18,10 +18,13 @@
- Add build support for dh_python2.
- Do not re-introduce arm (old ARM ABI).
- Avoid over long lines in build dependencies.
+ - Add a helper macro gen_no_archs to generate macros OOO_NO_<foo>_ARCHS
+ from OOO_<foo>_ARCHS. Use these macros in build dependencies.
* debian/control.in:
- Remove packages and versions in build dependencies,
which are present in the last old stable release.
- Avoid empty filed in build dependencies.
+ - Adjust for slightly changed OOO_NO_BASE_ARCHS macro.
-- Rene Engelhard <rene@debian.org> Wed, 29 Dec 2010 23:57:14 +0100
=== modified file 'control'
--- a/control 2010-12-30 15:33:22 +0000
+++ b/control 2010-12-30 17:34:26 +0000
@@ -48,10 +48,10 @@
gcc (>> 4.3.0) [s390],
g++-4.4 (>= 4.4.2-5) [armel],
dpkg-dev (>= 1.15.1),
- libgl1-mesa-dev [alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libglu1-mesa-dev [alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libgl1-mesa-dev [!armel !armhf !mips !mipsel],
+ libglu1-mesa-dev [!armel !armhf !mips !mipsel],
libpoppler-dev (>= 0.8.0),
- libgraphite-dev [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libgraphite-dev,
libcurl4-gnutls-dev,
libssl-dev,
libdb-dev,
@@ -61,32 +61,32 @@
epm,
libcppunit-dev (>= 1.12),
openjdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc],
- gcj-jdk [alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libgcj-common (>= 1:4.4.1) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- ant (>= 1.7.0) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- ant-optional (>= 1.7.0) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- gcc-mingw32 [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- mingw32-runtime [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libcommons-codec-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libcommons-httpclient-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libcommons-lang-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libcommons-logging-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libservlet2.5-java,
- libbase-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libsac-java [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libxml-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libflute-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libpentaho-reporting-flow-engine-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- liblayout-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libloader-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libformula-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- librepository-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libfonts-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libserializer-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libcommons-logging-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libservlet2.5-java,
- xulrunner-dev [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libnss3-dev (>= 3.12.3) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ gcj-jdk [!powerpc !powerpcspe !ppc64],
+ libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64],
+ ant (>= 1.7.0),
+ ant-optional (>= 1.7.0),
+ gcc-mingw32,
+ mingw32-runtime,
+ libcommons-codec-java,
+ libcommons-httpclient-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libservlet2.5-java,
+ libbase-java-openoffice.org [!armel],
+ libsac-java [!armel],
+ libxml-java-openoffice.org [!armel],
+ libflute-java-openoffice.org [!armel],
+ libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
+ liblayout-java-openoffice.org [!armel],
+ libloader-java-openoffice.org [!armel],
+ libformula-java-openoffice.org [!armel],
+ librepository-java-openoffice.org [!armel],
+ libfonts-java-openoffice.org [!armel],
+ libserializer-java-openoffice.org [!armel],
+ libcommons-logging-java,
+ libservlet2.5-java,
+ xulrunner-dev,
+ libnss3-dev (>= 3.12.3),
dmake (>= 1:4.11),
mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
@@ -108,12 +108,12 @@
kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5),
libmysqlclient-dev,
- libmysqlcppconn-dev (>= 1.1.0~r791) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libmysqlcppconn-dev (>= 1.1.0~r791),
libebook1.2-dev [!armel],
libxrandr-dev,
- liblucene2-java (>= 2.3.2) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- libhsqldb-java (>> 1.8.0.10) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
- bsh (>= 2.0b4) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ liblucene2-java (>= 2.3.2),
+ libhsqldb-java (>> 1.8.0.10),
+ bsh (>= 2.0b4),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
lp-solve (>= 5.5.0.13-5+b1),
libsuitesparse-dev (>= 1:3.4.0),
=== modified file 'control.in'
--- a/control.in 2010-12-30 15:28:35 +0000
+++ b/control.in 2010-12-30 17:34:26 +0000
@@ -61,8 +61,8 @@
libreofficeVER-impress,
libreofficeVER-draw,
libreofficeVER-math,
- libreofficeVER-base [%OOO_NO_BASE_ARCHS%],
- libreofficeVER-report-builder-bin [%OOO_NO_BASE_ARCHS%],
+ libreofficeVER-base%OOO_NO_BASE_ARCHS%,
+ libreofficeVER-report-builder-bin%OOO_NO_BASE_ARCHS%,
ttf-dejavu,
ttf-sil-gentium-basic,
libreofficeVER-filter-mobiledev,
@@ -245,7 +245,7 @@
Package: libreofficeVER-writer
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-base-core (= ${binary:Version}) [%OOO_NO_BASE_ARCHS%],
+ libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
${shlibs:Depends},
${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreofficeVER-emailmerge, libreofficeVER-math
@@ -260,7 +260,7 @@
Package: libreofficeVER-calc
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-base-core (= ${binary:Version}) [%OOO_NO_BASE_ARCHS%],
+ libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
${shlibs:Depends},
${lpsolve-dep},
${misc:Depends}
=== modified file 'rules'
--- a/rules 2010-12-30 15:33:22 +0000
+++ b/rules 2010-12-30 17:34:26 +0000
@@ -335,6 +335,13 @@
#############
# Architecture-specific changes
+# helper to generate no_archs macros (pass name of source macro)
+define gen_no_archs
+ _no_arch_macro = $(subst OOO_,OOO_NO_,$1)
+ _no_arch_tmp_$1 = $$(foreach _a,$$(filter-out $$(call $1),$(OOO_ARCHS)),!$$(_a))
+ $$(_no_arch_macro) = $$(if $$(_no_arch_tmp_$1),$$(_empty) [$$(_no_arch_tmp_$1)])
+endef
+
LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
@@ -351,24 +358,29 @@
ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
+ $(eval $(call gen_no_archs, OOO_OGLTRANS_ARCHS))
endif
OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
# Java...
OOO_JAVA_ARCHS = $(OOO_ARCHS)
+$(eval $(call gen_no_archs, OOO_JAVA_ARCHS))
# gcj does not work on ppc, so no need to build -gcj for it
OOO_GCJ_ARCHS = $(filter-out powerpc powerpcspe ppc64, $(OOO_JAVA_ARCHS))
+$(eval $(call gen_no_archs, OOO_GCJ_ARCHS))
OOO_GCJ_JDK_ARCHS := hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
+$(eval $(call gen_no_archs, OOO_OPENJDK_ARCHS))
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
-OOO_BASE_ARCHS := $(filter-out armel,$(OOO_ARCHS))
-OOO_NO_BASE_ARCHS := !armel
+OOO_BASE_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
+$(eval $(call gen_no_archs, OOO_BASE_ARCHS))
OOO_REPORTDESIGN_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
+$(eval $(call gen_no_archs, OOO_REPORTDESIGN_ARCHS))
ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
PACKAGE_BASE=n
@@ -507,6 +519,7 @@
# stuff like the xmlsecurity (which uses nss). For the plugin only,
# change the OOO_NPSOPLUGIN_ARCHS
OOO_MOZILLA_ARCHS = $(filter-out nothing, $(OOO_ARCHS))
+$(eval $(call gen_no_archs, OOO_MOZILLA_ARCHS))
ifeq "$(USE_SOURCE_TARBALLS)" "n"
BUILD_DEPS += , git, rsync
@@ -536,7 +549,7 @@
endif
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
- BUILD_DEPS += , libgl1-mesa-dev [$(OOO_OGLTRANS_ARCHS)], libglu1-mesa-dev [$(OOO_OGLTRANS_ARCHS)]
+ BUILD_DEPS += , libgl1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS), libglu1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS)
endif
ifeq "$(ENABLE_OPENGL)" "y"
CONFIGURE_FLAGS += --enable-opengl --with-system-mesa-headers
@@ -559,7 +572,7 @@
ifeq "$(ENABLE_GRAPHITE)" "y"
ifeq "$(USE_SYSTEM_GRAPHITE)" "y"
- BUILD_DEPS += , libgraphite-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libgraphite-dev
CONFIGURE_FLAGS += --with-system-graphite
ifeq "$(USE_STLPORT)" "y"
ADDITIONAL_SECTIONS += SystemBitsWithSTLport
@@ -725,7 +738,7 @@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
- BUILD_DEPS += , default-jdk-builddep [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , default-jdk-builddep$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(JDK)" "java-gcj-compat"
JAVA_HOME=/usr/lib/jvm/java-gcj
@@ -735,7 +748,7 @@
endif
ifeq "$(JDK)" "gcj-jdk"
JAVA_HOME=/usr/lib/jvm/java-gcj
- BUILD_DEPS += , gcj-jdk [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , gcj-jdk$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(JDK)" "openjdk"
BUILD_DEPS += , openjdk-6-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
@@ -746,9 +759,9 @@
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , gij [$(OOO_GCJ_ARCHS)], java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_GCJ_ARCHS)], libgcj-bc [$(OOO_GCJ_ARCHS)]
+ BUILD_DEPS += , gij$(OOO_NO_GCJ_ARCHS), java-gcj-compat-dev (>= 1.0.76-7)$(OOO_NO_GCJ_ARCHS), libgcj-bc$(OOO_GCJ_ARCHS)
else
- BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.1) [$(OOO_GCJ_ARCHS)]
+ BUILD_DEPS += , gcj-jdk$(OOO_NO_GCJ_ARCHS), libgcj-common (>= 1:4.4.1)$(OOO_NO_GCJ_ARCHS)
endif
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@ -756,9 +769,9 @@
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_JAVA_ARCHS)], ant-optional (>= 1.7.0) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , ant (>= 1.7.0)$(OOO_NO_JAVA_ARCHS), ant-optional (>= 1.7.0)$(OOO_NO_JAVA_ARCHS)
else
- BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
@@ -783,15 +796,15 @@
JAVA_COMMON_DEPENDS_VERSION:= (>= $(BASE_VERSION)~)
ifeq "$(USE_SYSTEM_SAXON)" "y"
CONFIGURE_FLAGS += --with-system-saxon --with-saxon-jar=/usr/share/java/saxonb.jar
- BUILD_DEPS += , libsaxonb-java [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
JAVA_COMMON_JAVA_DEPENDS+= , libsaxonb-java
endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(DIST)" "Debian"
ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , mingw32$(OOO_NO_JAVA_ARCHS)
else
- BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)], mingw32-runtime [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
endif
CONFIGURE_FLAGS += --enable-build-unowinreg
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
@@ -800,7 +813,7 @@
ifeq "$(ENABLE_MEDIAWIKI)" "y"
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_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_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
@@ -815,13 +828,13 @@
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
ifeq "$(USE_SYSTEM_JFREEREPORT)" "y"
- REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libsac-java [$(OOO_REPORTDESIGN_ARCHS)], libxml-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libflute-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libpentaho-reporting-flow-engine-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], liblayout-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libloader-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libformula-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], librepository-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libfonts-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)], libserializer-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)]
+ REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libfonts-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libserializer-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS)
REPORT_BUILDER_JAR_DEPENDS := , libbase-java-openoffice.org, libsac-java, libxml-java-openoffice.org, libflute-java-openoffice.org, libpentaho-reporting-flow-engine-java-openoffice.org, liblayout-java-openoffice.org, libloader-java-openoffice.org, libformula-java-openoffice.org, librepository-java-openoffice.org, libfonts-java-openoffice.org, libserializer-java-openoffice.org
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_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_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"
@@ -842,16 +855,16 @@
ifneq "$(MOZILLA)" ""
ifneq "$(OOO_MOZILLA_ARCHS)" ""
ifeq "$(MOZILLA)" "xulrunner"
- BUILD_DEPS+= , libxul-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev (>= 3.12.3) [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS+= , libxul-dev$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
else
ifeq "$(MOZILLA)" "libxul"
- BUILD_DEPS+= , xulrunner-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev (>= 3.12.3) [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS+= , xulrunner-dev$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)
else
ifeq "$(MOZILLA)" "iceape"
- BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)], libnss3-dev (>= 3.12.3) [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5)$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)]
else
- BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS += , $(MOZILLA)-dev$(OOO_NO_MOZILLA_ARCHS)
endif
endif
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
@@ -1038,7 +1051,7 @@
ifeq "$(ENABLE_KDEAB)" "y"
ifeq "$(KDE_VER)" "4"
ADDITIONAL_SECTIONS += KDE4Experimental
- BUILD_DEPS += , kdepimlibs$(shell expr $(KDE_VER) + 1)-dev [$(OOO_NO_BASE_ARCHS)]
+ BUILD_DEPS += , kdepimlibs$(shell expr $(KDE_VER) + 1)-dev$(OOO_NO_BASE_ARCHS)
endif
else
CONFIGURE_FLAGS+= --disable-kdeab
@@ -1054,7 +1067,7 @@
endif
ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "y"
CONFIGURE_FLAGS += --with-system-mysql-cppconn
- BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
endif
endif
@@ -1068,7 +1081,7 @@
CONFIGURE_FLAGS += --disable-evolution2
DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-evolution
else
- BUILD_DEPS += , libebook1.2-dev [$(OOO_NO_BASE_ARCHS)]
+ BUILD_DEPS += , libebook1.2-dev$(OOO_NO_BASE_ARCHS)
endif
ifeq "$(ENABLE_RANDR)" "y"
@@ -1094,20 +1107,20 @@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(USE_SYSTEM_LUCENE)" "y"
- BUILD_DEPS += , liblucene2-java (>= 2.3.2) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , liblucene2-java (>= 2.3.2)$(OOO_NO_JAVA_ARCHS)
LUCENE_DEPENDS = liblucene2-java (>= 2.3.2)
# safety measure; e.g. lucene 2.9 index cannot be handled by lucene 2.4
LUCENE_CONFLICTS = liblucene2-java (<< $(shell dpkg -l liblucene2-java | grep ^ii | awk '{ print $$3 }' | cut -d. -f1,2)~)
CONFIGURE_FLAGS += --with-system-lucene --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
endif
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
- BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
CONFIGURE_FLAGS+= --with-system-hsqldb
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
endif
ifeq "$(USE_SYSTEM_BSH)" "y"
- BUILD_DEPS += , bsh (>= 2.0b4) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
COMMON_BSH_DEPENDS = bsh (>= 2.0b4)
CONFIGURE_FLAGS+= --with-system-beanshell
JAVA_GCJ_DEPENDS += , bsh-gcj
Reply to: