rev 10386 - in branches/kde4/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Apr 30 12:18:18 UTC 2008
Author: modax-guest
Date: 2008-04-30 12:18:18 +0000 (Wed, 30 Apr 2008)
New Revision: 10386
Added:
branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/control
branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen
branches/kde4/packages/kdelibs/debian/patches/series
Log:
My changes. Ready for experimental
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-04-30 12:03:34 UTC (rev 10385)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-04-30 12:18:18 UTC (rev 10386)
@@ -1,13 +1,12 @@
kde4libs (4:4.0.71+svn802698-1) experimental; urgency=low
* New upstream development snapshot:
- - The latest upstream commit is r801786 by pdamsten
- - Date: Wed Apr 30 09:58:16 2008 -0000
-
- * New upstream snapshot:
- - Fixes heap based buffer overflow via specially encoded image.
- CVE-2008-1670 (Closes: #478283)
+ - The latest upstream commit is r802693 by mojo
+ - Date: Wed, 30 Apr 2008 10:46:20 -0000
+ * Fixes heap based buffer overflow via specially encoded image.
+ CVE-2008-1670 (Closes: #478283)
+
+++ Changes by Modestas Vainius:
* 98_link_interfaces_library.diff - major update:
@@ -24,8 +23,15 @@
* Enhance 19_findqt4_optional_x11.diff patch. Do not implicitly add
-lphread.
* Build depend on libenchant-dev.
+ * Add 99_more_implicit_link_libs.diff which adds more implicit link
+ interface libraries to diverge from upstream as least as possible.
+ - In addition, kdecore implies QtDBus, QtXml, QtNetwork.
+ - In addition, kdeui implies QtSvg.
+ - In addition, kde3support and ktuils imply kparts.
+ - In addition, kio implies solid.
+ * Move dbus-1 XML interfaces to kdelibs5-dev.install.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 30 Apr 2008 14:00:51 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 30 Apr 2008 15:08:30 +0300
kde4libs (4:4.0.70+svn799089-2) experimental; urgency=low
Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control 2008-04-30 12:03:34 UTC (rev 10385)
+++ branches/kde4/packages/kdelibs/debian/control 2008-04-30 12:18:18 UTC (rev 10386)
@@ -43,7 +43,7 @@
Architecture: any
Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.6.0~), libqt4-dev (>= 4.4.0~), libsoprano-dev (>= 2.0.98)
Suggests: kdelibs5-doc (= ${source:Version})
-Replaces: kdebase-runtime-data (<< 4:4.0.60)
+Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.71)
Conflicts: kdelibs4-dev
Description: development files for the KDE 4 core libraries
This package contains development files for building KDE 4 applications and
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.install 2008-04-30 12:03:34 UTC (rev 10385)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.install 2008-04-30 12:18:18 UTC (rev 10386)
@@ -9,20 +9,6 @@
etc/kde4/ksslcalist
etc/kde4/ui/ui_standards.rc
etc/xdg/menus/kde4-applications.menu
-usr/share/dbus-1/interfaces/org.kde.JobView.xml
-usr/share/dbus-1/interfaces/org.kde.JobViewServer.xml
-usr/share/dbus-1/interfaces/org.kde.KCookieServer.xml
-usr/share/dbus-1/interfaces/org.kde.KDirNotify.xml
-usr/share/dbus-1/interfaces/org.kde.KHTMLPart.xml
-usr/share/dbus-1/interfaces/org.kde.KIMIface.xml
-usr/share/dbus-1/interfaces/org.kde.KLauncher.xml
-usr/share/dbus-1/interfaces/org.kde.KMediaPlayer.xml
-usr/share/dbus-1/interfaces/org.kde.KSpeech.xml
-usr/share/dbus-1/interfaces/org.kde.KWallet.xml
-usr/share/dbus-1/interfaces/org.kde.KdedGlobalAccel.xml
-usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-usr/share/dbus-1/interfaces/org.kde.Solid.Networking.Client.xml
-usr/share/dbus-1/interfaces/org.kde.kded.xml
usr/share/doc/kde4/HTML/en/common
usr/share/doc/kde4/HTML/en/common/1.png
usr/share/doc/kde4/HTML/en/common/10.png
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install 2008-04-30 12:03:34 UTC (rev 10385)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install 2008-04-30 12:18:18 UTC (rev 10386)
@@ -819,6 +819,21 @@
usr/lib/libnepomuk.so
usr/lib/libsolid.so
usr/lib/libthreadweaver.so
+usr/share/dbus-1/interfaces/org.kde.JobView.xml
+usr/share/dbus-1/interfaces/org.kde.JobViewServer.xml
+usr/share/dbus-1/interfaces/org.kde.KCookieServer.xml
+usr/share/dbus-1/interfaces/org.kde.KDirNotify.xml
+usr/share/dbus-1/interfaces/org.kde.KHTMLPart.xml
+usr/share/dbus-1/interfaces/org.kde.KIMIface.xml
+usr/share/dbus-1/interfaces/org.kde.KLauncher.xml
+usr/share/dbus-1/interfaces/org.kde.KMediaPlayer.xml
+usr/share/dbus-1/interfaces/org.kde.KSpeech.xml
+usr/share/dbus-1/interfaces/org.kde.KWallet.xml
+usr/share/dbus-1/interfaces/org.kde.KdedGlobalAccel.xml
+usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+usr/share/dbus-1/interfaces/org.kde.Solid.Networking.Client.xml
+usr/share/dbus-1/interfaces/org.kde.kded.xml
+usr/share/dbus-1/interfaces/org.kde.kio.FileUndoManager.xml
usr/share/kde4/apps/cmake/modules/CheckPointerMember.cmake
usr/share/kde4/apps/cmake/modules/CheckPrototypeExists.cmake
usr/share/kde4/apps/cmake/modules/CheckStructMember.cmake
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen 2008-04-30 12:03:34 UTC (rev 10385)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen 2008-04-30 12:18:18 UTC (rev 10386)
@@ -3,3 +3,4 @@
link:usr/lib/.+\.so\.[\d.]+$
dst:apps/cmake/
dst:/include/
+dst:dbus-\d+/interfaces/.*\.xml
Added: branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff 2008-04-30 12:18:18 UTC (rev 10386)
@@ -0,0 +1,55 @@
+--- kde4libs.orig/kde3support/CMakeLists.txt 2008-04-30 13:33:38.000000000 +0300
++++ kde4libs/kde3support/CMakeLists.txt 2008-04-30 13:33:56.000000000 +0300
+@@ -80,7 +80,7 @@
+
+ target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY}
+ ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_X11_LIB} )
+-set_target_properties(kde3support PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui;${QT_QTGUI_LIBRARY};kio;${QT_QT3SUPPORT_LIBRARY}")
++set_target_properties(kde3support PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui;${QT_QTGUI_LIBRARY};kio;${QT_QT3SUPPORT_LIBRARY};kparts")
+
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kdecore/CMakeLists.txt 2008-04-30 13:29:51.000000000 +0300
++++ kde4libs/kdecore/CMakeLists.txt 2008-04-30 13:30:11.000000000 +0300
+@@ -243,7 +243,7 @@
+ kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
+
+ target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
+-set_target_properties(kdecore PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY}")
++set_target_properties(kdecore PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTNETWORK_LIBRARY};${QT_QTDBUS_LIBRARY};${QT_QTXML_LIBRARY}")
+
+ set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+ install(TARGETS kdecore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kdeui/CMakeLists.txt 2008-04-30 13:30:17.000000000 +0300
++++ kde4libs/kdeui/CMakeLists.txt 2008-04-30 13:30:41.000000000 +0300
+@@ -281,7 +281,7 @@
+ kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
+
+ target_link_libraries(kdeui ${QT_QTSVG_LIBRARY} ${KDE4_KDECORE_LIBS} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+-set_target_properties(kdeui PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kdecore" )
++set_target_properties(kdeui PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTSVG_LIBRARY};kdecore" )
+
+ if(MINGW)
+ target_link_libraries(kdeui gdi32)
+--- kde4libs.orig/kio/CMakeLists.txt 2008-04-30 13:31:18.000000000 +0300
++++ kde4libs/kio/CMakeLists.txt 2008-04-30 13:31:29.000000000 +0300
+@@ -241,7 +241,7 @@
+ target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY} ${X11_X11_LIB}
+ ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_SOLID_LIBS}
+ ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} )
+-set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui")
++set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui;solid")
+
+
+ set(SYS_INOTIFY_H_FOUND 0)
+--- kde4libs.orig/kutils/CMakeLists.txt 2008-04-30 13:34:02.000000000 +0300
++++ kde4libs/kutils/CMakeLists.txt 2008-04-30 13:34:20.000000000 +0300
+@@ -31,7 +31,7 @@
+ kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
+
+ target_link_libraries(kutils ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY} )
+-set_target_properties(kutils PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kdeui")
++set_target_properties(kutils PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kdeui;kparts")
+
+ set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kutils ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-04-30 12:03:34 UTC (rev 10385)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-04-30 12:18:18 UTC (rev 10386)
@@ -11,3 +11,4 @@
19_findqt4_optional_x11_pthread.diff
97_use_imported_targets_with_cmake26.diff
98_link_interface_libraries.diff
+99_more_implicit_link_libs.diff
More information about the pkg-kde-commits
mailing list