./packages/openofficeorg/2.3.1/unstable r1001: merge from 2.4 branch
------------------------------------------------------------
revno: 1001
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-02-04 14:11:53 +0100
message:
merge from 2.4 branch
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-01-28 16:34:45 +0000
+++ b/changelog 2008-02-04 13:11:53 +0000
@@ -17,6 +17,10 @@
with stlport and the readlink will fail :)
- fix ENABLE_JAVA=n build, build the help as it doesn't need Java anymore,
don't build report-builder
+ - stop adding libgcj9-0-awt to java-runtime-depends. Make
+ java-gcj-compat depends of officebean versioned to force 1.0.77-4 which
+ already depends on the -awt package now
+ - specify --with-XXXX-jar for the report-builder jars explcitely
* debian/control.in:
- another Replaces: (-core) missed the epoch, thanks Chris Cheney
- make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
@@ -27,7 +31,7 @@
+ some minor parallel build conditional improvements
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <rene@debian.org> Mon, 28 Jan 2008 17:16:57 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 04 Feb 2008 13:15:49 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-02-04 12:09:25 +0000
+++ b/rules 2008-02-04 13:11:53 +0000
@@ -429,9 +429,9 @@
endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = java-gcj-compat
- ifneq (,$(GCJ_JAWT_DEPENDS))
- JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
- endif
+# ifneq (,$(GCJ_JAWT_DEPENDS))
+# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
+# endif
ifneq (,$(filter $(ARCH), amd64 i386 powerpc))
JAVA_RUNTIME_DEPENDS += | icedtea-java7-jre
endif
@@ -478,7 +478,7 @@
REPORT_BUILDER_BUILD_DEPS += , libjcommon-java (>= 1.0.10) [$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)], libxml-java [$(OOO_JAVA_ARCHS)], libflute-1.3-jfree-java [$(OOO_JAVA_ARCHS)], libjfreereport-java (>= 0.9.0-05) [$(OOO_JAVA_ARCHS)], liblayout-java [$(OOO_JAVA_ARCHS)], libloader-java [$(OOO_JAVA_ARCHS)], libformula-java [$(OOO_JAVA_ARCHS)], librepository-java [$(OOO_JAVA_ARCHS)], libfonts-java (>= 0.2.6) [$(OOO_JAVA_ARCHS)], libjcommon-serializer-java [$(OOO_JAVA_ARCHS)]
REPORT_BUILDER_JAR_DEPENDS := $(REPORT_BUILDER_BUILD_DEPS)
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
- CONFIGURE_FLAGS += --with-system-jfreereport
+ CONFIGURE_FLAGS += --with-system-jfreereport --with-jcommon-jar=/usr/share/java/jcommon.jar --with-libxml-java=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute-1.3-jfree.jar --with-jfreereport-jar=/usr/share/java/jfreereport.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-jcommon-serializer-jar=/usr/share/java/jcommon-serializer.jar
else
CONFIGURE_FLAGS += --disable-reportdesign
endif
@@ -2699,6 +2699,12 @@
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
+ifneq "$(ETCH_BACKPORT)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
+ perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \
+ debian/openoffice.org$(VER)-officebean/DEBIAN/control
+ endif
+endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
Reply to: