[SCM] cantata/master: Add patch to find system ebur128

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eafdf42b5a085b530dfae68119aa1c783ff3f59b
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue Sep 2 00:24:46 2014 +1000

    Add patch to find system ebur128

diff --git a/debian/changelog b/debian/changelog
index 47bbb93..795d2ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-cantata (1.4.0.ds1-1) UNRELEASED; urgency=medium
+cantata (1.4.1.ds1-1) unstable; urgency=medium
 
   * New upstream release
     - build with system libebur128 (Closes: #739715).
+    - add patch to correctly find system libebur128.
 
- -- Stuart Prescott <stuart at debian.org>  Sun, 10 Aug 2014 23:36:59 +1000
+ -- Stuart Prescott <stuart at debian.org>  Mon, 01 Sep 2014 23:53:25 +1000
 
 cantata (1.3.4.ds1-1) unstable; urgency=medium
 
diff --git a/debian/patches/ebur128-location.patch b/debian/patches/ebur128-location.patch
new file mode 100644
index 0000000..4eac3a7
--- /dev/null
+++ b/debian/patches/ebur128-location.patch
@@ -0,0 +1,42 @@
+Description: Fix include location for ebur128 files
+ The Debian packages for ebur128 are shipping the headers in:
+
+    libebur128-dev: /usr/include/ebur128.h
+
+ while the upstream code expects ebur128/ebur128.h
+
+Author: Stuart Prescott <stuart at debian.org>
+Forwarded: not sure -- check interaction with cmake rules
+--- a/replaygain/ffmpeginput.cpp
++++ b/replaygain/ffmpeginput.cpp
+@@ -32,7 +32,7 @@
+ #include <QString>
+ #include <QList>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "ffmpeginput.h"
+ 
+ static QMutex mutex;
+--- a/replaygain/mpg123input.cpp
++++ b/replaygain/mpg123input.cpp
+@@ -19,7 +19,7 @@
+ #include <QFile>
+ #include <QString>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "mpg123input.h"
+ 
+ struct Mpg123Input::Handle {
+--- a/replaygain/trackscanner.h
++++ b/replaygain/trackscanner.h
+@@ -25,7 +25,7 @@
+ #define _SCANNER_H_
+ 
+ #include "jobcontroller.h"
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ 
+ class Input;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 574311c..f0c3466 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 # only needed for Qt in wheezy
 #playeradaptor.patch
+ebur128-location.patch

-- 
cantata packaging