CVS:oo-deb/debian/scripts xcftobmp,1.6,1.7

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

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

Modified Files:
	xcftobmp 
Log Message:
* Document ooo-build patch changes
* Reword some changelog entries
* modify libmyspell, libaltlinuxhyph-dev and newer libart build
  dependencies to not require them in Woody backport
* do not use system curl for Woody backport because the version is too 
  old
* Remove extra logic to generate Depends on debianutils (>2.0) for
  non-Woody backport:  OOo gives a reasonable error message if
  sensible-browser is not available, and this would have forced us to
  ship another package for the backport


Index: xcftobmp
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/xcftobmp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xcftobmp	6 Apr 2004 09:39:28 -0000	1.6
+++ xcftobmp	6 Apr 2004 11:02:42 -0000	1.7
@@ -2,7 +2,7 @@
 
 # gimp has problems with upgrading the alternative (/usr/bin/gimp), so test
 # for the stuff manually
-if [ -L /usr/bin/gimp -a -x $(readlink $(readlink /usr/bin/gimp)) ]; then
+if [ -L /usr/bin/gimp ] && [ -x "$(readlink $(readlink /usr/bin/gimp))" ]; then
 	GIMP=gimp
 elif [ -x /usr/bin/gimp ]; then
 	GIMP=gimp
@@ -12,6 +12,9 @@
 	GIMP=gimp-2.0
 elif [ -x /usr/bin/gimp-2.2 ]; then
 	GIMP=gimp-2.2
+else
+        echo $0: Could not find gimp.
+	exit 1
 fi
 
 script_fu="