------------------------------------------------------------
revno: 985
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-02-03 23:05:07 +0100
message:
* ooo-build:
- update (r11494)
* debian/rules:
- 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
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-02-03 10:37:17 +0000
+++ b/changelog 2008-02-03 22:05:07 +0000
@@ -1,10 +1,15 @@
-openoffice.org (1:2.4.0~ooh680m6-0.1pre) experimental; urgency=low
+openoffice.org (1:2.4.0~ooh680m6-1) experimental; urgency=low
* new upstream snapshot (OOH680_m6)
* ooo-build:
- - update (r11492)
+ - update (r11494)
+ * debian/rules:
+ - 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
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 03 Feb 2008 00:44:02 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 03 Feb 2008 23:02:29 +0100
openoffice.org (1:2.4.0~ooh680m5-1) experimental; urgency=high
=== modified file 'rules'
--- a/rules 2008-01-28 18:51:36 +0000
+++ b/rules 2008-02-03 22:05:07 +0000
@@ -522,9 +522,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
@@ -568,7 +568,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)],
libpentaho-reporting-flow-engine-java [$(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/pentaho-reporting-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-jcommon-serializer-jar=/usr/share/java/jcommon-serializer.jar
endif
else
CONFIGURE_FLAGS += --disable-reportdesign
@@ -2857,6 +2857,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)' \
