rev 14893 - in trunk/packages/kdelibs/debian: . patches

George Kiagiadakis gkiagia-guest at alioth.debian.org
Sat Jun 6 17:21:03 UTC 2009 

Author: gkiagia-guest
Date: 2009-06-06 17:21:03 +0000 (Sat, 06 Jun 2009)
New Revision: 14893

Removed:
   trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs5-data.install
   trunk/packages/kdelibs/debian/kdelibs5-dev.install
   trunk/packages/kdelibs/debian/kdelibs5.install
   trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
   trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
   trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
   trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
   trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
   trunk/packages/kdelibs/debian/patches/16_debian_menu.diff
   trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
   trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
   trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
   trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
   trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
   trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
   trunk/packages/kdelibs/debian/patches/series
   trunk/packages/kdelibs/debian/rules
Log:
kdelibs 4.2.90


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/changelog	2009-06-06 17:21:03 UTC (rev 14893)
@@ -1,3 +1,24 @@
+kde4libs (4:4.2.90+svn977732-0r1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+  +++ Changes by George Kiagiadakis:
+
+  * Refresh patches.
+  * Bump build dependency on Qt4 to version 4.5.1.
+  * Bump build dependency on automoc to version 1.0~version-0.9.88.
+  * Bump build dependency on soprano to version 2.1.68.
+  * Remove patch 24_runtime_qt45_locale_initialization.diff as
+    we now build-depend on Qt 4.5.
+  * Update installed files.
+  * Add myself to uploaders.
+  * Update replaces: kdelibs-dev replaces kdebase-runtime-data (<< 4.2.90).
+  * Update RUNTIME_DEPS variable in debian/rules to point to
+    kdebase-runtime (>= 4.2.90).
+  * Update recommends: kdelibs5 recommends kdebase-runtime (>= 4.2.90).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Jun 2009 13:37:03 +0300
+
 kde4libs (4:4.2.4-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/control	2009-06-06 17:21:03 UTC (rev 14893)
@@ -2,18 +2,18 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, cmake (>= 2.6.3), pkg-kde-tools (>= 0.4.2),
  shared-mime-info (>= 0.20), libphonon-dev (>= 4:4.3.0),
- libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.3), libqt4-opengl-dev (>= 4.4.3),
+ libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4.5.1), libqt4-opengl-dev (>= 4.5.1),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libpng-dev, libssl-dev, libsm-dev,
- libsoprano-dev (>= 2.1.67), libstreamanalyzer-dev (>= 0.6.3),
+ libsoprano-dev (>= 2.1.68), libstreamanalyzer-dev (>= 0.6.3),
  libxml2-dev, libxml2-utils,  libxslt1-dev, libxtst-dev, libgif-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
  libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,
- libglu1-mesa-dev, libenchant-dev, libacl1-dev, automoc (>= 1.0~svn850570),
+ libglu1-mesa-dev, libenchant-dev, libacl1-dev, automoc (>= 1.0~version-0.9.88),
  libxcursor-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
@@ -25,7 +25,7 @@
 Depends: ${shlibs:Depends}, kdelibs5-data (>= ${source:Version}),
  kdelibs-bin(>= ${binary:Version}), dbus-x11, shared-mime-info, xauth, xdg-utils
 Pre-Depends: debconf | debconf-2.0
-Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.2.2), kaboom (>= 1.0.5)
+Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.2.90), kaboom (>= 1.0.5)
 Conflicts: kdebase-workspace-libs4+5 (<< 4.2.2), kdepimlibs5 (<< 4.2.2)
 Replaces: kdelibs-bin (<< 4:4.1.74)
 Suggests: hspell
@@ -53,7 +53,7 @@
  ${sameVersionDep:libqt4-dev}, ${sameVersionDep:libsoprano-dev}, ${sameVersionDep:libphonon-dev}
 #Suggests: kdelibs5-doc (= ${source:Version})
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
-Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1), libplasma-dev (<< 4:4.1.96)
+Replaces: kdebase-runtime-data (<< 4:4.2.90), kdelibs5-data (<< 4:4.0.80-1), libplasma-dev (<< 4:4.1.96)
 Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439), libplasma-dev (<< 4:4.1.96)
 Provides: libplasma-dev
 Description: development files for the KDE 4 core libraries

Modified: trunk/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-data.install	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/kdelibs5-data.install	2009-06-06 17:21:03 UTC (rev 14893)
@@ -114,10 +114,12 @@
 usr/share/kde4/apps/katepart/syntax/asm6502.xml
 usr/share/kde4/apps/katepart/syntax/asn1.xml
 usr/share/kde4/apps/katepart/syntax/asp.xml
+usr/share/kde4/apps/katepart/syntax/asterisk.xml
 usr/share/kde4/apps/katepart/syntax/awk.xml
 usr/share/kde4/apps/katepart/syntax/bash.xml
 usr/share/kde4/apps/katepart/syntax/bibtex.xml
 usr/share/kde4/apps/katepart/syntax/bmethod.xml
+usr/share/kde4/apps/katepart/syntax/boo.xml
 usr/share/kde4/apps/katepart/syntax/c.xml
 usr/share/kde4/apps/katepart/syntax/cg.xml
 usr/share/kde4/apps/katepart/syntax/cgis.xml
@@ -182,6 +184,7 @@
 usr/share/kde4/apps/katepart/syntax/literate-haskell.xml
 usr/share/kde4/apps/katepart/syntax/logtalk.xml
 usr/share/kde4/apps/katepart/syntax/lpc.xml
+usr/share/kde4/apps/katepart/syntax/lsl.xml
 usr/share/kde4/apps/katepart/syntax/lua.xml
 usr/share/kde4/apps/katepart/syntax/m3u.xml
 usr/share/kde4/apps/katepart/syntax/mab.xml
@@ -261,7 +264,6 @@
 usr/share/kde4/apps/katepart/syntax/yacc.xml
 usr/share/kde4/apps/katepart/syntax/yaml.xml
 usr/share/kde4/apps/katepart/syntax/zonnon.xml
-usr/share/kde4/apps/kcertpart/kcertpart.rc
 usr/share/kde4/apps/kcharselect/kcharselect-data
 usr/share/kde4/apps/kcm_componentchooser/kcm_instantmessenger.desktop
 usr/share/kde4/apps/kcm_componentchooser/kcm_ktexteditor.desktop
@@ -272,6 +274,8 @@
 usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd
 usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
 usr/share/kde4/apps/kconf_update/move_kio_help_cache.sh
+usr/share/kde4/apps/kconf_update/plasma_popupapplet_fix_groups.pl
+usr/share/kde4/apps/kconf_update/plasma_popupapplet_fix_groups.upd
 usr/share/kde4/apps/kconf_update/proxytype.pl
 usr/share/kde4/apps/kconf_update/useragent.pl
 usr/share/kde4/apps/kdeui/about/bar-bottom-left.png
@@ -354,7 +358,6 @@
 usr/share/kde4/apps/kjava/kjava.jar
 usr/share/kde4/apps/kjava/kjava.policy
 usr/share/kde4/apps/kjava/pluginsinfo
-usr/share/kde4/apps/knewstuff/pics/ghns.png
 usr/share/kde4/apps/knewstuff/pics/ghns_star.png
 usr/share/kde4/apps/knewstuff/pics/ghns_star_gray.png
 usr/share/kde4/apps/knewstuff/pics/thumb_frame.png
@@ -782,6 +785,24 @@
 usr/share/kde4/apps/ksgmltools2/customization/lt/lang.entities
 usr/share/kde4/apps/ksgmltools2/customization/lt/strings.entities
 usr/share/kde4/apps/ksgmltools2/customization/lt/user.entities
+usr/share/kde4/apps/ksgmltools2/customization/nds/catalog.xml
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/fdl-notice.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/gpl-notice.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/help-menu.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/install-compile.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/install-intro.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/lgpl-notice.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/report-bugs.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/underArtisticLicense.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/underBSDLicense.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/underFDL.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/underGPL.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/underLGPL.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/underX11License.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/entities/update-doc.docbook
+usr/share/kde4/apps/ksgmltools2/customization/nds/lang.entities
+usr/share/kde4/apps/ksgmltools2/customization/nds/strings.entities
+usr/share/kde4/apps/ksgmltools2/customization/nds/user.entities
 usr/share/kde4/apps/ksgmltools2/customization/nl/catalog.xml
 usr/share/kde4/apps/ksgmltools2/customization/nl/entities/fdl-notice.docbook
 usr/share/kde4/apps/ksgmltools2/customization/nl/entities/gpl-notice.docbook
@@ -1119,6 +1140,7 @@
 usr/share/kde4/apps/ksgmltools2/customization/xsl/it.xml
 usr/share/kde4/apps/ksgmltools2/customization/xsl/ja.xml
 usr/share/kde4/apps/ksgmltools2/customization/xsl/ko.xml
+usr/share/kde4/apps/ksgmltools2/customization/xsl/nds.xml
 usr/share/kde4/apps/ksgmltools2/customization/xsl/nl.xml
 usr/share/kde4/apps/ksgmltools2/customization/xsl/nn.xml
 usr/share/kde4/apps/ksgmltools2/customization/xsl/no.xml
@@ -1286,9 +1308,10 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/la.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/labels.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/lt.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/nb.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/nds.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/nl.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/nn.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/no.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/olink.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pi.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pl.xml
@@ -1839,7 +1862,6 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
 usr/share/kde4/apps/kssl/ca-bundle.crt
-usr/share/kde4/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
 usr/share/kde4/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 usr/share/kde4/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
 usr/share/kde4/apps/nepomuk/pics/rating.png
@@ -1856,7 +1878,6 @@
 usr/share/kde4/config/ksslcalist
 usr/share/kde4/config/plasmoids.knsrc
 usr/share/kde4/config/ui/ui_standards.rc
-usr/share/kde4/services/crypto.desktop
 usr/share/kde4/services/data.protocol
 usr/share/kde4/services/emoticonstheme_adium.desktop
 usr/share/kde4/services/emoticonstheme_kde.desktop
@@ -1870,7 +1891,6 @@
 usr/share/kde4/services/http_cache_cleaner.desktop
 usr/share/kde4/services/https.protocol
 usr/share/kde4/services/katepart.desktop
-usr/share/kde4/services/kcertpart.desktop
 usr/share/kde4/services/kded/kcookiejar.desktop
 usr/share/kde4/services/kded/kssld.desktop
 usr/share/kde4/services/kded/proxyscout.desktop
