[SCM] ardour Debian packaging branch, master, updated. debian/2.8.4-2-3-g99339eb

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

The following commit has been merged in the master branch:
commit 4e5e6d4d93068249bfbf53cf5f7c37a9fc5775dd
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jan 4 12:32:22 2010 +0100

    Use vamp-plugin-sdk 2.1. Fixes #563588
    
    The vamp-plugin-sdk has been updated from version 1.3 to 2.1. Some header
    files have moved, so we no longer need to patch ardour's source code to
    match the old 1.3 location. (IOW: we're in sync with ardour upstream
    now)
    
    To make sure nobody tries to build against old 1.3 vamp, I also added a
    a version dependency to vamp-plugin-sdk.

diff --git a/debian/control b/debian/control
index 9c392da..220be37 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends: autotools-dev,
               libslv2-dev,
               lv2core,
               libcurl4-gnutls-dev,
-              vamp-plugin-sdk,
+              vamp-plugin-sdk (>=2.1),
               libusb-dev
 Standards-Version: 3.8.3
 Homepage: http://www.ardour.org/
diff --git a/debian/patches/110_vamp.patch b/debian/patches/110_vamp.patch
deleted file mode 100644
index 45fcb05..0000000
--- a/debian/patches/110_vamp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
-index 3123147..ab3691d 100644
---- a/libs/ardour/audioanalyser.cc
-+++ b/libs/ardour/audioanalyser.cc
-@@ -1,5 +1,5 @@
- #include <cstring>
--#include <vamp-hostsdk/PluginLoader.h>
-+#include <vamp-sdk/hostext/PluginLoader.h>
- #include <glibmm/miscutils.h>
- #include <glibmm/fileutils.h>
- #include <glib/gstdio.h> // for g_remove()
diff --git a/debian/patches/series b/debian/patches/series
index 7a91a04..4e27a49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 80_ardourino.patch
 90_ardour-x-change.patch
 100_syslibs.patch
-110_vamp.patch
 111_libardourvampplugins.patch

-- 
ardour Debian packaging