rev 11456 - in branches/kde4/packages/kdemultimedia/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-10 19:15:32 +0000 (Thu, 10 Jul 2008)
New Revision: 11456

Modified:
   branches/kde4/packages/kdemultimedia/debian/changelog
   branches/kde4/packages/kdemultimedia/debian/control
   branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
Log:
kdemultimedia


Modified: branches/kde4/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/changelog	2008-07-10 19:13:16 UTC (rev 11455)
+++ branches/kde4/packages/kdemultimedia/debian/changelog	2008-07-10 19:15:32 UTC (rev 11456)
@@ -1,3 +1,10 @@
+kdemultimedia (4:4.0.98-0) UNRELEASED; urgency=low
+
+  * New upstream release, Release Candidate 1.
+  * Update 97_fix_target_link_libraries.diff
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 10 Jul 2008 02:32:13 +0200
+
 kdemultimedia (4:4.0.84-1) experimental; urgency=low
 
   * New upstream snapshot

Modified: branches/kde4/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/control	2008-07-10 19:13:16 UTC (rev 11455)
+++ branches/kde4/packages/kdemultimedia/debian/control	2008-07-10 19:15:32 UTC (rev 11456)
@@ -5,7 +5,7 @@
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
 Build-Depends: cdbs (>= 0.4.51), cmake (>= 2.4.5), debhelper (>= 6), quilt,
- kdelibs5-dev (>= 4:4.0.82), libphonon-dev (>= 4:4.2~), libplasma-dev (>= 4:4.0.82),
+ kdelibs5-dev (>= 4:4.0.98), libphonon-dev (>= 4:4.2~), libplasma-dev (>= 4:4.0.98),
  libasound2-dev, libcdparanoia0-dev, libflac-dev, libmusicbrainz4-dev, libxine-dev,
  libogg-dev, libtag1-dev, libtheora-dev, libtunepimp-dev, libvorbis-dev, libx11-dev
 Standards-Version: 3.7.3

Modified: branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2008-07-10 19:13:16 UTC (rev 11455)
+++ branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2008-07-10 19:15:32 UTC (rev 11456)
@@ -1,69 +1,29 @@
-Index: b/kmix/CMakeLists.txt
-===================================================================
---- a/kmix/CMakeLists.txt
-+++ b/kmix/CMakeLists.txt
-@@ -50,7 +50,7 @@
- 
- kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
- 
--target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS})
-+target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY})
- 
- if (HAVE_LIBASOUND2)
-     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
-@@ -78,7 +78,7 @@
- 
- kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
- 
--target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS})
-+target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
- 
- if (HAVE_LIBASOUND2)
-     target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
-Index: b/libkcddb/CMakeLists.txt
-===================================================================
---- a/libkcddb/CMakeLists.txt
-+++ b/libkcddb/CMakeLists.txt
-@@ -60,7 +60,7 @@
- 
- kde4_add_library(kcddb SHARED ${kcddb_LIB_SRCS})
- 
--target_link_libraries(kcddb ${KDE4_KDE3SUPPORT_LIBS})
-+target_link_libraries(kcddb ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY})
- if(MUSICBRAINZ_FOUND)
-     target_link_libraries(kcddb ${MUSICBRAINZ_LIBRARIES})
- endif(MUSICBRAINZ_FOUND)
-Index: b/libkcompactdisc/CMakeLists.txt
-===================================================================
---- a/libkcompactdisc/CMakeLists.txt
-+++ b/libkcompactdisc/CMakeLists.txt
+--- kdemultimedia-4.0.98.orig/libkcompactdisc/CMakeLists.txt
++++ kdemultimedia-4.0.98/libkcompactdisc/CMakeLists.txt
 @@ -47,7 +47,7 @@
  
  kde4_add_library(kcompactdisc SHARED ${kcompactdisc_LIB_SRCS})
  
--target_link_libraries(kcompactdisc ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS})
+-target_link_libraries(kcompactdisc ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS})
 +target_link_libraries(kcompactdisc ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
  if (HAVE_LIBASOUND2)
      target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
  endif (HAVE_LIBASOUND2)
-Index: b/dragonplayer/src/app/CMakeLists.txt
-===================================================================
---- a/dragonplayer/src/app/CMakeLists.txt
-+++ b/dragonplayer/src/app/CMakeLists.txt
-@@ -32,6 +32,8 @@
- target_link_libraries(dragon
+--- kdemultimedia-4.0.98.orig/dragonplayer/src/app/CMakeLists.txt
++++ kdemultimedia-4.0.98/dragonplayer/src/app/CMakeLists.txt
+@@ -33,6 +33,7 @@
      ${KDE4_KUTILS_LIBS}
      ${KDE4_PHONON_LIBS}
-+    ${KDE4_SOLID_LIBS}
+     ${KDE4_SOLID_LIBS}
 +    ${KDE4_KIO_LIBRARY}
      ${XINE_LIBRARY} )
  
  install(TARGETS dragon ${INSTALL_TARGETS_DEFAULT_ARGS})
-@@ -44,6 +46,7 @@
+@@ -45,6 +46,7 @@
  kde4_add_plugin(dragonpart ${videoplayer_part_SRCS})
  
  target_link_libraries(dragonpart
 +${KDE4_SOLID_LIBS}
      ${KDE4_KPARTS_LIBS}
      ${KDE4_PHONON_LIBS}
-     ${XINE_LIBRARY} )
+     ${KDE4_SOLID_LIBS}