Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv2324
Modified Files:
MANIFEST.i386 MANIFEST.powerpc MANIFEST.s390 MANIFEST.sparc
README changelog control control.in openoffice.org-bin.install
openoffice.org.install rules setperms
Log Message:
* Build without a JDK. (closes: #211288) [JT]
* Added patches:
- allow-no-jdk.diff [JT]: If java is disabled with --disable-java,
don't look for a JDK, but do look for xsltproc, and set XSLTPROC
in set_soenv.
- solenv-set-solar-java-only-if-unset.diff [JT]: Set the
SOLAR_JAVA variable conditionally with "*=".
- readlicense-oo-xsltproc.diff [JT]: Use xsltproc to replace
java for xml transforms in readlicense_oo.
- officecfg-xsltproc.diff [JT]: Use xsltproc to replace java
for xml transforms in officecfg.
- berkeleydb-handle-no-solar-java.diff [JT]: If SOLAR_JAVA is
not set, don't pass --enable-java to the configure script, and
don't expect the jar when finished.
- ridljar-handle-no-solar-java.diff [JT]: If SOLAR_JAVA is not
set, don't attempt to zip up the compiled java files, since they
will not be built.
- jurt-handle-no-solar-java.diff [JT]: Don't build jpipe with
SOLAR_JAVA not set.
- jvmaccess-handle-no-solar-java.diff [JT]: Don't build jvmaccess
with SOLAR_JAVA not set.
- jni-uno-handle-no-solar-java.diff [JT]: Don't build jni_uno
with SOLAR_JAVA not set.
- javaunohelper-handle-no-solar-java.diff [JT]: Don't build
javaunohelper with SOLAR_JAVA not set
- psprint-handle-no-solar-java.diff [JT]: Don't use jvmaccess
to get JDK font path with SOLAR_JAVA not set.
- sj2-handle-no-solar-java.diff [JT]: When SOLAR_JAVA is not set,
replace java applet support with stubs that throw an exception.
- setup2-handle-no-solar-java.diff [JT]: Don't build jvmsetup
or use jvmaccess for java-related setup with SOLAR_JAVA not set.
- scp-handle-no-solar-java.diff [JT]: Don't ship various
java-related files that will no longer be built, but ship the
stubbed out libj from sj2 because setup fails without it.
- svg-handle-no-solar-java.diff [JT]: Disable SVG import support
with SOLAR_JAVA not set, since it depends on compile-time and
run-time java support.
- xsltvalidate-handle-no-solar-java.diff [JT]: Disable java
components with SOLAR_JAVA not set.
- xsltfilter-handle-no-solar-java.diff [JT]: Disable java
components with SOLAR_JAVA not set.
- desktop-handle-no-solar-java.diff [JT]: Don't build javaldx
with SOLAR_JAVA not set, and check for javaldx in soffice.sh
before using it.
* debian/MANIFEST.{i386,powerpc,s390}:
- remove java files [JT]
* debian/openoffice.org.install:
- remove java files [JT]
* debian/openoffice.org-bin.install:
- remove java files [JT]
* debian/README:
- update documentation to reflect that OpenOffice.org no longer requires
a JDK to build, but can optionally be built with one. [JT]
* debian/rules:
- conditionalize java support based on finding jdkhome in
DEB_BUILD_OPTIONS [JT]:
- Add appropriate configure flag (--disable-java or
--with-jdk-home=$(JDK_HOME)) to CONFIGURE_FLAGS [JT]
- set and export IGNORE_MANIFEST_CHANGES when building with a JDK [JT]
- prefix BUILDCMD with classpath when building with a JDK [JT]
- check for a valid JDK and the necessary java jars when building with
a JDK [JT]
- remove --with-jdk-home=$(JDK_HOME) from configure invocation in favor
of CONFIGURE_FLAGS [JT]
- move installation of files only built with a JDK into debian/rules
surrounded by a conditional [JT]
* debian/scripts/detect_java.sh:
- removed [JT]
* debian/setperms:
- remove chmod of scripts/detect_java.sh [JT]
* debian/control*:
- Remove Build-Depends for j2sdk1.3 and lib*-java [JT]
- Build-Depend on xsltproc [JT]
- Move from contrib to main [JT]
Index: openoffice.org.install
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org.install,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- openoffice.org.install 5 Oct 2003 20:57:08 -0000 1.29
+++ openoffice.org.install 8 Oct 2003 14:20:19 -0000 1.30
@@ -5,27 +5,8 @@
usr/lib/openoffice/THIRDPARTYLICENSEREADME.html
usr/lib/openoffice/help/main_transform.xsl
usr/lib/openoffice/program/bootstraprc
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/configmgrrc
usr/lib/openoffice/program/fromtemplate
-usr/lib/openoffice/program/jvmsetup
usr/lib/openoffice/program/libcppu.so
usr/lib/openoffice/program/libcppu.so.3
usr/lib/openoffice/program/libcppuhelper3gcc3.so
@@ -39,8 +20,6 @@
usr/lib/openoffice/program/libicule.so.22
usr/lib/openoffice/program/libicuuc.so
usr/lib/openoffice/program/libicuuc.so.22
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
usr/lib/openoffice/program/libreg.so
usr/lib/openoffice/program/libreg.so.3
usr/lib/openoffice/program/librmcxt.so
@@ -175,7 +154,6 @@
usr/lib/openoffice/share/basic/WebWizard/WebWzrd.xdl
usr/lib/openoffice/share/basic/WebWizard/dialog.xlb
usr/lib/openoffice/share/basic/WebWizard/script.xlb
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/*.bmp
Index: MANIFEST.sparc
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.sparc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MANIFEST.sparc 6 Oct 2003 16:49:17 -0000 1.3
+++ MANIFEST.sparc 8 Oct 2003 14:20:19 -0000 1.4
@@ -109,24 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/configmgrrc
usr/lib/openoffice/program/connector.uno.so
usr/lib/openoffice/program/corereflection.uno.so
@@ -165,11 +147,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645ls.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645ls.so
@@ -193,7 +170,6 @@
usr/lib/openoffice/program/libdate645ls.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645ls.so
usr/lib/openoffice/program/libdbase645ls.so
usr/lib/openoffice/program/libdbi645ls.so
@@ -237,15 +213,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645ls_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645ls.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/liblng645ls.so
usr/lib/openoffice/program/liblocaledata_en.so
usr/lib/openoffice/program/liblocaledata_es.so
@@ -334,8 +301,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645ls.so
usr/lib/openoffice/program/libxcr645ls.so
-usr/lib/openoffice/program/libxmlfa645ls.so
-usr/lib/openoffice/program/libxmlfd645ls.so
usr/lib/openoffice/program/libxmx645ls.so
usr/lib/openoffice/program/libxo645ls.so
usr/lib/openoffice/program/libxsltdlg645ls.so
@@ -392,7 +357,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
Index: README
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- README 29 Sep 2003 22:47:11 -0000 1.25
+++ README 8 Oct 2003 14:20:19 -0000 1.26
@@ -7,7 +7,6 @@
=================================
Overview:
apt-get source openoffice.org
- [install a jdk if needed]
[install moz zips if building for powerpc, s390 or sparc]
apt-get build-dep openoffice.org (to install build dependencies)
cd openoffice.org-1.0.99+1.1rc
@@ -53,21 +52,15 @@
jdkhome=/absolute/path/to/jdk - use the JDK installed in this path.
-Installing a JDK
-----------------
-OpenOffice.org still needs a non-free JDK. You can find a suitable JDK here:
-
--i386, powerpc and sparc-
- deb http://ftp.gwdg.de/pub/languages/java/linux/debian unstable main non-free
-
--s390-
- https://www6.software.ibm.com/dl/lxdk/lxdk-p (unpack tarball under /usr/local)
-
-If you a building on a machine without a JDK and have no root access to install
-one, you can install the JDK to your home directory and specify the path using
-DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk
+JDK Support
+-----------
-Hint: use dpkg-buildpackage -d to skip the build dependencies check.
+The official Debian packages of OpenOffice.org are built without a JDK. This
+disables support for some features which require a JDK at runtime. In order
+to enable these features, a JDK must be present at build time. To build the
+packages from source using a JDK, add jdkhome=/absolute/path/to/jdk to
+DEB_BUILD_OPTIONS. You will also need libcrimson-java, libxalan-java, and
+libxalan2-java, in addition to the standard build dependencies.
We are working on adding support for other JDKs to OOo. See this issue for
progress:
http://www.openoffice.org/issues/show_bug.cgi?id=10477
Index: MANIFEST.powerpc
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.powerpc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- MANIFEST.powerpc 7 Oct 2003 09:51:09 -0000 1.25
+++ MANIFEST.powerpc 8 Oct 2003 14:20:19 -0000 1.26
@@ -109,24 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/configmgrrc
usr/lib/openoffice/program/connector.uno.so
usr/lib/openoffice/program/corereflection.uno.so
@@ -165,11 +147,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645lp.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645lp.so
@@ -193,7 +170,6 @@
usr/lib/openoffice/program/libdate645lp.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645lp.so
usr/lib/openoffice/program/libdbase645lp.so
usr/lib/openoffice/program/libdbi645lp.so
@@ -237,15 +213,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645lp_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645lp.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/liblng645lp.so
usr/lib/openoffice/program/liblocaledata_en.so
usr/lib/openoffice/program/liblocaledata_es.so
@@ -334,8 +301,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645lp.so
usr/lib/openoffice/program/libxcr645lp.so
-usr/lib/openoffice/program/libxmlfa645lp.so
-usr/lib/openoffice/program/libxmlfd645lp.so
usr/lib/openoffice/program/libxmx645lp.so
usr/lib/openoffice/program/libxo645lp.so
usr/lib/openoffice/program/libxsltdlg645lp.so
@@ -1136,7 +1101,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
@@ -2706,7 +2670,6 @@
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/vnd.sun.xml.writer.global.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.fp
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/lc05300.bmp
Index: openoffice.org-bin.install
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org-bin.install,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- openoffice.org-bin.install 7 Oct 2003 17:10:33 -0000 1.15
+++ openoffice.org-bin.install 8 Oct 2003 14:20:19 -0000 1.16
@@ -32,10 +32,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645l[ips3].so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645l[ips3].so
@@ -54,7 +50,6 @@
usr/lib/openoffice/program/libdate645l[ips3].so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645l[ips3].so
usr/lib/openoffice/program/libdbase645l[ips3].so
usr/lib/openoffice/program/libdbi645l[ips3].so
@@ -89,13 +84,6 @@
usr/lib/openoffice/program/libicule.so.22.0
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645l[ips3]_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645l[ips3].so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/liblng645l[ips3].so
usr/lib/openoffice/program/liblocaledata_en.so
usr/lib/openoffice/program/liblocaledata_es.so
@@ -168,8 +156,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645l[ips3].so
usr/lib/openoffice/program/libxcr645l[ips3].so
-usr/lib/openoffice/program/libxmlfa645l[ips3].so
-usr/lib/openoffice/program/libxmlfd645l[ips3].so
usr/lib/openoffice/program/libxmx645l[ips3].so
usr/lib/openoffice/program/libxo645l[ips3].so
usr/lib/openoffice/program/libxsltdlg645l[ips3].so
Index: MANIFEST.i386
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.i386,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- MANIFEST.i386 6 Oct 2003 16:49:17 -0000 1.22
+++ MANIFEST.i386 8 Oct 2003 14:20:19 -0000 1.23
@@ -109,24 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/component.reg
usr/lib/openoffice/program/components/libaddrbook.so
usr/lib/openoffice/program/components/libmork.so
@@ -206,11 +188,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645li.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645li.so
@@ -234,7 +211,6 @@
usr/lib/openoffice/program/libdate645li.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645li.so
usr/lib/openoffice/program/libdbase645li.so
usr/lib/openoffice/program/libdbi645li.so
@@ -278,15 +254,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645li_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645li.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/libldap50.so
usr/lib/openoffice/program/liblng645li.so
usr/lib/openoffice/program/liblocaledata_en.so
@@ -385,8 +352,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645li.so
usr/lib/openoffice/program/libxcr645li.so
-usr/lib/openoffice/program/libxmlfa645li.so
-usr/lib/openoffice/program/libxmlfd645li.so
usr/lib/openoffice/program/libxmx645li.so
usr/lib/openoffice/program/libxo645li.so
usr/lib/openoffice/program/libxpcom.so
@@ -444,7 +409,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
@@ -2014,7 +1978,6 @@
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/vnd.sun.xml.writer.global.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.fp
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/lc05300.bmp
Index: MANIFEST.s390
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.s390,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- MANIFEST.s390 6 Oct 2003 16:49:17 -0000 1.13
+++ MANIFEST.s390 8 Oct 2003 14:20:19 -0000 1.14
@@ -109,24 +109,6 @@
usr/lib/openoffice/program/acceptor.uno.so
usr/lib/openoffice/program/bootstraprc
usr/lib/openoffice/program/bridgefac.uno.so
-usr/lib/openoffice/program/classes/XFlatXml.jar
-usr/lib/openoffice/program/classes/XMergeBridge.jar
-usr/lib/openoffice/program/classes/XSLTFilter.jar
-usr/lib/openoffice/program/classes/XSLTValidate.jar
-usr/lib/openoffice/program/classes/classes.jar
-usr/lib/openoffice/program/classes/common.jar
-usr/lib/openoffice/program/classes/docbook.jar
-usr/lib/openoffice/program/classes/htmlsoff.jar
-usr/lib/openoffice/program/classes/java_uno.jar
-usr/lib/openoffice/program/classes/juh.jar
-usr/lib/openoffice/program/classes/jurt.jar
-usr/lib/openoffice/program/classes/jut.jar
-usr/lib/openoffice/program/classes/report.jar
-usr/lib/openoffice/program/classes/ridl.jar
-usr/lib/openoffice/program/classes/sandbox.jar
-usr/lib/openoffice/program/classes/unoil.jar
-usr/lib/openoffice/program/classes/xmerge.jar
-usr/lib/openoffice/program/classes/xt.jar
usr/lib/openoffice/program/component.reg
usr/lib/openoffice/program/components/libaddrbook.so
usr/lib/openoffice/program/components/libmork.so
@@ -206,11 +188,6 @@
usr/lib/openoffice/program/introspection.uno.so
usr/lib/openoffice/program/invocadapt.uno.so
usr/lib/openoffice/program/invocation.uno.so
-usr/lib/openoffice/program/javaldx
-usr/lib/openoffice/program/javaloader.uno.so
-usr/lib/openoffice/program/javavm.uno.so
-usr/lib/openoffice/program/jvmsetup
-usr/lib/openoffice/program/jvmsetup.bin
usr/lib/openoffice/program/libabp645l3.so
usr/lib/openoffice/program/libadabas2.so
usr/lib/openoffice/program/libanalysis645l3.so
@@ -234,7 +211,6 @@
usr/lib/openoffice/program/libdate645l3.so
usr/lib/openoffice/program/libdb-3.2.so
usr/lib/openoffice/program/libdb_cxx-3.2.so
-usr/lib/openoffice/program/libdb_java-3.2.so
usr/lib/openoffice/program/libdba645l3.so
usr/lib/openoffice/program/libdbase645l3.so
usr/lib/openoffice/program/libdbi645l3.so
@@ -278,15 +254,6 @@
usr/lib/openoffice/program/libicuuc.so.22
usr/lib/openoffice/program/libicuuc.so.22.0
usr/lib/openoffice/program/libj645l3_g.so
-usr/lib/openoffice/program/libjava_uno.so
-usr/lib/openoffice/program/libjdbc2.so
-usr/lib/openoffice/program/libjpipe.so
-usr/lib/openoffice/program/libjuh.so
-usr/lib/openoffice/program/libjuhx.so
-usr/lib/openoffice/program/libjvm645l3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3
-usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.0
usr/lib/openoffice/program/libldap50.so
usr/lib/openoffice/program/liblng645l3.so
usr/lib/openoffice/program/liblocaledata_en.so
@@ -385,8 +352,6 @@
usr/lib/openoffice/program/libvos3gcc3.so
usr/lib/openoffice/program/libwrp645l3.so
usr/lib/openoffice/program/libxcr645l3.so
-usr/lib/openoffice/program/libxmlfa645l3.so
-usr/lib/openoffice/program/libxmlfd645l3.so
usr/lib/openoffice/program/libxmx645l3.so
usr/lib/openoffice/program/libxo645l3.so
usr/lib/openoffice/program/libxpcom.so
@@ -444,7 +409,6 @@
usr/lib/openoffice/program/resource/gal64501.res
usr/lib/openoffice/program/resource/imp64501.res
usr/lib/openoffice/program/resource/iso64501.res
-usr/lib/openoffice/program/resource/jvm64501.res
usr/lib/openoffice/program/resource/lgd64501.res
usr/lib/openoffice/program/resource/ofa64501.res
usr/lib/openoffice/program/resource/ooo64501.res
@@ -2014,7 +1978,6 @@
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/vnd.sun.xml.writer.global.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.dt
usr/lib/openoffice/share/cde/types/zh_TW.UTF-8/writer.fp
-usr/lib/openoffice/share/config/javarc
usr/lib/openoffice/share/config/psetup.xpm
usr/lib/openoffice/share/config/psetupl.xpm
usr/lib/openoffice/share/config/symbol/lc05300.bmp
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- control.in 8 Oct 2003 11:36:19 -0000 1.93
+++ control.in 8 Oct 2003 14:20:19 -0000 1.94
@@ -1,9 +1,9 @@
Source: openoffice.org
-Section: contrib/editors
+Section: editors
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), j2sdk1.3 [!s390], sharutils, libcrimson-java,
libxalan-java, libxalan2-java, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13),
imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc],
libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl, xvfb, xbase-clients,
xfonts-base, zlib1g-dev
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), sharutils, libgtk2.0-dev, pkg-config,
libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>=
2.3.13), xsltproc, imagemagick, xutils, libfontconfig1-dev, binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl,
xvfb, xbase-clients, xfonts-base, zlib1g-dev
Standards-Version: 3.5.6
Package: openoffice.org
@@ -71,7 +71,7 @@
KDE and KOffice.
Package: openoffice.org-crashrep
-Section: contrib/utils
+Section: utils
Architecture: i386 powerpc s390 sparc
Recommends: openoffice.org
Enhances: openoffice.org
@@ -84,7 +84,7 @@
Package: openoffice.org-gnome
Architecture: i386 powerpc s390 sparc
-Section: contrib/gnome
+Section: gnome
Depends: openoffice.org (>> 1.0.99+1.1rc), ${shlibs:Depends}
Suggests: gnome
Description: GNOME desktop integration for OpenOffice.org
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- rules 8 Oct 2003 11:25:30 -0000 1.135
+++ rules 8 Oct 2003 14:20:19 -0000 1.136
@@ -42,11 +42,19 @@
# Read in architecture-specific variables of importance.
include debian/scripts/vars.$(ARCH)
-# include variable -- where is Java? ;)
+CONFIGURE_FLAGS=
+
+# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
+# JDK at /absolute/path/to/jdk.
ifneq (jdkhome=,$(findstring jdkhome=,$(DEB_BUILD_OPTIONS)))
- JDK_HOME := $(shell /bin/sh debian/scripts/detect_java.sh)
+ USE_JAVA=n
+ CONFIGURE_FLAGS+= --disable-java
else
+ USE_JAVA=y
JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*jdkhome=\([^,]*\),.*/\1/p')
+ CONFIGURE_FLAGS+= --with-jdk-home=$(JDK_HOME)
+ IGNORE_MANIFEST_CHANGES=1
+ export IGNORE_MANIFEST_CHANGES
endif
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
@@ -65,8 +73,6 @@
# Package install directory
MAINPKGDIR:=$(CURDIR)/debian/openoffice.org$(VER)
-CONFIGURE_FLAGS=
-
# automatic configuration for woody backports
# check that default compiler is not gcc 2.x (as it is on Woody)
ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
@@ -213,7 +219,9 @@
# Add parallel build flags and always hard link into the solver
#command to use to build OOo
-BUILDCMD:=XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
+ifeq "$(USE_JAVA)" "y"
+BUILDCMD+=
XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
+endif
BUILDCMD+= $(ARCH_PREFIX) $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
@@ -488,10 +496,19 @@
dh_testdir
$(MAKE) -f debian/rules environment
- # Make sure we have a valid JDK. If this test fails, please install
the JDK
- # package (j2sdk1.3), or add the path to debian/scripts/detect_java.sh,
- # or specify a JDK location with
DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk
+ifeq "$(USE_JAVA)" "y"
+ # If building with a JDK, make sure we have a valid JDK and all the
+ # necessary java packages. If this test fails, please ensure that a
+ # valid JDK is provided in the path specified with
+ # DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk, and that the
+ # libcrimson-java, libxalan-java, and libxalan2-java packages are
+ # installed.
test -x /$(JDK_HOME)/bin/javac
+ test -r /usr/share/java/crimson.jar
+ test -r /usr/share/java/xalan.jar
+ test -r /usr/share/java/xml-apis.jar
+ test -r /usr/share/java/xalan2.jar
+endif
# test for libhpi.so and warn ppc folks....
ifeq "$(ARCH)" "powerpc"
@@ -518,7 +535,6 @@
cd $(SOURCE_TREE)/config_office && autoconf && \
CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
--with-lang=ALL \
- --with-jdk-home=$(JDK_HOME) \
--enable-libart \
--disable-rpath \
--enable-crashdump \
@@ -726,6 +742,23 @@
done
endif
+# If building with a JDK, install the additional files
+ifeq "$(USE_JAVA)" "y"
+ifeq "$(LIBSUFFIX)" ""
+ echo 'LIBSUFFIX unknown for $(ARCH).' >&2
+ echo 'Please set it in debian/scripts/vars.$(ARCH).' >&2
+ exit 1
+endif
+ for i in javaldx javaloader.uno.so javavm.uno.so jvmsetup.bin \
+ libdb_java-3.2.so libjava_uno.so libjdbc2.so libjpipe.so \
+ libjuh.so libjuhx.so libjvm645$(LIBSUFFIX).so \
+ libjvmaccessgcc3.so.3.1.0 libofficebean.so \
+ libxmlfa645$(LIBSUFFIX).so libxmlfd645$(LIBSUFFIX).so; do \
+ cp -rf $(PKGOPENOFFICEDIR)/program/$$i \
+ $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program; \
+ done
+endif
+
ifneq "$(USE_SYSTEM_LIBS)" "y"
# Copy libstlport if we are using the internal library
cp -f $(PKGOPENOFFICEDIR)/program/libstlport_gcc.so \
@@ -799,6 +832,26 @@
ifneq "$(MOZILLA)" "n"
cp -rf $(PKGOPENOFFICEDIR)/program/defaults \
$(MAINPKGDIR)/$(OPENOFFICEDIR)/program
+endif
+
+# If building with a JDK, install the additional files
+ifeq "$(USE_JAVA)" "y"
+ for i in jvmsetup libjvmaccessgcc3.so libjvmaccess3.so.3; do \
+ cp -rf $(PKGOPENOFFICEDIR)/program/$$i \
+ $(MAINPKGDIR)/$(OPENOFFICEDIR)/program; \
+ done
+ mkdir -p $(MAINPKGDIR)/$(OPENOFFICEDIR)/program/classes
+ for i in XFlatXml.jar XMergeBridge.jar XSLTFilter.jar \
+ XSLTValidate.jar classes.jar common.jar docbook.jar \
+ htmlsoff.jar java_uno.jar juh.jar jurt.jar jut.jar \
+ officebean.jar report.jar ridl.jar sandbox.jar unoil.jar \
+ xmerge.jar xt.jar ; do \
+ cp -rf $(PKGOPENOFFICEDIR)/program/classes/$$i \
+ $(MAINPKGDIR)/$(OPENOFFICEDIR)/program/classes; \
+ done
+ mkdir -p $(MAINPKGDIR)/$(OPENOFFICEDIR)/share/config
+ cp -rf $(PKGOPENOFFICEDIR)/share/config/javarc \
+ $(MAINPKGDIR)/$(OPENOFFICEDIR)/share/config
endif
# there are some wrong permissions; fix them ourselves
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- changelog 8 Oct 2003 11:36:19 -0000 1.203
+++ changelog 8 Oct 2003 14:20:19 -0000 1.204
@@ -4,17 +4,88 @@
* new patches (taken from Mandrake) [RE]
- system-zlib: use system zlib
- system-getopt: use the getopt from system's glibc...
+ * Build without a JDK. (closes: #211288) [JT]
+ * Added patches:
+ - allow-no-jdk.diff [JT]: If java is disabled with --disable-java,
+ don't look for a JDK, but do look for xsltproc, and set XSLTPROC
+ in set_soenv.
+ - solenv-set-solar-java-only-if-unset.diff [JT]: Set the
+ SOLAR_JAVA variable conditionally with "*=".
+ - readlicense-oo-xsltproc.diff [JT]: Use xsltproc to replace
+ java for xml transforms in readlicense_oo.
+ - officecfg-xsltproc.diff [JT]: Use xsltproc to replace java
+ for xml transforms in officecfg.
+ - berkeleydb-handle-no-solar-java.diff [JT]: If SOLAR_JAVA is
+ not set, don't pass --enable-java to the configure script, and
+ don't expect the jar when finished.
+ - ridljar-handle-no-solar-java.diff [JT]: If SOLAR_JAVA is not
+ set, don't attempt to zip up the compiled java files, since they
+ will not be built.
+ - jurt-handle-no-solar-java.diff [JT]: Don't build jpipe with
+ SOLAR_JAVA not set.
+ - jvmaccess-handle-no-solar-java.diff [JT]: Don't build jvmaccess
+ with SOLAR_JAVA not set.
+ - jni-uno-handle-no-solar-java.diff [JT]: Don't build jni_uno
+ with SOLAR_JAVA not set.
+ - javaunohelper-handle-no-solar-java.diff [JT]: Don't build
+ javaunohelper with SOLAR_JAVA not set
+ - psprint-handle-no-solar-java.diff [JT]: Don't use jvmaccess
+ to get JDK font path with SOLAR_JAVA not set.
+ - sj2-handle-no-solar-java.diff [JT]: When SOLAR_JAVA is not set,
+ replace java applet support with stubs that throw an exception.
+ - setup2-handle-no-solar-java.diff [JT]: Don't build jvmsetup
+ or use jvmaccess for java-related setup with SOLAR_JAVA not set.
+ - scp-handle-no-solar-java.diff [JT]: Don't ship various
+ java-related files that will no longer be built, but ship the
+ stubbed out libj from sj2 because setup fails without it.
+ - svg-handle-no-solar-java.diff [JT]: Disable SVG import support
+ with SOLAR_JAVA not set, since it depends on compile-time and
+ run-time java support.
+ - xsltvalidate-handle-no-solar-java.diff [JT]: Disable java
+ components with SOLAR_JAVA not set.
+ - xsltfilter-handle-no-solar-java.diff [JT]: Disable java
+ components with SOLAR_JAVA not set.
+ - desktop-handle-no-solar-java.diff [JT]: Don't build javaldx
+ with SOLAR_JAVA not set, and check for javaldx in soffice.sh
+ before using it.
* debian/control.in:
- add zlib1g-dev to Build-Depends: [RE]
+ * debian/MANIFEST.{i386,powerpc,s390}:
+ - remove java files [JT]
+ * debian/openoffice.org.install:
+ - remove java files [JT]
* debian/openoffice.org-bin.install:
- Add wildcard suffix for Sparc libraries [CH]
+ - remove java files [JT]
+ * debian/README:
+ - update documentation to reflect that OpenOffice.org no longer requires
+ a JDK to build, but can optionally be built with one. [JT]
* debian/rules:
- Fix Gnome desktop Exec= line, thanks to MK for spotting the problem
(closes: #214673) [CH]
+ - conditionalize java support based on finding jdkhome in
+ DEB_BUILD_OPTIONS [JT]:
+ - Add appropriate configure flag (--disable-java or
+ --with-jdk-home=$(JDK_HOME)) to CONFIGURE_FLAGS [JT]
+ - set and export IGNORE_MANIFEST_CHANGES when building with a JDK [JT]
+ - prefix BUILDCMD with classpath when building with a JDK [JT]
+ - check for a valid JDK and the necessary java jars when building with
+ a JDK [JT]
+ - remove --with-jdk-home=$(JDK_HOME) from configure invocation in favor
+ of CONFIGURE_FLAGS [JT]
+ - move installation of files only built with a JDK into debian/rules
+ surrounded by a conditional [JT]
+ * debian/scripts/detect_java.sh:
+ - removed [JT]
+ * debian/setperms:
+ - remove chmod of scripts/detect_java.sh [JT]
* debian/control*:
- Bump virtual l10n package to 1.1.0.final; openoffice.org conflicts
with l10n-1.1.0 to force versions without the Ximian icons off the
system. (closes: #214703: all icons have magenta background) [CH]
+ - Remove Build-Depends for j2sdk1.3 and lib*-java [JT]
+ - Build-Depend on xsltproc [JT]
+ - Move from contrib to main [JT]
-- Chris Halls <[EMAIL PROTECTED]> Wed, 8 Oct 2003 13:32:49 +0200
Index: setperms
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/setperms,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setperms 29 Sep 2003 22:47:11 -0000 1.4
+++ setperms 8 Oct 2003 14:20:19 -0000 1.5
@@ -12,7 +12,6 @@
scripts/source.patch \
scripts/source.unpack \
scripts/unfix.source.patch \
- scripts/detect_java.sh \
scripts/vars* \
scripts/installoverrides \
scripts/xcftobmp \
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- control 8 Oct 2003 11:36:19 -0000 1.125
+++ control 8 Oct 2003 14:20:19 -0000 1.126
@@ -1,9 +1,9 @@
Source: openoffice.org
-Section: contrib/editors
+Section: editors
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), j2sdk1.3 [!s390], sharutils, libcrimson-java,
libxalan-java, libxalan2-java, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13),
imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc],
libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl, xvfb, xbase-clients,
xfonts-base, zlib1g-dev
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf (>= 2.54), sharutils, libgtk2.0-dev, pkg-config,
libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>=
2.3.13), xsltproc, imagemagick, xutils, libfontconfig1-dev, binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl,
xvfb, xbase-clients, xfonts-base, zlib1g-dev
Standards-Version: 3.5.6
Package: openoffice.org
@@ -71,7 +71,7 @@
KDE and KOffice.
Package: openoffice.org-crashrep
-Section: contrib/utils
+Section: utils
Architecture: i386 powerpc s390 sparc
Recommends: openoffice.org
Enhances: openoffice.org
@@ -84,7 +84,7 @@
Package: openoffice.org-gnome
Architecture: i386 powerpc s390 sparc
-Section: contrib/gnome
+Section: gnome
Depends: openoffice.org (>> 1.0.99+1.1rc), ${shlibs:Depends}
Suggests: gnome
Description: GNOME desktop integration for OpenOffice.org
