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

Modified Files:
        xcftobmp 
Log Message:
gimp has problems with upgrading the alternative (/usr/bin/gimp), so test for 
the stuff manually


Index: xcftobmp
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/xcftobmp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xcftobmp    3 Apr 2004 16:42:26 -0000       1.3
+++ xcftobmp    5 Apr 2004 01:11:14 -0000       1.4
@@ -1,10 +1,17 @@
 #!/bin/bash
 
-# gimp_2.0.0-[1-4] has no gimp command, shrugs....
-if [ -x /usr/bin/gimp ]; then
+# 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
        GIMP=gimp
+elif [ -x /usr/bin/gimp ]; then
+       GIMP=GIMP
+elif [ -x /usr/bin/gimp-1.2 ]; then
+       GIMP=gimp-1.2
 elif [ -x /usr/bin/gimp-2.0 ]; then
        GIMP=gimp-2.0
+elif [ -x /usr/bin/gimp-2.2 ]; then
+       GIMP=gimp-2.2
 fi
 
 script_fu="

Reply via email to