CVS:oo-debian-files/bin openoffice,1.19,1.20

[Chris Halls <halls@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv12655/bin

Modified Files:
	openoffice 
Log Message:
* Version 1.1.0-1
* Depend on openoffice.org >> 1.1.0
* Remove some unneeded sections from ooo_prelink and wrapper


Index: openoffice
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/openoffice,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- openoffice	21 Aug 2003 13:44:29 -0000	1.19
+++ openoffice	1 Oct 2003 12:55:47 -0000	1.20
@@ -185,11 +185,6 @@
     grep -q DESTINATIONPATH /etc/openoffice${VER}/autoresponse.conf ; then
     echo "OpenOffice.org for Debian - see /usr/share/doc/openoffice.org${VER}/README.Debian.gz"
 
-    #if oldhome="`get_settings_dir "OpenOffice.org 1.0.2"`" ; then
-    #  OOHOME="$oldhome"
-    #  echo "Using settings from 1.0.2"
-    #  /bin/echo -e "OpenOffice.org 1.0.3=file://$oldhome\r" >> ~/.sversionrc
-    #else
     if can_upgrade; then
       TMPFILE=`mktemp -t oooAutoreponse.XXXXXXXXXX` || exit 1
       sed -e "s#^DESTINATIONPATH=.*#DESTINATIONPATH=$oldhome#" \