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

CVS:oo-deb/debian openoffice.org-java.postinst.in,NONE,1.1 changelog,1.359,1.360 control,1.184,1.185 control.in,1.151,1.152



Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv16421

Modified Files:
	changelog control control.in 
Added Files:
	openoffice.org-java.postinst.in 
Log Message:
mention that user installing -java needs to run jvmsetup in its description;
echo a appropriate message in postinst, too


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -d -r1.359 -r1.360
--- changelog	27 Jul 2004 15:14:07 -0000	1.359
+++ changelog	27 Jul 2004 18:19:54 -0000	1.360
@@ -4,14 +4,16 @@
     not yet enabled
   * New patches:
     - sparc-v8-fixes: do not use the cas statement on sparc, makes
-      libsal.so.3.1.0 v8-compatible (closes: #256347), thanks Jim Watson
+      libsal.so.3.1.0 v8-compatible (closes: #256347), thanks Jim Watson [RE]
   * Modified patches:
     - system-curl: fix includes for libcurl3, curl/types.h is now
       /* not used */ [RE]
   * debian/control.in:
     - just Recommend fontconfig instead of depending on it at
       ttf-opensymbol [RE]
-    - extend -java description with the two line "intro" of the other pkgs [RE]
+    - extend -java description with the two line "intro" of the other pkgs
+      and tell in the description that the user needs to register his
+      JDK/JRE manually [RE]
     - version libaltlinuxhyph build-dependency with (>= 0.1.1-6) since
       arm needs it built with -fPIC [RE]
     - build-depend on libcurl3-dev instead of libcurl2-dev to build against
@@ -37,8 +39,10 @@
   * debian/patches/linux-arm-support.diff: add as hack until it could be
     added to ooo-build... [RE]
   * debian/openoffice.org-crashrep.install: remove
+  * debian/openoffice.org-java.postinst.in: add; tell the user to execute
+    /usr/lib/openoffice/program/jvmsetup [RE]
 
- -- Rene Engelhard <rene@debian.org>  Mon, 26 Jul 2004 11:12:46 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 27 Jul 2004 19:17:31 +0200
 
 openoffice.org (1.1.2-2) unstable; urgency=low
 

--- NEW FILE: openoffice.org-java.postinst.in ---
#!/bin/sh
# postinst script for openoffice.org-java

THIS_PACKAGE=openoffice.org-java
THIS_SCRIPT=postinst

#INCLUDE_SHELL_LIB#

set -e

case "$1" in
    configure)
    # if we have a old version installed we do a upgrade and we don't
    # need to show this message again...
    if [ -n "$2" ]; then
    	echo "*** You need to point OpenOffice.org to your installed JDK to ***"
    	echo "*** have an effect from installing this package... ***"
	echo ""
	echo "*** Run /usr/lib/openoffice/program/jvmsetup to do this.. ***"
    fi
    ;;

    *)
        echo "postrm called with unknown argument \'$1'" >&2
	exit 1
    ;;
esac

exit 0

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- control.in	27 Jul 2004 15:14:07 -0000	1.151
+++ control.in	27 Jul 2004 18:19:54 -0000	1.152
@@ -97,6 +97,9 @@
    * AutoReport wizard
    * JDBC drivers
    * Java UNO support
+ .
+ You need to tell OOo where your JDK/JRE is located through running
+ /usr/lib/openoffice/program/jvmconfig after installation.
 
 Package: ttf-opensymbol
 Architecture: all

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- control	27 Jul 2004 15:14:07 -0000	1.184
+++ control	27 Jul 2004 18:19:54 -0000	1.185
@@ -97,6 +97,9 @@
    * AutoReport wizard
    * JDBC drivers
    * Java UNO support
+ .
+ You need to tell OOo where your JDK/JRE is located through running
+ /usr/lib/openoffice/program/jvmconfig after installation.
 
 Package: ttf-opensymbol
 Architecture: all



Reply to: