[SCM] kscd packaging branch, master, updated. 23fa851567ef4d2f1a7b2deb3eda4827cb38447a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kscd.git;a=commitdiff;h=06c4ced

The following commit has been merged in the master branch:
commit 06c4cedebea4dba8835e0a350e9cd5d9bb7b59a3
Author: Pino Toscano <pino at debian.org>
Date:   Wed Feb 20 11:33:12 2013 +0100

    do not use unused libkcddb and libkcompactdisc
    
    backport an upstream patch (which will be part of 4.10.1) to remove references to the unused kcddb and kcompactdisc libraries
---
 debian/patches/series                    |    1 +
 debian/patches/upstream_unused-libs.diff |   55 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..609ea62
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_unused-libs.diff
diff --git a/debian/patches/upstream_unused-libs.diff b/debian/patches/upstream_unused-libs.diff
new file mode 100644
index 0000000..14f880f
--- /dev/null
+++ b/debian/patches/upstream_unused-libs.diff
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,12 +11,6 @@ include_directories(${QT_INCLUDES} ${KDE
+ find_package(Alsa)
+ alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
+ 
+-
+-# If these two fail, behavior falls back to pre-git-migration
+-# FIXME: After the git migration, we need the REQUIRED param
+-find_package(Libkcddb)
+-find_package(Libkcompactdisc)
+-
+ find_package(MusicBrainz3 REQUIRED)
+ 
+ include_directories(
+@@ -121,8 +115,7 @@ target_link_libraries(kscd
+     ${KDE4_SOLID_LIBS}
+     ${KDE4_PHONON_LIBS}
+     ${MUSICBRAINZ3_LIBRARIES}
+-    ${LIBKCDDB_LIBRARIES}
+-    ${LIBKCOMPACTDISC_LIBRARIES})
++    )
+ 
+ ########### install files ###############
+ 
+--- a/kscd.kcfg
++++ b/kscd.kcfg
+@@ -3,8 +3,6 @@
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+-    <!--<include>KGlobalSettings</include>-->
+-    <!--<include>kcompactdisc.h</include>-->
+ 	<include>KStandardDirs</include>
+     <kcfgfile name="kscdrc"/>
+     <group name="General">
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -20,8 +20,6 @@ target_link_libraries(HWControler_test
+ 	${KDE4_PHONON_LIBS}
+ 	${KDE4_KDECORE_LIBS}
+ 	${QT_QTTEST_LIBRARY}
+-	${LIBKCDDB_LIBRARIES}
+-	${LIBKCOMPACTDISC_LIBRARIES}
+ )
+ 
+ 
+@@ -31,7 +29,5 @@ target_link_libraries(AudioCD_test
+ 	${KDE4_PHONON_LIBS}
+ 	${KDE4_KDECORE_LIBS}
+ 	${QT_QTTEST_LIBRARY}
+-	${LIBKCDDB_LIBRARIES}
+-	${LIBKCOMPACTDISC_LIBRARIES}
+ )
+ 

-- 
kscd packaging