[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.1/experimental r1420: prepare for m4 (reenable SRB, system-jfreereport); merge



------------------------------------------------------------
revno: 1420
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-03-03 02:36:52 +0100
message:
  prepare for m4 (reenable SRB, system-jfreereport); merge
modified:
  changelog
  control
  rules
  shell-lib.sh
    ------------------------------------------------------------
    revno: 1332.1.84
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Sat 2009-02-28 12:22:52 +0100
    message:
      base-files got "fixed" - unti~ the next release...
    modified:
      changelog
      control
      rules
    ------------------------------------------------------------
    revno: 1332.1.85
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Mon 2009-03-02 20:05:45 +0100
    message:
      -4
    modified:
      changelog
    ------------------------------------------------------------
    revno: 1332.1.86
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Tue 2009-03-03 02:25:42 +0100
    message:
      $ORIGIN -> $OOO_BASE_DIR
    modified:
      changelog
      control
      shell-lib.sh
=== modified file 'changelog'
--- a/changelog	2009-02-28 11:39:23 +0000
+++ b/changelog	2009-03-03 01:36:52 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.1.0~ooo310m2-0.1pre) experimental; urgency=low
+openoffice.org (1:3.1.0~ooo310m4-0.1pre) experimental; urgency=low
 
-  * OpenOffice.org 3.1.0 development snapshot OOO310_m2
+  * OpenOffice.org 3.1.0 development snapshot OOO310_m4
     - build without -march=armv5te for arm (closes: #501957)
     - lbnames.h supports gcc 4.4 (closes: #505669)
     - now has overline supports for word (closes: #228392)
@@ -41,6 +41,7 @@
       en-US only build even more
     - OGLTrans seems to work now in sid (even for amd64), so reenable
       (closes: #517335)
+    - update pentaho libs (build-)depends to the -OOo31 versions
   * debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
     OOo now has one upstream
   * debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
@@ -48,16 +49,27 @@
   * debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
     fixed
 
- -- Rene Engelhard <rene@debian.org>  Sat, 28 Feb 2009 12:28:53 +0100
-
-openoffice.org (1:3.0.1-3.4pre) unstable; urgency=low
-
+ -- Rene Engelhard <rene@debian.org>  Mon, 02 Mar 2009 00:46:44 +0100
+
+openoffice.org (1:3.0.1-4.5pre) unstable; urgency=low
+
+  * debian/shell-lib.sh:
+    - $ORIGIN -> $OOO_BASE_DIR
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 03 Mar 2009 02:09:05 +0100
+
+openoffice.org (1:3.0.1-4) unstable; urgency=low
+
+  * ooo-build:
+    - update (r15428)
   * debian/rules
-    - MONO2=y
+    - MONO2=y (closes: #517738)
+    - reenable lsb_release -cs call and build-conflict against base-files = 5
+      for sid
   * debian/control.in:
     - make -core conflict against < OOo3 -java-common (closes: #517001)
 
- -- Rene Engelhard <rene@debian.org>  Wed, 25 Feb 2009 20:55:46 +0100
+ -- Rene Engelhard <rene@debian.org>  Sat, 28 Feb 2009 15:02:26 +0100
 
 openoffice.org (1:3.0.1-3) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2009-02-28 11:42:45 +0000
+++ b/control	2009-03-03 01:36:52 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], base-files (= 5)
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
@@ -3249,6 +3249,37 @@
  articles with OpenOffice.org
 Homepage: http://extensions.services.openoffice.org/project/wikipublisher
 
+Package: openoffice.org-report-builder
+Section: misc
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}
+Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin (>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Replaces: openoffice.org-reportdesigner
+Provides: openoffice.org-reportdesigner
+Enhances: openoffice.org-base
+Description: OpenOffice.org Report Builder extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the report builder extension:
+  "Create with the Sun Report Builder stylish, smart-looking database reports.
+  The flexible report editor can define group and page headers as well as
+  group and page footers and even calculation fields are available to
+  accomplish complex database reports."
+Homepage: http://extensions.services.openoffice.org/project/reportdesign
+
+Package: openoffice.org-report-builder-bin
+Section: misc
+Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-base (>= 2.3.0~src680m225)
+Replaces: openoffice.org-report-builder
+Description: OpenOffice.org Report Builder extension - support libraries
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains some architecture-dependent support libraries
+ (librpt*.so) for the report builder extension.
+
 Package: openoffice.org-presentation-minimizer
 Section: misc
 Priority: optional

=== modified file 'rules'
--- a/rules	2009-02-28 11:39:23 +0000
+++ b/rules	2009-03-03 01:36:52 +0000
@@ -32,9 +32,7 @@
 OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DIST := $(shell lsb_release -is)
-# hack: lsb_release in sid right now gives "lenny" due to broken base-files
-# upload policy
-DISTREL := sid
+DISTREL := $(shell lsb_release -cs)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 SHELL:=/bin/bash
@@ -190,7 +188,7 @@
 NEW_DPKG_SHLIBDEPS=y
 ifeq "$(ENABLE_JAVA)" "y"
   # can be reenabled after cws rptfix04
-  ENABLE_REPORTDESIGN=n
+  ENABLE_REPORTDESIGN=y
   USE_SYSTEM_JFREEREPORT=y
   ENABLE_MEDIAWIKI=y
   USE_SYSTEM_APACHE_COMMONS=y
@@ -649,10 +647,10 @@
   ifeq "$(ENABLE_REPORTDESIGN)" "y"
 	# report-builder
     ifeq "$(USE_SYSTEM_JFREEREPORT)" "y"
-	REPORT_BUILDER_BUILD_DEPS += , libjcommon-java (>= 1.0.10) [$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)], libxml-java [$(OOO_JAVA_ARCHS)], libflute-1.3-jfree-java [$(OOO_JAVA_ARCHS)], libpentaho-reporting-flow-engine-java [$(OOO_JAVA_ARCHS)], liblayout-java [$(OOO_JAVA_ARCHS)], libloader-java [$(OOO_JAVA_ARCHS)], libformula-java [$(OOO_JAVA_ARCHS)], librepository-java [$(OOO_JAVA_ARCHS)], libfonts-java (>= 0.2.6) [$(OOO_JAVA_ARCHS)], libjcommon-serializer-java [$(OOO_JAVA_ARCHS)]
+	REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org [$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)], libxml-java-openoffice.org [$(OOO_JAVA_ARCHS)], libflute-java-openoffice.org [$(OOO_JAVA_ARCHS)], libpentaho-reporting-flow-engine-java-openoffice.org [$(OOO_JAVA_ARCHS)], liblayout-java-openoffice.org [$(OOO_JAVA_ARCHS)], libloader-java-openoffice.org [$(OOO_JAVA_ARCHS)], libformula-java-openoffice.org [$(OOO_JAVA_ARCHS)], librepository-java-openoffice.org [$(OOO_JAVA_ARCHS)], libfonts-java-openoffice.org [$(OOO_JAVA_ARCHS)], libserializer-java-openoffice.org [$(OOO_JAVA_ARCHS)]
 	REPORT_BUILDER_JAR_DEPENDS := $(REPORT_BUILDER_BUILD_DEPS)
 	BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
-	CONFIGURE_FLAGS += --with-system-jfreereport --with-jcommon-jar=/usr/share/java/jcommon.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute-1.3-jfree.jar --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-jcommon-serializer-jar=/usr/share/java/jcommon-serializer.jar
+	CONFIGURE_FLAGS += --with-system-jfreereport --with-libbase-jar=/usr/share/java/openoffice/libbase.jar --with-libxml-jar=/usr/share/java/openoffice/libxml.jar --with-flute-jar=/usr/share/java/openoffice/flute.jar --with-jfreereport-jar=/usr/share/java/openoffice/flow-engine.jar --with-liblayout-jar=/usr/share/java/openoffice/liblayout.jar --with-libloader-jar=/usr/share/java/openoffice/libloader.jar --with-libformula-jar=/usr/share/java/openoffice/libformula.jar --with-librepository-jar=/usr/share/java/openoffice/librepository.jar --with-libfonts-jar=/usr/share/java/openoffice/libfonts.jar --with-libserializer-jar=/usr/share/java/openoffice/libserializer.jar
 	CONFIGURE_FLAGS += --enable-report-builder
     endif
   endif
@@ -1394,6 +1392,10 @@
 	perl -pi -e 's/GNOME GIO/GIO/' debian/control
 endif
 
+ifneq "$(LENNY_BACKPORT)" "y"	
+	perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 5)/" debian/control
+endif
+
 	python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
 	mv debian/control.tmp debian/control
 

=== modified file 'shell-lib.sh'
--- a/shell-lib.sh	2009-01-15 06:42:02 +0000
+++ b/shell-lib.sh	2009-03-03 01:25:42 +0000
@@ -62,7 +62,7 @@
     INSTDIR=`mktemp -d`
     /usr/lib/openoffice/program/unopkg remove --shared $1 \
       "-env:UserInstallation=file://$INSTDIR" \
-      '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/share/config/javasettingsunopkginstall.xml' \
+      '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
       "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
     if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
     echo " done."
@@ -75,7 +75,7 @@
   INSTDIR=`mktemp -d`
   /usr/lib/openoffice/program/unopkg add --shared $1 \
     "-env:UserInstallation=file:///$INSTDIR" \
-    '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/share/config/javasettingsunopkginstall.xml' \
+    '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
     "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
   if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
   echo " done."


Reply to: