[SCM] ardour3/master: Manual diff to upstream

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 46ed68a7f5b66a3280305a6b60dd615ab0ce3b61
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Apr 9 15:56:38 2013 +0200

    Manual diff to upstream
    
    For some reasons, these changes were not merged from the upstream
    branch. Let's apply them manually.

diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 80efee7..04a9585 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -5,7 +5,7 @@
 # and does a few checks before exec'ing the real executable.
 # 
 
-export GTK_PATH=@SYSCONFDIR@/ardour3${GTK_PATH:+:$GTK_PATH}
+export GTK_PATH=@SYSCONFDIR@/ardour3:@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH}
 
 export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
index 8135170..68abc4d 100644
--- a/libs/clearlooks-newer/wscript
+++ b/libs/clearlooks-newer/wscript
@@ -35,7 +35,7 @@ def build(bld):
     obj.target = 'clearlooks'
     obj.uselib = 'GTK'
     obj.includes = '.'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'engines')
 
     if sys.platform == 'darwin':
         # Bit of a hack: make a symlink to the .dylib that meets GTK's criteria for finding it (namely that the library must be a *.so
diff --git a/wscript b/wscript
index 1f86646..433f1a6 100644
--- a/wscript
+++ b/wscript
@@ -762,3 +762,5 @@ def i18n_po(bld):
 def i18n_mo(bld):
     bld.recurse (i18n_children)
 
+def tarball(bld):
+    create_stored_revision()

-- 
ardour3 packaging