@@ -1883,8 +1903,6 @@
 usr/share/kde4/services/kspell_aspell.desktop
 usr/share/kde4/services/kspell_enchant.desktop
 usr/share/kde4/services/kspell_hspell.desktop
-usr/share/kde4/services/ktexteditor_docwordcompletion.desktop
-usr/share/kde4/services/ktexteditor_docwordcompletion_config.desktop
 usr/share/kde4/services/ktexteditor_insertfile.desktop
 usr/share/kde4/services/ktexteditor_kdatatool.desktop
 usr/share/kde4/services/ktexteditor_python-encoding.desktop
@@ -1953,6 +1971,7 @@
 usr/share/kde4/servicetypes/ktexteditorplugin.desktop
 usr/share/kde4/servicetypes/kurifilterplugin.desktop
 usr/share/kde4/servicetypes/plasma-animator.desktop
+usr/share/kde4/servicetypes/plasma-applet-popupapplet.desktop
 usr/share/kde4/servicetypes/plasma-applet.desktop
 usr/share/kde4/servicetypes/plasma-containment.desktop
 usr/share/kde4/servicetypes/plasma-dataengine.desktop

Modified: trunk/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-dev.install	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/kdelibs5-dev.install	2009-06-06 17:21:03 UTC (rev 14893)
@@ -292,6 +292,7 @@
 usr/include/KDE/KDirModel
 usr/include/KDE/KDirOperator
 usr/include/KDE/KDirSelectDialog
+usr/include/KDE/KDirSortFilterProxyModel
 usr/include/KDE/KDirWatch
 usr/include/KDE/KDiskFreeSpace
 usr/include/KDE/KDiskFreeSpaceInfo
@@ -312,23 +313,27 @@
 usr/include/KDE/KFileDialog
 usr/include/KDE/KFileFilterCombo
 usr/include/KDE/KFileItem
+usr/include/KDE/KFileItemActions
 usr/include/KDE/KFileItemDelegate
 usr/include/KDE/KFileItemList
+usr/include/KDE/KFileItemListProperties
 usr/include/KDE/KFileMetaInfo
 usr/include/KDE/KFileMetaInfoGroup
 usr/include/KDE/KFileMetaInfoItem
 usr/include/KDE/KFilePlacesModel
+usr/include/KDE/KFilePlacesView
+usr/include/KDE/KFilePreviewGenerator
 usr/include/KDE/KFileShare
 usr/include/KDE/KFileSharePropsPlugin
 usr/include/KDE/KFileTreeBranch
 usr/include/KDE/KFileTreeView
+usr/include/KDE/KFileWidget
 usr/include/KDE/KFilterBase
 usr/include/KDE/KFilterDev
 usr/include/KDE/KFilterProxySearchLine
 usr/include/KDE/KFind
 usr/include/KDE/KFindDialog
 usr/include/KDE/KFloatValidator
-usr/include/KDE/KFolderType
 usr/include/KDE/KFontAction
 usr/include/KDE/KFontChooser
 usr/include/KDE/KFontComboBox
@@ -357,6 +362,7 @@
 usr/include/KDE/KIEBookmarkImporter
 usr/include/KDE/KIEBookmarkImporterImpl
 usr/include/KDE/KIMProxy
+usr/include/KDE/KIO/AccessManager
 usr/include/KDE/KIO/AuthInfo
 usr/include/KDE/KIO/ChmodJob
 usr/include/KDE/KIO/Connection
@@ -441,6 +447,7 @@
 usr/include/KDE/KMimeTypeResolver
 usr/include/KDE/KMimeTypeTrader
 usr/include/KDE/KMimeTypeValidator
+usr/include/KDE/KModifierKeyInfo
 usr/include/KDE/KMozillaBookmarkImporterImpl
 usr/include/KDE/KMultiTabBar
 usr/include/KDE/KMultiTabBarButton
@@ -747,6 +754,7 @@
 usr/include/KDE/Plasma/Delegate
 usr/include/KDE/Plasma/Dialog
 usr/include/KDE/Plasma/Extender
+usr/include/KDE/Plasma/ExtenderGroup
 usr/include/KDE/Plasma/ExtenderItem
 usr/include/KDE/Plasma/FlashingLabel
 usr/include/KDE/Plasma/Frame
@@ -771,13 +779,16 @@
 usr/include/KDE/Plasma/RunnerScript
 usr/include/KDE/Plasma/ScriptEngine
 usr/include/KDE/Plasma/ScrollBar
+usr/include/KDE/Plasma/ScrollWidget
 usr/include/KDE/Plasma/Service
 usr/include/KDE/Plasma/ServiceJob
 usr/include/KDE/Plasma/SignalPlotter
 usr/include/KDE/Plasma/Slider
+usr/include/KDE/Plasma/SpinBox
 usr/include/KDE/Plasma/Svg
 usr/include/KDE/Plasma/SvgWidget
 usr/include/KDE/Plasma/TabBar
+usr/include/KDE/Plasma/TextBrowser
 usr/include/KDE/Plasma/TextEdit
 usr/include/KDE/Plasma/Theme
 usr/include/KDE/Plasma/ToolButton
@@ -785,6 +796,7 @@
 usr/include/KDE/Plasma/ToolTipManager
 usr/include/KDE/Plasma/TreeView
 usr/include/KDE/Plasma/Version
+usr/include/KDE/Plasma/VideoWidget
 usr/include/KDE/Plasma/View
 usr/include/KDE/Plasma/Wallpaper
 usr/include/KDE/Plasma/WebView
@@ -811,6 +823,11 @@
 usr/include/KDE/Solid/StorageAccess
 usr/include/KDE/Solid/StorageDrive
 usr/include/KDE/Solid/StorageVolume
+usr/include/KDE/Sonnet/ConfigDialog
+usr/include/KDE/Sonnet/ConfigWidget
+usr/include/KDE/Sonnet/Dialog
+usr/include/KDE/Sonnet/DictionaryComboBox
+usr/include/KDE/Sonnet/Highlighter
 usr/include/KDE/SshProcess
 usr/include/KDE/StubProcess
 usr/include/KDE/SuProcess
@@ -1016,6 +1033,7 @@
 usr/include/kde3support_export.h
 usr/include/kde_file.h
 usr/include/kde_terminal_interface.h
+usr/include/kde_terminal_interface_v2.h
 usr/include/kdebug.h
 usr/include/kdecore_export.h
 usr/include/kdedmodule.h
@@ -1063,7 +1081,9 @@
 usr/include/kfiledialog.h
 usr/include/kfilefiltercombo.h
 usr/include/kfileitem.h
+usr/include/kfileitemactions.h
 usr/include/kfileitemdelegate.h
+usr/include/kfileitemlistproperties.h
 usr/include/kfilemetainfo.h
 usr/include/kfilemetainfoitem.h
 usr/include/kfileplacesmodel.h
@@ -1122,6 +1142,7 @@
 usr/include/kimproxy.h
 usr/include/kimproxy_export.h
 usr/include/kinputdialog.h
+usr/include/kio/accessmanager.h
 usr/include/kio/authinfo.h
 usr/include/kio/chmodjob.h
 usr/include/kio/connection.h
@@ -1157,8 +1178,10 @@
 usr/include/kio/slavebase.h
 usr/include/kio/slaveconfig.h
 usr/include/kio/slaveinterface.h
+usr/include/kio/sslui.h
 usr/include/kio/tcpslavebase.h
 usr/include/kio/thumbcreator.h
+usr/include/kio/thumbsequencecreator.h
 usr/include/kio/udsentry.h
 usr/include/kjob.h
 usr/include/kjobtrackerinterface.h
@@ -1199,6 +1222,7 @@
 usr/include/kmimetypechooser.h
 usr/include/kmimetyperesolver.h
 usr/include/kmimetypetrader.h
+usr/include/kmodifierkeyinfo.h
 usr/include/kmountpoint.h
 usr/include/kmultitabbar.h
 usr/include/knewpassworddialog.h
@@ -1351,6 +1375,7 @@
 usr/include/ktabbar.h
 usr/include/ktabwidget.h
 usr/include/ktar.h
+usr/include/ktcpsocket.h
 usr/include/ktempdir.h
 usr/include/ktemporaryfile.h
 usr/include/ktextbrowser.h
@@ -1479,6 +1504,7 @@
 usr/include/plasma/delegate.h
 usr/include/plasma/dialog.h
 usr/include/plasma/extender.h
+usr/include/plasma/extendergroup.h
 usr/include/plasma/extenderitem.h
 usr/include/plasma/framesvg.h
 usr/include/plasma/glapplet.h
@@ -1492,6 +1518,7 @@
 usr/include/plasma/querymatch.h
 usr/include/plasma/runnercontext.h
 usr/include/plasma/runnermanager.h
+usr/include/plasma/runnersyntax.h
 usr/include/plasma/scripting/appletscript.h
 usr/include/plasma/scripting/dataenginescript.h
 usr/include/plasma/scripting/runnerscript.h
@@ -1518,13 +1545,17 @@
 usr/include/plasma/widgets/pushbutton.h
 usr/include/plasma/widgets/radiobutton.h
 usr/include/plasma/widgets/scrollbar.h
+usr/include/plasma/widgets/scrollwidget.h
 usr/include/plasma/widgets/signalplotter.h
 usr/include/plasma/widgets/slider.h
+usr/include/plasma/widgets/spinbox.h
 usr/include/plasma/widgets/svgwidget.h
 usr/include/plasma/widgets/tabbar.h
+usr/include/plasma/widgets/textbrowser.h
 usr/include/plasma/widgets/textedit.h
 usr/include/plasma/widgets/toolbutton.h
 usr/include/plasma/widgets/treeview.h
+usr/include/plasma/widgets/videowidget.h
 usr/include/plasma/widgets/webview.h
 usr/include/predicateproperties.h
 usr/include/qtest_kde.h
@@ -1548,6 +1579,7 @@
 usr/include/solid/powermanagement.h
 usr/include/solid/predicate.h
 usr/include/solid/processor.h
+usr/include/solid/serialinterface.h
 usr/include/solid/solid_export.h
 usr/include/solid/solidnamespace.h
 usr/include/solid/storageaccess.h
@@ -1614,12 +1646,16 @@
 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.KPasswdServer.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.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/BasicFindPackageVersion.cmake.in
+usr/share/kde4/apps/cmake/modules/CheckCXXSourceCompiles.cmake
+usr/share/kde4/apps/cmake/modules/CheckCXXSourceRuns.cmake
+usr/share/kde4/apps/cmake/modules/CheckCXXSymbolExists.cmake
 usr/share/kde4/apps/cmake/modules/CheckPointerMember.cmake
 usr/share/kde4/apps/cmake/modules/CheckPrototypeExists.cmake
 usr/share/kde4/apps/cmake/modules/CheckStructMember.cmake
@@ -1653,6 +1689,7 @@
 usr/share/kde4/apps/cmake/modules/FindGStreamer.cmake
 usr/share/kde4/apps/cmake/modules/FindGettext.cmake
 usr/share/kde4/apps/cmake/modules/FindGphoto2.cmake
+usr/share/kde4/apps/cmake/modules/FindIOKit.cmake
 usr/share/kde4/apps/cmake/modules/FindKDE4Internal.cmake
 usr/share/kde4/apps/cmake/modules/FindKDE4Workspace.cmake
 usr/share/kde4/apps/cmake/modules/FindKDEWIN32.cmake
@@ -1660,7 +1697,6 @@
 usr/share/kde4/apps/cmake/modules/FindKNepomuk.cmake
 usr/share/kde4/apps/cmake/modules/FindKdcraw.cmake
 usr/share/kde4/apps/cmake/modules/FindKdeMultimedia.cmake
-usr/share/kde4/apps/cmake/modules/FindKdepim.cmake
 usr/share/kde4/apps/cmake/modules/FindKdepimLibs.cmake
 usr/share/kde4/apps/cmake/modules/FindKexiv2.cmake
 usr/share/kde4/apps/cmake/modules/FindKipi.cmake
@@ -1670,6 +1706,7 @@
 usr/share/kde4/apps/cmake/modules/FindLCMS.cmake
 usr/share/kde4/apps/cmake/modules/FindLibArt.cmake
 usr/share/kde4/apps/cmake/modules/FindLibKonq.cmake
+usr/share/kde4/apps/cmake/modules/FindLibLZMA.cmake
 usr/share/kde4/apps/cmake/modules/FindLibPython.py
 usr/share/kde4/apps/cmake/modules/FindLibXml2.cmake
 usr/share/kde4/apps/cmake/modules/FindLibXslt.cmake
@@ -1686,9 +1723,11 @@
 usr/share/kde4/apps/cmake/modules/FindOpenSSL.cmake
 usr/share/kde4/apps/cmake/modules/FindPCRE.cmake
 usr/share/kde4/apps/cmake/modules/FindPhonon.cmake
+usr/share/kde4/apps/cmake/modules/FindPkgConfig.cmake
 usr/share/kde4/apps/cmake/modules/FindPlasma.cmake
 usr/share/kde4/apps/cmake/modules/FindPopplerQt4.cmake
 usr/share/kde4/apps/cmake/modules/FindPostgreSQL.cmake
+usr/share/kde4/apps/cmake/modules/FindPulseAudio.cmake
 usr/share/kde4/apps/cmake/modules/FindPyKDE4.cmake
 usr/share/kde4/apps/cmake/modules/FindPyKDE4.py
 usr/share/kde4/apps/cmake/modules/FindPyQt.py
@@ -1713,7 +1752,7 @@
 usr/share/kde4/apps/cmake/modules/FindXKB.cmake
 usr/share/kde4/apps/cmake/modules/FindXine.cmake
 usr/share/kde4/apps/cmake/modules/FindXmms.cmake
-usr/share/kde4/apps/cmake/modules/KDE4CTestNightlySetup.cmake
+usr/share/kde4/apps/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake
 usr/share/kde4/apps/cmake/modules/KDE4Defaults.cmake
 usr/share/kde4/apps/cmake/modules/KDE4Macros.cmake
 usr/share/kde4/apps/cmake/modules/KDELibs4LibraryTargets-debian.cmake
@@ -1744,6 +1783,7 @@
 usr/share/kde4/apps/cmake/modules/check_installed_exports_file.cmake
 usr/share/kde4/apps/cmake/modules/cmake-modules-styleguide.txt
 usr/share/kde4/apps/cmake/modules/config-alsa.h.cmake
+usr/share/kde4/apps/cmake/modules/create_exe_symlink.cmake
 usr/share/kde4/apps/cmake/modules/kde4_cmake_uninstall.cmake.in
 usr/share/kde4/apps/cmake/modules/kde4_exec_via_sh.cmake
 usr/share/kde4/apps/cmake/modules/kde4automoc.files.in

Modified: trunk/packages/kdelibs/debian/kdelibs5.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5.install	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/kdelibs5.install	2009-06-06 17:21:03 UTC (rev 14893)
@@ -3,8 +3,6 @@
 usr/lib/kde4/emoticonstheme_pidgin.so
 usr/lib/kde4/emoticonstheme_xmpp.so
 usr/lib/kde4/katepart.so
-usr/lib/kde4/kcertpart.so
-usr/lib/kde4/kcm_crypto.so
 usr/lib/kde4/kded_kcookiejar.so
 usr/lib/kde4/kded_kssld.so
 usr/lib/kde4/kded_proxyscout.so
@@ -25,7 +23,6 @@
 usr/lib/kde4/kspell_aspell.so
 usr/lib/kde4/kspell_enchant.so
 usr/lib/kde4/kspell_hspell.so
-usr/lib/kde4/ktexteditor_docwordcompletion.so
 usr/lib/kde4/ktexteditor_insertfile.so
 usr/lib/kde4/ktexteditor_kdatatool.so
 usr/lib/kde4/ktexteditor_python-encoding.so
@@ -59,63 +56,63 @@
 usr/lib/kde4/plugins/imageformats/kimg_xcf.so
 usr/lib/kde4/plugins/imageformats/kimg_xview.so
 usr/lib/kde4/plugins/script/libkrossqtsplugin.so.4
-usr/lib/kde4/plugins/script/libkrossqtsplugin.so.4.2.0
+usr/lib/kde4/plugins/script/libkrossqtsplugin.so.4.3.0
 usr/lib/kde4/spellcheckplugin.so
 usr/lib/libkde3support.so.4
-usr/lib/libkde3support.so.4.2.0
+usr/lib/libkde3support.so.4.3.0
 usr/lib/libkdecore.so.5
-usr/lib/libkdecore.so.5.2.0
+usr/lib/libkdecore.so.5.3.0
 usr/lib/libkdefakes.so.5
-usr/lib/libkdefakes.so.5.2.0
+usr/lib/libkdefakes.so.5.3.0
 usr/lib/libkdeinit4_kconf_update.so
 usr/lib/libkdeinit4_kio_http_cache_cleaner.so
 usr/lib/libkdeinit4_klauncher.so
 usr/lib/libkdesu.so.5
-usr/lib/libkdesu.so.5.2.0
+usr/lib/libkdesu.so.5.3.0
 usr/lib/libkdeui.so.5
-usr/lib/libkdeui.so.5.2.0
+usr/lib/libkdeui.so.5.3.0
 usr/lib/libkdnssd.so.4
-usr/lib/libkdnssd.so.4.2.0
+usr/lib/libkdnssd.so.4.3.0
 usr/lib/libkfile.so.4
-usr/lib/libkfile.so.4.2.0
+usr/lib/libkfile.so.4.3.0
 usr/lib/libkhtml.so.5
-usr/lib/libkhtml.so.5.2.0
+usr/lib/libkhtml.so.5.3.0
 usr/lib/libkimproxy.so.4
-usr/lib/libkimproxy.so.4.2.0
+usr/lib/libkimproxy.so.4.3.0
 usr/lib/libkio.so.5
-usr/lib/libkio.so.5.2.0
+usr/lib/libkio.so.5.3.0
 usr/lib/libkjs.so.4
-usr/lib/libkjs.so.4.2.0
+usr/lib/libkjs.so.4.3.0
 usr/lib/libkjsapi.so.4
-usr/lib/libkjsapi.so.4.2.0
+usr/lib/libkjsapi.so.4.3.0
 usr/lib/libkjsembed.so.4
-usr/lib/libkjsembed.so.4.2.0
+usr/lib/libkjsembed.so.4.3.0
 usr/lib/libkmediaplayer.so.4
-usr/lib/libkmediaplayer.so.4.2.0
+usr/lib/libkmediaplayer.so.4.3.0
 usr/lib/libknewstuff2.so.4
-usr/lib/libknewstuff2.so.4.2.0
+usr/lib/libknewstuff2.so.4.3.0
 usr/lib/libknotifyconfig.so.4
-usr/lib/libknotifyconfig.so.4.2.0
+usr/lib/libknotifyconfig.so.4.3.0
 usr/lib/libkntlm.so.4
-usr/lib/libkntlm.so.4.2.0
+usr/lib/libkntlm.so.4.3.0
 usr/lib/libkparts.so.4
-usr/lib/libkparts.so.4.2.0
+usr/lib/libkparts.so.4.3.0
 usr/lib/libkpty.so.4
-usr/lib/libkpty.so.4.2.0
+usr/lib/libkpty.so.4.3.0
 usr/lib/libkrosscore.so.4
-usr/lib/libkrosscore.so.4.2.0
+usr/lib/libkrosscore.so.4.3.0
 usr/lib/libkrossui.so.4
-usr/lib/libkrossui.so.4.2.0
+usr/lib/libkrossui.so.4.3.0
 usr/lib/libktexteditor.so.4
-usr/lib/libktexteditor.so.4.2.0
+usr/lib/libktexteditor.so.4.3.0
 usr/lib/libkunittest.so.4
-usr/lib/libkunittest.so.4.2.0
+usr/lib/libkunittest.so.4.3.0
 usr/lib/libkutils.so.4
-usr/lib/libkutils.so.4.2.0
+usr/lib/libkutils.so.4.3.0
 usr/lib/libnepomuk.so.4
-usr/lib/libnepomuk.so.4.2.0
+usr/lib/libnepomuk.so.4.3.0
 usr/lib/libsolid.so.4
-usr/lib/libsolid.so.4.2.0
+usr/lib/libsolid.so.4.3.0
 usr/lib/libthreadweaver.so.4
-usr/lib/libthreadweaver.so.4.2.0
+usr/lib/libthreadweaver.so.4.3.0
 usr/lib/qt4/plugins/designer/kdewidgets.so

