./packages/openofficeorg/2.3.1/unstable r1003: revert for now to be not blocked by java-gcj-compat
------------------------------------------------------------
revno: 1003
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-02-04 18:37:45 +0100
message:
revert for now to be not blocked by java-gcj-compat
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-02-04 13:24:43 +0000
+++ b/changelog 2008-02-04 17:37:45 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:2.3.1-3.4pre) unstable; urgency=low
+openoffice.org (1:2.3.1-3.4pre) unstable; urgency=medium
* ooo-build:
- update (r11495)
@@ -17,9 +17,6 @@
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
=== modified file 'rules'
--- a/rules 2008-02-04 13:11:53 +0000
+++ b/rules 2008-02-04 17:37:45 +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
@@ -2699,12 +2699,6 @@
-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: