Update of /cvs/debian-openoffice/oo-deb/debian/scripts
In directory gluck:/tmp/cvs-serv2324/scripts
Modified Files:
vars.i386 vars.powerpc vars.s390 vars.sparc
Removed Files:
detect_java.sh
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: vars.i386
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/vars.i386,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- vars.i386 30 Jan 2003 16:13:11 -0000 1.13
+++ vars.i386 8 Oct 2003 14:20:20 -0000 1.14
@@ -4,3 +4,4 @@
# debian/scripts (Bourne shell).
ENVFILE = LinuxIntelEnv.Set.sh
ARCHBUILDDIR=unxlngi4.pro
+LIBSUFFIX=li
Index: vars.s390
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/vars.s390,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vars.s390 1 Oct 2003 12:22:52 -0000 1.4
+++ vars.s390 8 Oct 2003 14:20:20 -0000 1.5
@@ -5,5 +5,6 @@
ENVFILE = LinuxS390Env.Set.sh
ARCHBUILDDIR=unxlngs390.pro
+LIBSUFFIX=l3
MOZILLA=n
Index: vars.sparc
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/vars.sparc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vars.sparc 1 Oct 2003 11:40:46 -0000 1.4
+++ vars.sparc 8 Oct 2003 14:20:20 -0000 1.5
@@ -4,6 +4,7 @@
# debian/scripts (Bourne shell).
ENVFILE = LinuxSparcEnv.Set.sh
ARCHBUILDDIR=unxlngs.pro
+LIBSUFFIX=ls
# Don't include hacked mozilla libs
MOZILLA=n
Index: vars.powerpc
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/vars.powerpc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- vars.powerpc 30 Sep 2003 13:04:13 -0000 1.15
+++ vars.powerpc 8 Oct 2003 14:20:20 -0000 1.16
@@ -4,6 +4,7 @@
# debian/scripts (Bourne shell).
ENVFILE = LinuxPPCEnv.Set.sh
ARCHBUILDDIR=unxlngppc.pro
+LIBSUFFIX=lp
#depends
#DEPS="libstdc++4, libc6 (>=2.2.5-12.1), libstlport4.5gcc3.1 (>=4.5.3-5cjh2)"
--- detect_java.sh DELETED ---
