[SCM] ardour/master: Refresh patches.

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

The following commit has been merged in the master branch:
commit 0662c0061e05cce281d50e995e631caf978011d6
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Feb 14 17:29:22 2011 +0100

    Refresh patches.

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index 80f2f01..15287fd 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -13,7 +13,7 @@
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -868,13 +874,6 @@
+@@ -876,13 +882,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -27,7 +27,7 @@
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1093,7 +1092,6 @@
+@@ -1104,7 +1103,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
@@ -35,7 +35,7 @@
          'libs/vamp-plugins/',
      # these are unconditionally included but have
      # tests internally to avoid compilation etc
-@@ -1159,7 +1157,6 @@
+@@ -1170,7 +1168,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
diff --git a/debian/patches/140_enable-ladish.patch b/debian/patches/140_enable-ladish.patch
index 9c67baa..c0090cc 100644
--- a/debian/patches/140_enable-ladish.patch
+++ b/debian/patches/140_enable-ladish.patch
@@ -3,7 +3,7 @@ Author: Nedko Arnaudov <nedko at arnaudov.name>
 Description: Add ladish level 1 support
 --- a/gtk2_ardour/main.cc
 +++ b/gtk2_ardour/main.cc
-@@ -296,6 +296,27 @@
+@@ -450,6 +450,27 @@
  	}
  }
  
@@ -31,7 +31,7 @@ Description: Add ladish level 1 support
  #ifdef VST_SUPPORT
  
  extern int gui_init (int* argc, char** argv[]);
-@@ -388,6 +409,12 @@
+@@ -540,6 +561,12 @@
  		cerr << _("Cannot install SIGPIPE error handler") << endl;
  	}
  
diff --git a/debian/patches/60-libdir.patch b/debian/patches/60-libdir.patch
index 174ca83..a97c841 100644
--- a/debian/patches/60-libdir.patch
+++ b/debian/patches/60-libdir.patch
@@ -1,6 +1,6 @@
 --- a/SConstruct
 +++ b/SConstruct
-@@ -743,7 +743,7 @@
+@@ -751,7 +751,7 @@
  
  if env['DIST_LIBDIR'] == '':
      if env['DIST_TARGET'] == 'x86_64':
diff --git a/debian/patches/80_ardourino.patch b/debian/patches/80_ardourino.patch
index 64e2565..637a772 100644
--- a/debian/patches/80_ardourino.patch
+++ b/debian/patches/80_ardourino.patch
@@ -300,7 +300,7 @@
  	}
  }
  
-@@ -1248,29 +1262,30 @@
+@@ -1249,29 +1263,30 @@
  	channel_combo.set_active_text (str.front());
  	channel_combo.set_sensitive (false);
  

-- 
ardour Debian packaging