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

[Fathi Boudra]

Author: fabo
Date: 2008-06-01 10:31:36 +0000 (Sun, 01 Jun 2008)
New Revision: 10818

Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
Log:
Update kdebase snapshot.


Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-06-01 10:20:37 UTC (rev 10817)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-06-01 10:31:36 UTC (rev 10818)
@@ -1,6 +1,8 @@
-kdebase (4:4.0.81+svn814614-1) UNRELEASED; urgency=low
+kdebase (4:4.0.81+svn815038-1~pre1) UNRELEASED; urgency=low
 
-  * New upstream snapshot.
+  * New upstream development snapshot:
+    - The latest upstream commit is r815038 by knight
+    - Date: Sun Jun 1 00:25:19 2008 UTC
 
   +++ Changes by Modestas Vainius:
 

Modified: branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff	2008-06-01 10:20:37 UTC (rev 10817)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff	2008-06-01 10:31:36 UTC (rev 10818)
@@ -17,15 +17,15 @@
  set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
  
-@@ -79,7 +80,7 @@
- qt4_add_dbus_adaptor(konqueror_KDEINIT_SRCS org.kde.Konqueror.SessionManager.xml konqsessionmanager.h KonqSessionManager konqsessionmanageradaptor KonqSessionManagerAdaptor)
- qt4_add_dbus_interface(konqueror_KDEINIT_SRCS org.kde.Konqueror.SessionManager.xml konqsessionmanager_interface)
+@@ -83,7 +84,7 @@
+ kde4_add_app_icon(konqueror_KDEINIT_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps
+ /konqueror.png")
  kde4_add_kdeinit_executable(konqueror ${konqueror_KDEINIT_SRCS} konqmain.cpp)
 -target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS})
 +target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${X11_X11_LIB})
  
- kde4_add_app_icon(konqueror_KDEINIT_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/konqueror.png")
- 
+ if (NOT WIN32)
+     install(TARGETS kdeinit_konqueror  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/apps/lib/konq/CMakeLists.txt
 +++ b/apps/lib/konq/CMakeLists.txt
 @@ -22,7 +22,7 @@
@@ -94,7 +94,7 @@
  
 --- a/apps/konqueror/settings/konqhtml/CMakeLists.txt
 +++ b/apps/konqueror/settings/konqhtml/CMakeLists.txt
-@@ -22,7 +22,7 @@
+@@ -18,7 +18,7 @@
  kde4_add_plugin(kcm_konqhtml ${kcm_konqhtml_PART_SRCS})