------------------------------------------------------------
revno: 904
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-10-14 00:43:22 +0200
message:
* merge from Ubuntu:
- debian/control.in: Build openoffice.org-officebean only on
architectures
with java support
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-12 12:06:51 +0000
+++ b/changelog 2007-10-13 22:43:22 +0000
@@ -22,6 +22,9 @@
as OOo is LGPL 2.1 only
* debian/control.mozilla.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
[ Mirco Bauer ]
* debian/rules:
@@ -31,7 +34,7 @@
* debian/control.mono.in:
- enhanced package description
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 12 Oct 2007 11:36:52 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 13 Oct 2007 21:53:18 +0200
openoffice.org (1:2.3.0-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-10-12 12:06:51 +0000
+++ b/control 2007-10-13 22:43:22 +0000
@@ -2875,24 +2875,6 @@
This package contains the test data for the OpenOffice.org Java and
Basic APIs.
-Package: mozilla-openoffice.org
-Section: net
-Architecture: i386 powerpc sparc
-Enhances: iceape-browser,
- iceweasel,
- mozilla-browser,
- firefox,
- openoffice.org,
- openoffice.org-core
-Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.2.0-2)
-Recommends: iceweasel | firefox | iceape-browser, openoffice.org-writer,
openoffice.org-calc, openoffice.org-draw, openoffice.org-impress,
openoffice.org-math, openoffice.org-base
-Description: OpenOffice.org Mozilla plugin
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains a Mozilla/Netscape compatible plugin which can handle
- all OOo documents.
-
Package: ttf-opensymbol
Section: x11
Architecture: all
=== modified file 'control.in'
--- a/control.in 2007-09-25 12:32:49 +0000
+++ b/control.in 2007-10-13 22:43:22 +0000
@@ -630,7 +630,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-12 12:06:51 +0000
+++ b/rules 2007-10-13 22:43:22 +0000
@@ -1096,6 +1096,7 @@
>> debian/control < debian/control.postgresql.in
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