Modified: trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -6,12 +6,12 @@
 Debug output is not completely disabled, because QT_NO_DEBUG is not set.
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -972,11 +972,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1010,11 +1010,13 @@
     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
 +   set(CMAKE_CXX_FLAGS_DEBIAN         "-DNDEBUG -DQT_NO_DEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
     set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
     set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")

Modified: trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -6,7 +6,7 @@
 In KDE 4.3 trunk this has been committed as r916186.
 --- a/kdecore/kdebugrc
 +++ b/kdecore/kdebugrc
-@@ -78,7 +78,7 @@ InfoOutput=4
+@@ -78,7 +78,7 @@
  
  # KMail
  [5006]
@@ -15,45 +15,3 @@
  
  [5120]
  InfoOutput=2
---- a/kdecore/io/kdebug.cpp
-+++ b/kdecore/io/kdebug.cpp
-@@ -181,6 +181,11 @@ struct KDebugPrivate
-         QtOutput = 2,
-         SyslogOutput = 3,
-         NoOutput = 4,
-+#ifdef QT_NO_DEBUG
-+        DefaultOutput = NoOutput,
-+#else
-+        DefaultOutput = QtOutput,
-+#endif
-         Unknown = 5
-     };
- 
-@@ -313,7 +318,7 @@ struct KDebugPrivate
-         }
- 
-         KConfigGroup cg(config, QString::number(area));
--        int mode = cg.readEntry(key, 2);
-+        int mode = cg.readEntry(key, int(DefaultOutput));
-         return OutputMode(mode);
-     }
- 
---- a/kdecore/io/kdebug.h
-+++ b/kdecore/io/kdebug.h
-@@ -31,12 +31,13 @@
-  *  @{
-  * KDE debug message streams let you and the user control just how many debug
-  * messages you see. Debug message printing is controlled by (un)defining
-- * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then no debug
-- * messages are printed.
-+ * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then debug
-+ * messages are not printed by default but can still be enabled by runtime
-+ * configuration, e.g. via kdebugdialog or by editing kdebugrc.
-  */
- 
- #if !defined(KDE_NO_DEBUG_OUTPUT)
--# if defined(QT_NO_DEBUG) || defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
-+# if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
- #  define KDE_NO_DEBUG_OUTPUT
- # endif
- #endif

Modified: trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -1,6 +1,6 @@
 --- a/kded/CMakeLists.txt
 +++ b/kded/CMakeLists.txt
-@@ -69,7 +69,7 @@ install(TARGETS kdontchangethehostname D
+@@ -69,7 +69,7 @@
  if (WIN32)
  install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
  else (WIN32)
@@ -11,7 +11,7 @@
  install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
 --- a/kded/vfolder_menu.cpp
 +++ b/kded/vfolder_menu.cpp
-@@ -769,8 +769,10 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -770,8 +770,10 @@
     QString result;
  
     QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -24,7 +24,7 @@
        QFileInfo fileInfo(fileName);
  
        QString fileNameOnly = fileInfo.fileName();
-@@ -780,7 +782,6 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -781,7 +783,6 @@
        QString baseName = QDir::cleanPath(m_docInfo.baseDir +
                                           fileInfo.path() + '/' + fileNameOnly);
        result = KStandardDirs::locate("xdgconf-menu", baseName);

Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -2,7 +2,7 @@
 Bypass build time check as /dev/ptmx is alsways present at runtime.
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -193,13 +193,7 @@ if (UNIX)
+@@ -195,13 +195,7 @@
      set(HAVE_OPENPTY)
  
      EXECUTE_PROCESS(

Modified: trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -4,7 +4,7 @@
 cmake. 
 --- a/kpty/kpty.cpp
 +++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@ extern "C" {
+@@ -107,24 +107,24 @@
  # define _NEW_TTY_CTRL
  #endif
  
@@ -43,11 +43,11 @@
  #include <kdebug.h>
 --- a/kio/kfile/kpropertiesdialog.cpp
 +++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1875,7 +1875,15 @@ static bool fileSystemSupportsACL( const
+@@ -1898,7 +1898,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
      fileSystemSupportsACLs =
--      getxattr( path.data(), "system.posix_acl_access", NULL, 0 ) >= 0 || errno == ENODATA;
+-            getxattr( path.data(), "system.posix_acl_access", NULL, 0 ) >= 0 || errno == ENODATA;
 +      getxattr( path.data(), "system.posix_acl_access", NULL, 0 ) >= 0
 +#ifdef ENODATA
 +           || (errno == ENODATA)
@@ -62,7 +62,7 @@
  }
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -155,11 +155,11 @@ if (UNIX)
+@@ -157,11 +157,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
      endif (NOT login_in_libc)
@@ -79,7 +79,7 @@
        if (login_in_libutil)
 --- a/kioslave/file/file.cpp
 +++ b/kioslave/file/file.cpp
-@@ -315,8 +315,10 @@ void FileProtocol::get( const KUrl& url 
+@@ -323,8 +323,10 @@
      }
  
  #ifdef HAVE_FADVISE
@@ -92,7 +92,7 @@
      // This is mandatory in all slaves (for KRun/BrowserRun to work)
 --- a/kioslave/file/file_unix.cpp
 +++ b/kioslave/file/file_unix.cpp
-@@ -129,8 +129,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -133,8 +133,10 @@
      }
  
  #ifdef HAVE_FADVISE
@@ -103,7 +103,7 @@
      // WABA: Make sure that we keep writing permissions ourselves,
      // otherwise we can be in for a surprise on NFS.
      mode_t initialMode;
-@@ -152,8 +154,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -156,8 +158,10 @@
      }
  
  #ifdef HAVE_FADVISE

Modified: trunk/packages/kdelibs/debian/patches/16_debian_menu.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/16_debian_menu.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/16_debian_menu.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -4,7 +4,7 @@
 
 --- a/kded/applications.menu
 +++ b/kded/applications.menu
-@@ -437,5 +437,12 @@
+@@ -502,6 +502,13 @@
  		</And>
  	</Include>
  	<DefaultMergeDirs/>
@@ -17,3 +17,4 @@
 +
  	<MergeFile>applications-kmenuedit.menu</MergeFile>
  </Menu>
+ 

Modified: trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -4,7 +4,7 @@
 
 --- a/kdecore/services/kservicefactory.cpp
 +++ b/kdecore/services/kservicefactory.cpp
-@@ -125,16 +125,10 @@ KService::Ptr KServiceFactory::findServi
+@@ -116,16 +116,10 @@
      return newService;
  }
  
@@ -22,7 +22,7 @@
          return KService::Ptr(); // Not found
      }
  
-@@ -151,6 +145,27 @@ KService::Ptr KServiceFactory::findServi
+@@ -142,6 +136,27 @@
      return newService;
  }
  
@@ -52,7 +52,7 @@
      if (!m_menuIdDict) return KService::Ptr(); // Error!
 --- a/kdecore/services/kservicefactory.h
 +++ b/kdecore/services/kservicefactory.h
-@@ -123,6 +123,8 @@ protected:
+@@ -121,6 +121,8 @@
      virtual void virtual_hook( int id, void* data );
  private:
      class KServiceFactoryPrivate* d;

Modified: trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -2,7 +2,7 @@
 
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
-@@ -1457,10 +1457,9 @@ IF (QT4_QMAKE_FOUND)
+@@ -1467,10 +1467,9 @@
    IF(UNIX)
      # on OS X X11 may not be required
      IF (Q_WS_X11)

Modified: trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -1,7 +1,7 @@
 Use DejaVu Sans as default font and adjusts sizes accordingly.
 --- a/kdeui/kernel/kglobalsettings.cpp
 +++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -374,7 +374,7 @@ struct KFontData
+@@ -373,7 +373,7 @@
  
  // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
  static const char GeneralId[] =      "General";
@@ -10,7 +10,7 @@
  #ifdef Q_WS_MAC
  static const char DefaultMacFont[] = "Lucida Grande";
  #endif
-@@ -387,13 +387,13 @@ static const KFontData DefaultFontData[K
+@@ -386,13 +386,13 @@
      { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
      { GeneralId, "menuFont",    DefaultMacFont, 13, -1, QFont::SansSerif },
  #else

Modified: trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -12,7 +12,7 @@
 
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1031,6 +1031,10 @@ QStringList KStandardDirs::resourceDirs(
+@@ -1124,6 +1124,10 @@
                          if ((local || testdir.exists()) && !candidates.contains(path))
                              candidates.append(path);
                      }

Modified: trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -1,6 +1,6 @@
 --- a/solid/solid/CMakeLists.txt
 +++ b/solid/solid/CMakeLists.txt
-@@ -194,7 +194,14 @@ install(FILES org.freedesktop.PowerManag
+@@ -219,7 +219,14 @@
  install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
  
  ########### static lib for tests  ###############
@@ -14,4 +14,4 @@
 +automoc_copy(solid solid_static)
  kde4_add_library(solid_static STATIC ${solid_LIB_SRCS})
  
- target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY})
+ target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})

Modified: trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2009-06-06 17:21:03 UTC (rev 14893)
@@ -2,7 +2,7 @@
 
 --- a/plasma/CMakeLists.txt
 +++ b/plasma/CMakeLists.txt
-@@ -139,6 +139,10 @@ kde4_add_library(plasma SHARED ${plasma_
+@@ -156,6 +156,10 @@
  target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} knewstuff2
                               ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
                               threadweaver ${KDE4_SOLID_LIBS} )

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/patches/series	2009-06-06 17:21:03 UTC (rev 14893)
@@ -10,5 +10,4 @@
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
-24_runtime_qt45_locale_initialization.diff
 25_ld_exclude_libs_qtuitools.diff

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2009-06-06 17:11:24 UTC (rev 14892)
+++ trunk/packages/kdelibs/debian/rules	2009-06-06 17:21:03 UTC (rev 14893)
@@ -3,7 +3,7 @@
 UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
 #UPSTREAMVERSION ?= 4:4.2.0
 #PLASMA_ABI=$(shell grep 'plasma-abi-' debian/libplasma3.symbols.in | head -n1 | sed 's/^.*\(plasma-abi-\S\+\).*/\1/')
-RUNTIME_DEPS := kdebase-runtime (>= 4:4.2.2)
+RUNTIME_DEPS := kdebase-runtime (>= 4:4.2.90)
 
 DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg

More information about the pkg-kde-commits mailing list