From 7c63228d73510d3f8ff6d0be95e1e8deb8f07727 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sep 26 2012 14:41:24 +0000 Subject: Other method to find the right /usr/bin/mypaint proposed by Harald Hoyer --- diff --git a/mypaint-1.0.0-usrmove.patch b/mypaint-1.0.0-usrmove.patch index fd9b8d7..1f09d10 100644 --- a/mypaint-1.0.0-usrmove.patch +++ b/mypaint-1.0.0-usrmove.patch @@ -1,13 +1,12 @@ diff -ur mypaint-1.0.0.orig/mypaint.py mypaint-1.0.0/mypaint.py --- mypaint-1.0.0.orig/mypaint.py 2011-11-22 21:27:03.000000000 +0100 -+++ mypaint-1.0.0/mypaint.py 2012-09-26 16:21:40.125539307 +0200 -@@ -68,6 +68,9 @@ ++++ mypaint-1.0.0/mypaint.py 2012-09-26 16:39:34.118393086 +0200 +@@ -64,7 +64,7 @@ + # this script is installed as $prefix/bin. We just need $prefix to continue. + #pwd=os.getcwd() # why???? + #dir_install=os.path.normpath(join(pwd,scriptdir)) # why???? +- dir_install=scriptdir # same, except maybe if scriptdir is relative... ++ dir_install=os.path.realpath(scriptdir) # same, except maybe if scriptdir is relative... if os.path.basename(dir_install) == 'bin': prefix=os.path.dirname(dir_install) -+ if prefix == "/": -+ # we have most likely a usrmoved system and disallow a prefix of / -+ prefix = u"/usr" - assert isinstance(prefix, unicode) - libpath=join(prefix, lib_shared) - libpath_compiled = join(prefix, lib_compiled)