rev 10669 - in branches/kde4/packages/kdebase-runtime/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-05-21 23:20:49 +0000 (Wed, 21 May 2008)
New Revision: 10669

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
Log:
kdebase-runtime 4.1 beta1

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-05-21 22:22:37 UTC (rev 10668)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-05-21 23:20:49 UTC (rev 10669)
@@ -1,3 +1,13 @@
+kdebase-runtime (4:4.0.80-1~pre1) UNRELEASED; urgency=low
+
+  * New upstream development milestone (KDE 4.1 Beta1).
+
+  +++ Changes by Modestas Vainius:
+
+  * Resync 97th patch.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 May 2008 02:15:34 +0300
+
 kdebase-runtime (4:4.0.74-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff	2008-05-21 22:22:37 UTC (rev 10668)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff	2008-05-21 23:20:49 UTC (rev 10669)
@@ -37,8 +37,8 @@
  kde4_add_ui_files(kcmemoticons_SRCS emoticonslist.ui)
  
  kde4_add_plugin(kcm_emoticons ${kcmemoticons_SRCS})
--target_link_libraries(kcm_emoticons ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS})
-+target_link_libraries(kcm_emoticons ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTXML_LIBRARY})
+-target_link_libraries(kcm_emoticons ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KUTILS_LIBRARY})
++target_link_libraries(kcm_emoticons ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KUTILS_LIBRARY} ${QT_QTXML_LIBRARY})
  
  install(TARGETS kcm_emoticons  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
@@ -154,7 +154,7 @@
  
 --- a/kstyles/oxygen/CMakeLists.txt
 +++ b/kstyles/oxygen/CMakeLists.txt
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  
  kde4_add_plugin(oxygen ${oxygen_PART_SRCS})
  
@@ -229,25 +229,28 @@
  
 --- a/nepomuk/kcm/CMakeLists.txt
 +++ b/nepomuk/kcm/CMakeLists.txt
-@@ -27,6 +27,7 @@
+@@ -23,6 +23,9 @@
+ 
+ target_link_libraries(kcm_nepomuk
    ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY}
-   ${QT_QTCORE_LIBRARY}
-   ${QT_QTDBUS_LIBRARY}
++  ${QT_QTDBUS_LIBRARY}
 +  ${QT_QTXML_LIBRARY}
-   ${KDE4_KDECORE_LIBS}
++  ${KDE4_KDECORE_LIBS}
    ${KDE4_KDEUI_LIBS}
    ${KDE4_KIO_LIBS}
+   )
 --- a/nepomuk/services/strigi/CMakeLists.txt
 +++ b/nepomuk/services/strigi/CMakeLists.txt
-@@ -20,6 +20,8 @@
+@@ -17,6 +17,9 @@
+ 
  target_link_libraries(nepomukstrigiservice
    ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY}
-   ${QT_QTCORE_LIBRARY}
 +  ${QT_QTXML_LIBRARY}
 +  ${QT_QTDBUS_LIBRARY}
-   ${KDE4_KDECORE_LIBS}
++  ${KDE4_KDECORE_LIBS}
    ${KDE4_KDEUI_LIBS}
    ${NEPOMUK_LIBRARIES}
+   )
 --- a/phonon/xine/kcm/CMakeLists.txt
 +++ b/phonon/xine/kcm/CMakeLists.txt
 @@ -4,7 +4,7 @@