rev 10670 - in branches/kde4/packages/kdebase/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Thu May 22 00:14:40 UTC 2008
Author: modax-guest
Date: 2008-05-22 00:14:39 +0000 (Thu, 22 May 2008)
New Revision: 10670
Modified:
branches/kde4/packages/kdebase/debian/changelog
branches/kde4/packages/kdebase/debian/libkonq5-dev.install
branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
Log:
kdebase kde4.1b1
Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog 2008-05-21 23:20:49 UTC (rev 10669)
+++ branches/kde4/packages/kdebase/debian/changelog 2008-05-22 00:14:39 UTC (rev 10670)
@@ -1,3 +1,14 @@
+kdebase (4:4.0.80-1~pre1) UNRELEASED; urgency=low
+
+ * New upstream development milestone (KDE 4.1 Beta1).
+
+ +++ Changes by Modestas Vainius:
+
+ * Resync 97_ patch.
+ * Update install files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 22 May 2008 02:58:28 +0300
+
kdebase (4:4.0.74-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-21 23:20:49 UTC (rev 10669)
+++ branches/kde4/packages/kdebase/debian/libkonq5-dev.install 2008-05-22 00:14:39 UTC (rev 10670)
@@ -6,3 +6,5 @@
usr/include/konqmimedata.h
usr/include/libkonq_export.h
usr/lib/libkonq.so
+usr/include/konq_popupmenuplugin.h
+usr/include/konq_popupmenuinformation.h
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-21 23:20:49 UTC (rev 10669)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff 2008-05-22 00:14:39 UTC (rev 10670)
@@ -17,9 +17,9 @@
set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
-@@ -74,7 +75,7 @@
- qt4_add_dbus_interface(konqueror_KDEINIT_SRCS org.kde.Konqueror.UndoManager.xml konqundomanager_interface)
-
+@@ -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)
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})
@@ -28,12 +28,12 @@
--- a/apps/lib/konq/CMakeLists.txt
+++ b/apps/lib/konq/CMakeLists.txt
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@
kde4_add_library(konq SHARED ${konq_LIB_SRCS})
--target_link_libraries(konq ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS})
-+target_link_libraries(konq ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY})
+-target_link_libraries(konq ${KDE4_KPARTS_LIBS})
++target_link_libraries(konq ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY})
set_target_properties(konq PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
install(TARGETS konq ${INSTALL_TARGETS_DEFAULT_ARGS})
More information about the pkg-kde-commits
mailing list