[SCM] ardour Debian packaging branch, master, updated. upstream/2.8.2-103-gaca491e

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Mon Oct 12 20:37:23 UTC 2009


The following commit has been merged in the master branch:
commit a21f96139bd6d6134b3ff8ccc379484be3ec0461
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Oct 8 17:45:31 2009 +0200

    Update 60-libdir.patch for 2.8.3

diff --git a/debian/patches/60-libdir.patch b/debian/patches/60-libdir.patch
index 4ffa0f8..b3e2cc2 100644
--- a/debian/patches/60-libdir.patch
+++ b/debian/patches/60-libdir.patch
@@ -1,13 +1,13 @@
 diff --git a/SConstruct b/SConstruct
-index fcd575d..f1635f2 100644
+index c60aece..15faa53 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -743,7 +743,7 @@ if env['FPU_OPTIMIZATION']:
- # handle x86/x86_64 libdir properly
+@@ -754,7 +754,7 @@ if env['FPU_OPTIMIZATION']:
  
- if env['DIST_TARGET'] == 'x86_64':
--    env['LIBDIR']='lib64'
-+    env['LIBDIR']='lib'
+ if env['DIST_LIBDIR'] == '':
+     if env['DIST_TARGET'] == 'x86_64':
+-        env['LIBDIR']='lib64'
++        env['LIBDIR']='lib'
+     else:
+         env['LIBDIR']='lib'
  else:
-     env['LIBDIR']='lib'
- 

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list