[SCM] ardour Debian packaging branch, master, updated. debian/2.8.11-1-4-ga4291ca

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a4291ca08b223ed0d076303b90ae7c157c1de9a5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Aug 1 16:55:57 2010 -0400

    Refresh patch using shortinging options --no-timestamps --no-index -pab.

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index 1206580..80f2f01 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,8 +1,6 @@
-diff --git a/SConstruct b/SConstruct
-index c60aece..5add5ec 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -502,6 +502,12 @@ if conf.CheckPKGExists ('aubio'):
+@@ -503,6 +503,12 @@
  else:
      env['AUBIO'] = 0
  
@@ -15,7 +13,7 @@ index c60aece..5add5ec 100644
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -868,13 +874,6 @@ prep_libcheck(env, env)
+@@ -868,13 +874,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -29,7 +27,7 @@ index c60aece..5add5ec 100644
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1093,7 +1092,6 @@ if env['SYSLIBS']:
+@@ -1093,7 +1092,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
@@ -37,7 +35,7 @@ index c60aece..5add5ec 100644
          'libs/vamp-plugins/',
      # these are unconditionally included but have
      # tests internally to avoid compilation etc
-@@ -1159,7 +1157,6 @@ else:
+@@ -1159,7 +1157,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
diff --git a/debian/patches/111_libardourvampplugins.patch b/debian/patches/111_libardourvampplugins.patch
index b1a6d06..d2aaa08 100644
--- a/debian/patches/111_libardourvampplugins.patch
+++ b/debian/patches/111_libardourvampplugins.patch
@@ -5,11 +5,9 @@ Bug-Debian: http://bugs.debian.org/560052
 Acked-by: Klaumi Klingsporn <klaumikli at gmx.de>
 Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
 
-diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript
-index fd86c09..055c46d 100644
 --- a/libs/vamp-plugins/SConscript
 +++ b/libs/vamp-plugins/SConscript
-@@ -19,7 +19,6 @@ Onset.cpp
+@@ -19,7 +19,6 @@
  Import('env install_prefix libraries')
  vampplugs = env.Clone()
  
diff --git a/debian/patches/60-libdir.patch b/debian/patches/60-libdir.patch
index b3e2cc2..174ca83 100644
--- a/debian/patches/60-libdir.patch
+++ b/debian/patches/60-libdir.patch
@@ -1,8 +1,6 @@
-diff --git a/SConstruct b/SConstruct
-index c60aece..15faa53 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -754,7 +754,7 @@ if env['FPU_OPTIMIZATION']:
+@@ -743,7 +743,7 @@
  
  if env['DIST_LIBDIR'] == '':
      if env['DIST_TARGET'] == 'x86_64':

-- 
ardour Debian packaging