rev 11459 - in branches/kde4/packages/kdesdk/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-10 21:23:41 +0000 (Thu, 10 Jul 2008)
New Revision: 11459

Modified:
   branches/kde4/packages/kdesdk/debian/changelog
   branches/kde4/packages/kdesdk/debian/patches/02_append_kde.diff
   branches/kde4/packages/kdesdk/debian/patches/97_fix_target_link_libraries.diff
Log:
more on kdesdk


Modified: branches/kde4/packages/kdesdk/debian/changelog
===================================================================
--- branches/kde4/packages/kdesdk/debian/changelog	2008-07-10 20:35:19 UTC (rev 11458)
+++ branches/kde4/packages/kdesdk/debian/changelog	2008-07-10 21:23:41 UTC (rev 11459)
@@ -1,6 +1,7 @@
 kdesdk (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:34:48 +0200
 

Modified: branches/kde4/packages/kdesdk/debian/patches/02_append_kde.diff
===================================================================
--- branches/kde4/packages/kdesdk/debian/patches/02_append_kde.diff	2008-07-10 20:35:19 UTC (rev 11458)
+++ branches/kde4/packages/kdesdk/debian/patches/02_append_kde.diff	2008-07-10 21:23:41 UTC (rev 11459)
@@ -1,6 +1,8 @@
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -43,7 +43,6 @@
+Index: kdesdk-4.0.98/scripts/CMakeLists.txt
+===================================================================
+--- kdesdk-4.0.98.orig/scripts/CMakeLists.txt	2008-07-10 21:01:55.000000000 +0000
++++ kdesdk-4.0.98/scripts/CMakeLists.txt	2008-07-10 21:02:13.000000000 +0000
+@@ -44,7 +44,6 @@
    cvsblame 
    colorsvn 
    svn2dist 
@@ -8,7 +10,7 @@
    svnlastchange 
    svnversions 
    kdesvn-build 
-@@ -63,4 +62,6 @@
+@@ -64,4 +63,6 @@
    svnintegrate 
    kde_generate_export_header
    DESTINATION ${BIN_INSTALL_DIR})

Modified: branches/kde4/packages/kdesdk/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdesdk/debian/patches/97_fix_target_link_libraries.diff	2008-07-10 20:35:19 UTC (rev 11458)
+++ branches/kde4/packages/kdesdk/debian/patches/97_fix_target_link_libraries.diff	2008-07-10 21:23:41 UTC (rev 11459)
@@ -1,6 +1,6 @@
 --- a/cervisia/CMakeLists.txt
 +++ b/cervisia/CMakeLists.txt
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  kde4_add_kdeinit_executable( cervisia ${cervisia_KDEINIT_SRCS})
  
  # kde3support still needed for K3ListView and friends
@@ -9,7 +9,7 @@
  
  install(TARGETS kdeinit_cervisia ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
  
  
  
@@ -30,13 +30,13 @@
  
  install(TARGETS kdeinit_cvsservice_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/kate/app/CMakeLists.txt
-+++ b/kate/app/CMakeLists.txt
-@@ -28,7 +28,7 @@
++++ b/kate/app/CMakeLists.txt	2008-07-10 21:06:03.000000000 +0000
+@@ -29,7 +29,7 @@
  
  kde4_add_library(kateinterfaces SHARED ${kateinterfaces_LIB_SRCS})
  
 -target_link_libraries(kateinterfaces  ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  ${QT_QTXML_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} )
-+target_link_libraries(kateinterfaces  ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  ${QT_QTXML_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTDBUS_LIBRARY} )
++target_link_libraries(kateinterfaces  ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  ${QT_QTXML_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTDBUS_LIBRARY} ${KDE4_KPARTS_LIBS} )
  
  set_target_properties(kateinterfaces PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kateinterfaces ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -80,7 +80,7 @@
  kde4_add_library(komparediff2 SHARED ${diff2_PART_SRCS})
  
 -target_link_libraries(komparediff2 ${KDE4_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
-+target_link_libraries(komparediff2 ${KDE4_KPARTS_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
++target_link_libraries(komparediff2 ${KDE4_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS})
  
  set_target_properties(komparediff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
  SOVERSION ${GENERIC_LIB_SOVERSION} )
@@ -93,7 +93,7 @@
 -target_link_libraries(split2po  ${KDE4_KDECORE_LIBS})
 +target_link_libraries(split2po  ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY})
  
- install(TARGETS split2po  DESTINATION ${BIN_INSTALL_DIR})
+ install(TARGETS split2po  ${INSTALL_TARGETS_DEFAULT_ARGS})
  
 @@ -23,7 +23,7 @@
  
@@ -102,5 +102,5 @@
 -target_link_libraries(xml2pot  ${KDE4_KDECORE_LIBS})
 +target_link_libraries(xml2pot  ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY})
  
- install(TARGETS xml2pot  DESTINATION ${BIN_INSTALL_DIR})
+ install(TARGETS xml2pot  ${INSTALL_TARGETS_DEFAULT_ARGS})