r867 ./packages/openofficeorg/2.3/experimental: update ooo-build; adapt -officebeans Depends
------------------------------------------------------------
revno: 867
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2007-08-28 18:19:07 +0200
message:
update ooo-build; adapt -officebeans Depends
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-08-27 22:32:57 +0000
+++ b/changelog 2007-08-28 16:19:07 +0000
@@ -1,8 +1,14 @@
openoffice.org (1:2.3.0~oog680m2-1.2pre) experimental; urgency=low
* ooo-build:
- - update (10129)
+ - update (10137)
+ jvmfwk-gij-paths.diff: update for new gcj-4.2 packages
+ + jawt-check-cleanup.diff: clenup jawt check to not expect -lgcj
+ (only needed with long obsolete libgcjawt). As we now only
+ have a dependency on libjawt.so which all supported JDKs have,
+ and don't have a dependency on a specific gcj lib anymore we
+ can just depend (or-ed) on all supported JDKs.
+ Indirectly closes: #439287
* debian/README.Debian: mention myspell-hy, myspell-fa, hunspell-ar
* debian/rules:
- BUILD_JARS_NATIVE=n until gcj-4.2 is unbroken
=== modified file 'control'
--- a/control 2007-08-27 22:34:27 +0000
+++ b/control 2007-08-28 16:19:07 +0000
@@ -396,7 +396,7 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc amd64 ppc64
Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${jawt-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
=== modified file 'control.in'
--- a/control.in 2007-08-22 22:39:32 +0000
+++ b/control.in 2007-08-28 16:19:07 +0000
@@ -634,7 +634,7 @@
Section: misc
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
- ${jawt-depends},
+ java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin,
${java-common-depends}
Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
=== modified file 'rules'
--- a/rules 2007-08-27 22:34:27 +0000
+++ b/rules 2007-08-28 16:19:07 +0000
@@ -386,12 +386,12 @@
endif
DBG_DBG_SUGGESTS+= , libgcj$(LIBGCJ_SONR)-dbg
ifeq "$(shell dpkg --compare-versions `dpkg -l gcj-4.1 | tail -n 1 | awk '{ print $$3 }'` ge '4.1.2-3' && echo true || echo false)" "true"
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
+ GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-1-awt
else
ifeq "$(GCJ_VERSION)" "4.2"
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
+ GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-1-awt
else
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-awt
+ GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-awt
endif
endif
export JAVA_HOME
@@ -2682,7 +2682,7 @@
-V'writer-pyuno-dep=$(WRITER_PYUNO_DEP)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
- -V'jawt-depends=$(JAWT_DEPENDS)' \
+ -V'gcj-jawt-depends=$(GCJ_JAWT_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
Reply to: