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

Modestas Vainius modax-guest at alioth.debian.org
Mon May 5 18:00:35 UTC 2008


Author: modax-guest
Date: 2008-05-05 18:00:35 +0000 (Mon, 05 May 2008)
New Revision: 10475

Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/libkonq5-dev.install
   branches/kde4/packages/kdebase/debian/libkonq5.install
   branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
Log:
New snapshot. Some updates.

Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-05-05 17:12:40 UTC (rev 10474)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-05-05 18:00:35 UTC (rev 10475)
@@ -1,3 +1,18 @@
+kdebase (4:4.0.72+svn804272-1~pre1) UNRELEASED; urgency=low
+
+  * New upstream development snapshot:
+    - The latest upstream commit is r804272 by dfaure
+    - Date: Mon, 05 May 2008 17:20:39 -0000
+  * Corrections to *.install files:
+    - libkonq5.install: 1 file(s) removed;
+    - libkonq5-dev.install: 1 file(s) removed;
+  
+  +++ Changes by Modestas Vainius:
+
+  * Resync 97_ patch.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 May 2008 20:58:22 +0300
+
 kdebase (4:4.0.72-1) experimental; urgency=low
 
   * New upstream development snapshot.

Modified: branches/kde4/packages/kdebase/debian/libkonq5-dev.install
===================================================================
--- branches/kde4/packages/kdebase/debian/libkonq5-dev.install	2008-05-05 17:12:40 UTC (rev 10474)
+++ branches/kde4/packages/kdebase/debian/libkonq5-dev.install	2008-05-05 18:00:35 UTC (rev 10475)
@@ -1,6 +1,5 @@
 usr/include/knewmenu.h
 usr/include/konq_events.h
-usr/include/konq_fileundomanager.h
 usr/include/konq_menuactions.h
 usr/include/konq_operations.h
 usr/include/konq_popupmenu.h

Modified: branches/kde4/packages/kdebase/debian/libkonq5.install
===================================================================
--- branches/kde4/packages/kdebase/debian/libkonq5.install	2008-05-05 17:12:40 UTC (rev 10474)
+++ branches/kde4/packages/kdebase/debian/libkonq5.install	2008-05-05 18:00:35 UTC (rev 10475)
@@ -1,7 +1,6 @@
 usr/lib/kde4/konq_sound.so
 usr/lib/libkonq.so.5
 usr/lib/libkonq.so.5.1.0
-usr/share/dbus-1/interfaces/org.kde.libkonq.FileUndoManager.xml
 usr/share/kde4/apps/konqueror/pics/arrow_bottomleft.png
 usr/share/kde4/apps/konqueror/pics/arrow_bottomright.png
 usr/share/kde4/apps/konqueror/pics/arrow_topleft.png

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-05-05 17:12:40 UTC (rev 10474)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff	2008-05-05 18:00:35 UTC (rev 10475)
@@ -179,28 +179,25 @@
  
    kde4_add_plugin(libnsplugin ${nsplugins_PART_SRCS})
  
--  target_link_libraries(libnsplugin  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} )
-+target_link_libraries(libnsplugin  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+-  target_link_libraries(libnsplugin ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY})
++  target_link_libraries(libnsplugin ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
  
    install(TARGETS libnsplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
 --- a/apps/dolphin/src/CMakeLists.txt
 +++ b/apps/dolphin/src/CMakeLists.txt
-@@ -52,7 +52,16 @@
+@@ -52,7 +52,13 @@
  
  configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
  
--target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES})
-+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES} )
-+
+-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES})
++target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES})
 +if (X11_FOUND)
 +  target_link_libraries(dolphinprivate ${X11_X11_LIB})
 +endif (X11_FOUND)
 +if (X11_Xext_FOUND)
 +  target_link_libraries(dolphinprivate ${X11_Xext_LIB})
 +endif (X11_Xext_FOUND)
-+
-+
  if(X11_Xrender_FOUND)
    target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
  endif(X11_Xrender_FOUND)




More information about the pkg-kde-commits mailing list