[SCM] cantata/master: Refresh patches, drop obsolete

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 581760e4acb005ba8a10f3fdaa1538e22979da10
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Feb 8 00:13:03 2016 +1100

    Refresh patches, drop obsolete

diff --git a/debian/patches/ebur128-location.patch b/debian/patches/ebur128-location.patch
index a442a2c..611db16 100644
--- a/debian/patches/ebur128-location.patch
+++ b/debian/patches/ebur128-location.patch
@@ -9,7 +9,7 @@ Author: Stuart Prescott <stuart at debian.org>
 Forwarded: not sure -- check interaction with cmake rules
 --- a/replaygain/ffmpeginput.cpp
 +++ b/replaygain/ffmpeginput.cpp
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
  #include <QString>
  #include <QList>
  #include <QByteArray>
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index d7d31c7..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
-
---- cantata-1.5.2.ds2.orig/replaygain/ffmpeginput.cpp
-+++ cantata-1.5.2.ds2/replaygain/ffmpeginput.cpp
-@@ -21,7 +21,7 @@ extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #if LIBAVFORMAT_VERSION_MAJOR >= 54
--#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
- #endif
- #ifdef __cplusplus
- }
diff --git a/debian/patches/libmusicbrainz5cc.patch b/debian/patches/libmusicbrainz5cc.patch
deleted file mode 100644
index 2fb0157..0000000
--- a/debian/patches/libmusicbrainz5cc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Look for libmusicbrainz5cc instead of libmusicbrainz5.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2015-07-09
-
---- cantata-1.5.2.ds2.orig/cmake/FindMusicBrainz5.cmake
-+++ cantata-1.5.2.ds2/cmake/FindMusicBrainz5.cmake
-@@ -16,10 +16,10 @@ endif(MUSICBRAINZ5_INCLUDE_DIRS AND MUSI
- 
- IF (NOT WIN32)
-    find_package(PkgConfig)
--   PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5 )
-+   PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5cc )
- ELSE (NOT WIN32)
-   FIND_PATH( MUSICBRAINZ5_INCLUDE_DIRS musicbrainz5/Disc.h )
--  FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5 )
-+  FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5cc )
- ENDIF (NOT WIN32)
- 
- include(FindPackageHandleStandardArgs)
diff --git a/debian/patches/playeradaptor.patch b/debian/patches/playeradaptor.patch
deleted file mode 100644
index 7318c45..0000000
--- a/debian/patches/playeradaptor.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -291,14 +291,14 @@
-         qt5_add_dbus_interfaces(CANTATA_SRCS dbus/org.freedesktop.PowerManagement.Inhibit.xml)
-     else (ENABLE_QT5)
-         if ( (QT_VERSION_MINOR LESS 8) OR (QT_VERSION_MINOR EQUAL 8 AND QT_VERSION_PATCH LESS 2) )
--            qt4_add_dbus_adaptor(CANTATA_SRCS dbus/org.mpris.MediaPlayer2.Player.OLD.xml dbus/mpris.h Mpris)
-+            qt4_add_dbus_adaptor(CANTATA_SRCS dbus/org.mpris.MediaPlayer2.Player.xml dbus/mpris.h Mpris)
-         else ( (QT_VERSION_MINOR LESS 8) OR (QT_VERSION_MINOR EQUAL 8 AND QT_VERSION_PATCH LESS 2) )
-             qt4_add_dbus_adaptor(CANTATA_SRCS dbus/org.mpris.MediaPlayer2.Player.xml dbus/mpris.h Mpris)
-         endif ( (QT_VERSION_MINOR LESS 8) OR (QT_VERSION_MINOR EQUAL 8 AND QT_VERSION_PATCH LESS 2) )
-         qt4_add_dbus_adaptor(CANTATA_SRCS dbus/org.mpris.MediaPlayer2.root.xml dbus/mpris.h Mpris)
-         qt4_add_dbus_adaptor(CANTATA_SRCS dbus/com.googlecode.cantata.xml gui/mainwindow.h MainWindow)
-         if ( (QT_VERSION_MINOR LESS 8) OR (QT_VERSION_MINOR EQUAL 8 AND QT_VERSION_PATCH LESS 2) )
--            qt4_add_dbus_interfaces(CANTATA_SRCS dbus/org.freedesktop.Notifications.OLD.xml)
-+            qt4_add_dbus_interfaces(CANTATA_SRCS dbus/org.freedesktop.Notifications.xml)
-         else ( (QT_VERSION_MINOR LESS 8) OR (QT_VERSION_MINOR EQUAL 8 AND QT_VERSION_PATCH LESS 2) )
-             qt4_add_dbus_interfaces(CANTATA_SRCS dbus/org.freedesktop.Notifications.xml)
-         endif ( (QT_VERSION_MINOR LESS 8) OR (QT_VERSION_MINOR EQUAL 8 AND QT_VERSION_PATCH LESS 2) )
---- a/dbus/org.mpris.MediaPlayer2.Player.xml
-+++ b/dbus/org.mpris.MediaPlayer2.Player.xml
-@@ -28,7 +28,7 @@
- 		<property name='Rate' type='d' access='readwrite'/>
- 		<property name='Shuffle' type='b' access='readwrite'/>
- 		<property name='Metadata' type='a{sv}' access='read'>
--			<annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
-+			<annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantMap"/>
- 		</property>
- 		<property name='Volume' type='d' access='readwrite'/>
- 		<property name='Position' type='x' access='read'/>
---- a/dbus/org.freedesktop.Notifications.xml
-+++ b/dbus/org.freedesktop.Notifications.xml
-@@ -22,7 +22,7 @@
-       <arg name="body" type="s" direction="in"/>
-       <arg name="actions" type="as" direction="in"/>
-       <arg name="hints" type="a{sv}" direction="in"/>
--      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
-+      <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
-       <arg name="timeout" type="i" direction="in"/>
-       <arg name="return_id" type="u" direction="out"/>
-     </method>
diff --git a/debian/patches/series b/debian/patches/series
index a41993a..9932563 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 # only needed for Qt in wheezy
-#playeradaptor.patch
 ebur128-location.patch
-libmusicbrainz5cc.patch
-ffmpeg_2.9.patch

-- 
cantata packaging