diff -Nru kscd-16.04.3/CMakeLists.txt kscd-16.12.1/CMakeLists.txt --- kscd-16.04.3/CMakeLists.txt 2015-04-03 04:45:46.000000000 +0000 +++ kscd-16.12.1/CMakeLists.txt 2016-08-29 21:24:33.000000000 +0000 @@ -8,9 +8,6 @@ include(MacroLibrary) include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}) -find_package(Alsa) -alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) - find_package(MusicBrainz3 REQUIRED) include_directories( diff -Nru kscd-16.04.3/debian/changelog kscd-16.12.1/debian/changelog --- kscd-16.04.3/debian/changelog 2016-09-30 04:39:32.000000000 +0000 +++ kscd-16.12.1/debian/changelog 2017-01-19 16:12:13.000000000 +0000 @@ -1,3 +1,14 @@ +kscd (4:16.12.1-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Update Vcs-Git fields to use https:// instead of git:// + + [ Rik Mills ] + * New upstream release (16.12.0) + * New upstream release (16.12.1) + + -- Rik Mills Thu, 19 Jan 2017 16:12:13 +0000 + kscd (4:16.04.3-0ubuntu1) yakkety; urgency=medium [ Scarlett Clark ] diff -Nru kscd-16.04.3/debian/control kscd-16.12.1/debian/control --- kscd-16.04.3/debian/control 2016-09-30 04:39:32.000000000 +0000 +++ kscd-16.12.1/debian/control 2017-01-19 16:12:13.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: cmake, debhelper (>= 9), kde-sc-dev-latest (>= 4:4.12), - kdelibs5-dev (>= 4:4.14.22~), + kdelibs5-dev (>= 4:4.14.28~), libasound2-dev [linux-any], libdiscid-dev, libmusicbrainz5-dev, @@ -15,7 +15,7 @@ Standards-Version: 3.9.6 Homepage: http://www.kde.org/ Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kscd -Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kscd +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kscd Package: kscd Section: sound diff -Nru kscd-16.04.3/debian/patches/migrate_to_musicbrainz5.diff kscd-16.12.1/debian/patches/migrate_to_musicbrainz5.diff --- kscd-16.04.3/debian/patches/migrate_to_musicbrainz5.diff 2016-09-30 04:39:32.000000000 +0000 +++ kscd-16.12.1/debian/patches/migrate_to_musicbrainz5.diff 2017-01-19 16:12:13.000000000 +0000 @@ -1,8 +1,8 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,13 +11,15 @@ - find_package(Alsa) - alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) +@@ -8,13 +8,15 @@ include(KDE4Defaults) + include(MacroLibrary) + include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}) -find_package(MusicBrainz3 REQUIRED) +find_package(MusicBrainz5 REQUIRED) @@ -18,7 +18,7 @@ ) add_subdirectory(tests) ########### next target ############### -@@ -115,7 +117,8 @@ +@@ -112,7 +114,8 @@ target_link_libraries(kscd ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} @@ -469,7 +469,7 @@ struct DiscInfo { QString Title; -@@ -64,6 +67,7 @@ +@@ -64,6 +67,7 @@ private: QList m_trackList; /// List of tracks information bool m_validInfo; /// Tells whether the lookup query succeeded @@ -477,7 +477,7 @@ public: MBManager(); -@@ -82,11 +86,11 @@ +@@ -82,11 +86,11 @@ public slots: void discLookup(const QString& device); /** Uploads information */ @@ -493,7 +493,7 @@ --- a/kscd.cpp +++ b/kscd.cpp -@@ -114,7 +114,7 @@ +@@ -114,7 +114,7 @@ void KSCD::setupActions() m_uploadAction = m_actions->addAction( QLatin1String( "Upload Info" )); m_uploadAction->setText(i18n("Upload Info")); addAction(m_uploadAction); @@ -502,7 +502,7 @@ //play/pause m_playPauseAction = m_actions->addAction( QLatin1String( "Play/Pause" )); -@@ -248,6 +248,11 @@ +@@ -248,6 +248,11 @@ void KSCD::discLookup() m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName()); } @@ -559,7 +559,7 @@ + --- a/kscd.h +++ b/kscd.h -@@ -131,6 +131,7 @@ +@@ -130,6 +130,7 @@ public slots: void configureKeys(); void discLookup(); diff -Nru kscd-16.04.3/kscd.h kscd-16.12.1/kscd.h --- kscd-16.04.3/kscd.h 2015-04-03 04:45:46.000000000 +0000 +++ kscd-16.12.1/kscd.h 2016-08-29 21:24:33.000000000 +0000 @@ -43,7 +43,6 @@ #include "gui/kscdwindow.h" #include "hwcontroler.h" #include "mbmanager.h" -#include #include #include