r805 ./packages/openofficeorg/2.2.1/unstable: build -officebean nly on arches with Java support (merge from 2.3)
------------------------------------------------------------
revno: 805
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2007-10-19 19:21:54 +0200
message:
build -officebean nly on arches with Java support (merge from 2.3)
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 17:19:13 +0000
+++ b/changelog 2007-10-19 17:21:54 +0000
@@ -27,6 +27,9 @@
as OOo is LGPL 2.1 only
- debian/control.moztilla.in, debian/rules:
+ don't build mozilla-openoffice.org on amd64/ppc64, broken
+ * merge from Ubuntu:
+ - debian/control.in: Build openoffice.org-officebean only on architectures
+ with java support
-- Rene Engelhard <rene@debian.org> Sun, 16 Sep 2007 00:42:19 +0200
=== modified file 'control.in'
--- a/control.in 2007-10-19 16:57:06 +0000
+++ b/control.in 2007-10-19 17:21:54 +0000
@@ -610,7 +610,7 @@
http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.orgVER-officebean
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_JAVA_ARCHS%
Section: misc
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
=== modified file 'rules'
--- a/rules 2007-10-19 17:19:13 +0000
+++ b/rules 2007-10-19 17:21:54 +0000
@@ -993,6 +993,7 @@
endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
Reply to: