rev 10253 - in branches/kde4/packages/kdelibs/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Thu Apr 24 22:33:02 UTC 2008


Author: modax-guest
Date: 2008-04-24 22:33:01 +0000 (Thu, 24 Apr 2008)
New Revision: 10253

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
   branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
   branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen
   branches/kde4/packages/kdelibs/debian/libphonon-dev.install
   branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen
   branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
   branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
   branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
   branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
   branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
   branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
   branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
   branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
   branches/kde4/packages/kdelibs/debian/rules
Log:
* Some small & major changes.
* 4.0.71+svn800771 ready, I guess it is fully compatiblity with 4.0.71 except version number.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,3 +1,27 @@
+kde4libs (4:4.0.71+svn800799-1~pre1) UNRELEASED; urgency=low
+
+  * New upstream development snapshot:
+    - The latest upstream commit is r800799 by dfaure
+    - Date: Thu, 24 Apr 2008 22:03:28 -0000
+
+  +++ Changes by Modestas Vainius:
+
+  * 98_link_interfaces_library.diff - major update:
+    - Drop ${QT_QTNETWORK_LIBRARY}, ${QT_QTDBUS_LIBRARY}, ${QT_QTXML_LIBRARY}
+      from kdecore LINK_INTERFACE_LIBRARIES leaving only ${QT_QTCORE_LIBRARY}.
+      Those 3 libraries are no longer implicitly provided by any kdelibs
+      target. This may cause a few link time FTBFSes.
+    - Further update LINK_INTERFACE_LIBRARIES of other public libraries.
+  * Fix offsets in other patches so they apply cleanly.
+  * Move usr/include/KDE/Phonon from kdelibs5-dev to libphonon-dev. Update
+    *.install files and Replaces for libphonon-dev appropriately.
+  * Disable --as-needed.
+  +++ Auto changes by Debian KDE Builder:
+
+  * Corrections to *.install files:
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Apr 2008 01:17:29 +0300
+
 kde4libs (4:4.0.70+svn799089-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/control	2008-04-24 22:33:01 UTC (rev 10253)
@@ -83,7 +83,7 @@
 Section: libdevel
 Architecture: any
 Depends: libphonon4 (= ${binary:Version})
-Replaces: kdelibs5-dev (<< 4:3.98.0~svn755919-1)
+Replaces: kdelibs5-dev (<< 4:4.0.71)
 Description: development files for the Phonon multimedia framework
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install	2008-04-24 22:33:01 UTC (rev 10253)
@@ -3,7 +3,759 @@
 usr/bin/kunittestmodrunner
 usr/bin/makekdewidgets
 usr/bin/preparetips
-usr/include/KDE/*
+usr/include/KDE/ConversionCheck/QVconvertible
+usr/include/KDE/ConversionCheck/type_toQString
+usr/include/KDE/ConversionCheck/type_toQVariant
+usr/include/KDE/DNSSD/Configuration
+usr/include/KDE/DNSSD/DomainBrowser
+usr/include/KDE/DNSSD/DomainModel
+usr/include/KDE/DNSSD/PublicService
+usr/include/KDE/DNSSD/RemoteService
+usr/include/KDE/DNSSD/ServiceBase
+usr/include/KDE/DNSSD/ServiceBrowser
+usr/include/KDE/DNSSD/ServiceModel
+usr/include/KDE/DOM/AbstractView
+usr/include/KDE/DOM/Attr
+usr/include/KDE/DOM/CDATASection
+usr/include/KDE/DOM/CSSCharsetRule
+usr/include/KDE/DOM/CSSException
+usr/include/KDE/DOM/CSSFontFaceRule
+usr/include/KDE/DOM/CSSImportRule
+usr/include/KDE/DOM/CSSMediaRule
+usr/include/KDE/DOM/CSSPageRule
+usr/include/KDE/DOM/CSSPrimitiveValue
+usr/include/KDE/DOM/CSSRule
+usr/include/KDE/DOM/CSSRuleList
+usr/include/KDE/DOM/CSSStyleDeclaration
+usr/include/KDE/DOM/CSSStyleRule
+usr/include/KDE/DOM/CSSStyleSheet
+usr/include/KDE/DOM/CSSUnknownRule
+usr/include/KDE/DOM/CSSValue
+usr/include/KDE/DOM/CSSValueList
+usr/include/KDE/DOM/CharacterData
+usr/include/KDE/DOM/Comment
+usr/include/KDE/DOM/Counter
+usr/include/KDE/DOM/CustomNodeFilter
+usr/include/KDE/DOM/DOMException
+usr/include/KDE/DOM/DOMImplementation
+usr/include/KDE/DOM/DOMString
+usr/include/KDE/DOM/Document
+usr/include/KDE/DOM/DocumentFragment
+usr/include/KDE/DOM/DocumentStyle
+usr/include/KDE/DOM/DocumentType
+usr/include/KDE/DOM/DomShared
+usr/include/KDE/DOM/Element
+usr/include/KDE/DOM/Entity
+usr/include/KDE/DOM/EntityReference
+usr/include/KDE/DOM/Event
+usr/include/KDE/DOM/EventException
+usr/include/KDE/DOM/EventListener
+usr/include/KDE/DOM/HTMLAnchorElement
+usr/include/KDE/DOM/HTMLAppletElement
+usr/include/KDE/DOM/HTMLAreaElement
+usr/include/KDE/DOM/HTMLBRElement
+usr/include/KDE/DOM/HTMLBaseElement
+usr/include/KDE/DOM/HTMLBaseFontElement
+usr/include/KDE/DOM/HTMLBlockquoteElement
+usr/include/KDE/DOM/HTMLBodyElement
+usr/include/KDE/DOM/HTMLButtonElement
+usr/include/KDE/DOM/HTMLCollection
+usr/include/KDE/DOM/HTMLDListElement
+usr/include/KDE/DOM/HTMLDirectoryElement
+usr/include/KDE/DOM/HTMLDivElement
+usr/include/KDE/DOM/HTMLDocument
+usr/include/KDE/DOM/HTMLElement
+usr/include/KDE/DOM/HTMLFieldSetElement
+usr/include/KDE/DOM/HTMLFontElement
+usr/include/KDE/DOM/HTMLFormCollection
+usr/include/KDE/DOM/HTMLFormElement
+usr/include/KDE/DOM/HTMLFrameElement
+usr/include/KDE/DOM/HTMLFrameSetElement
+usr/include/KDE/DOM/HTMLHRElement
+usr/include/KDE/DOM/HTMLHeadElement
+usr/include/KDE/DOM/HTMLHeadingElement
+usr/include/KDE/DOM/HTMLHtmlElement
+usr/include/KDE/DOM/HTMLIFrameElement
+usr/include/KDE/DOM/HTMLImageElement
+usr/include/KDE/DOM/HTMLInputElement
+usr/include/KDE/DOM/HTMLIsIndexElement
+usr/include/KDE/DOM/HTMLLIElement
+usr/include/KDE/DOM/HTMLLabelElement
+usr/include/KDE/DOM/HTMLLayerElement
+usr/include/KDE/DOM/HTMLLegendElement
+usr/include/KDE/DOM/HTMLLinkElement
+usr/include/KDE/DOM/HTMLMapElement
+usr/include/KDE/DOM/HTMLMenuElement
+usr/include/KDE/DOM/HTMLMetaElement
+usr/include/KDE/DOM/HTMLModElement
+usr/include/KDE/DOM/HTMLOListElement
+usr/include/KDE/DOM/HTMLObjectElement
+usr/include/KDE/DOM/HTMLOptGroupElement
+usr/include/KDE/DOM/HTMLOptionElement
+usr/include/KDE/DOM/HTMLParagraphElement
+usr/include/KDE/DOM/HTMLParamElement
+usr/include/KDE/DOM/HTMLPreElement
+usr/include/KDE/DOM/HTMLQuoteElement
+usr/include/KDE/DOM/HTMLScriptElement
+usr/include/KDE/DOM/HTMLSelectElement
+usr/include/KDE/DOM/HTMLStyleElement
+usr/include/KDE/DOM/HTMLTableCaptionElement
+usr/include/KDE/DOM/HTMLTableCellElement
+usr/include/KDE/DOM/HTMLTableColElement
+usr/include/KDE/DOM/HTMLTableElement
+usr/include/KDE/DOM/HTMLTableRowElement
+usr/include/KDE/DOM/HTMLTableSectionElement
+usr/include/KDE/DOM/HTMLTextAreaElement
+usr/include/KDE/DOM/HTMLTitleElement
+usr/include/KDE/DOM/HTMLUListElement
+usr/include/KDE/DOM/KeyboardEvent
+usr/include/KDE/DOM/LinkStyle
+usr/include/KDE/DOM/MediaList
+usr/include/KDE/DOM/MouseEvent
+usr/include/KDE/DOM/MutationEvent
+usr/include/KDE/DOM/NamedNodeMap
+usr/include/KDE/DOM/Node
+usr/include/KDE/DOM/NodeFilter
+usr/include/KDE/DOM/NodeIterator
+usr/include/KDE/DOM/NodeList
+usr/include/KDE/DOM/Notation
+usr/include/KDE/DOM/ProcessingInstruction
+usr/include/KDE/DOM/RGBColor
+usr/include/KDE/DOM/Range
+usr/include/KDE/DOM/RangeException
+usr/include/KDE/DOM/Rect
+usr/include/KDE/DOM/StyleSheet
+usr/include/KDE/DOM/StyleSheetList
+usr/include/KDE/DOM/Text
+usr/include/KDE/DOM/TextEvent
+usr/include/KDE/DOM/TreeWalker
+usr/include/KDE/DOM/UIEvent
+usr/include/KDE/K3AboutApplication
+usr/include/KDE/K3AboutContainer
+usr/include/KDE/K3AboutContributor
+usr/include/KDE/K3AboutDialog
+usr/include/KDE/K3AboutWidget
+usr/include/KDE/K3ActiveLabel
+usr/include/KDE/K3BookmarkDrag
+usr/include/KDE/K3ButtonBox
+usr/include/KDE/K3ColorDrag
+usr/include/KDE/K3Command
+usr/include/KDE/K3CommandHistory
+usr/include/KDE/K3DictSpellingHighlighter
+usr/include/KDE/K3DockArea
+usr/include/KDE/K3DockMainWindow
+usr/include/KDE/K3DockManager
+usr/include/KDE/K3DockTabGroup
+usr/include/KDE/K3DockWidget
+usr/include/KDE/K3DockWidgetAbstractHeader
+usr/include/KDE/K3DockWidgetAbstractHeaderDrag
+usr/include/KDE/K3DockWidgetHeader
+usr/include/KDE/K3DockWidgetHeaderDrag
+usr/include/KDE/K3FileTreeView
+usr/include/KDE/K3FileTreeViewItem
+usr/include/KDE/K3Icon
+usr/include/KDE/K3IconView
+usr/include/KDE/K3IconViewItem
+usr/include/KDE/K3IconViewSearchLine
+usr/include/KDE/K3ListBox
+usr/include/KDE/K3ListView
+usr/include/KDE/K3ListViewItem
+usr/include/KDE/K3ListViewSearchLine
+usr/include/KDE/K3ListViewSearchLineWidget
+usr/include/KDE/K3MacroCommand
+usr/include/KDE/K3MimeSourceFactory
+usr/include/KDE/K3MultipleDrag
+usr/include/KDE/K3NamedCommand
+usr/include/KDE/K3PopupMenu
+usr/include/KDE/K3ProcIO
+usr/include/KDE/K3Process
+usr/include/KDE/K3ProcessController
+usr/include/KDE/K3RFCDate
+usr/include/KDE/K3ShellProcess
+usr/include/KDE/K3Spell
+usr/include/KDE/K3SpellConfig
+usr/include/KDE/K3SpellDlg
+usr/include/KDE/K3SpellingHighlighter
+usr/include/KDE/K3StaticDeleter
+usr/include/KDE/K3StaticDeleterBase
+usr/include/KDE/K3SyntaxHighlighter
+usr/include/KDE/K3TempFile
+usr/include/KDE/K3TextEdit
+usr/include/KDE/K3URLDrag
+usr/include/KDE/K3Wizard
+usr/include/KDE/KACL
+usr/include/KDE/KAboutApplicationDialog
+usr/include/KDE/KAboutData
+usr/include/KDE/KAboutPerson
+usr/include/KDE/KAccelGen/Deref
+usr/include/KDE/KAccelGen/Deref_Key
+usr/include/KDE/KAcceleratorManager
+usr/include/KDE/KAction
+usr/include/KDE/KActionCollection
+usr/include/KDE/KActionMenu
+usr/include/KDE/KActionSelector
+usr/include/KDE/KAnimatedButton
+usr/include/KDE/KApplication
+usr/include/KDE/KAr
+usr/include/KDE/KArchive
+usr/include/KDE/KArchiveDirectory
+usr/include/KDE/KArchiveEntry
+usr/include/KDE/KArchiveFile
+usr/include/KDE/KArrowButton
+usr/include/KDE/KAssistantDialog
+usr/include/KDE/KAuthorized
+usr/include/KDE/KAutoMount
+usr/include/KDE/KAutoUnmount
+usr/include/KDE/KAutostart
+usr/include/KDE/KBookmark
+usr/include/KDE/KBookmarkAction
+usr/include/KDE/KBookmarkActionInterface
+usr/include/KDE/KBookmarkActionMenu
+usr/include/KDE/KBookmarkDomBuilder
+usr/include/KDE/KBookmarkExporterBase
+usr/include/KDE/KBookmarkGroup
+usr/include/KDE/KBookmarkGroupTraverser
+usr/include/KDE/KBookmarkImporterBase
+usr/include/KDE/KBookmarkManager
+usr/include/KDE/KBookmarkMenu
+usr/include/KDE/KBookmarkOwner
+usr/include/KDE/KBugReport
+usr/include/KDE/KBuildSycocaProgressDialog
+usr/include/KDE/KButtonGroup
+usr/include/KDE/KCModule
+usr/include/KDE/KCModuleContainer
+usr/include/KDE/KCModuleInfo
+usr/include/KDE/KCModuleLoader
+usr/include/KDE/KCModuleProxy
+usr/include/KDE/KCMultiDialog
+usr/include/KDE/KCalendarSystem
+usr/include/KDE/KCalendarSystemFactory
+usr/include/KDE/KCategorizedSortFilterProxyModel
+usr/include/KDE/KCategorizedView
+usr/include/KDE/KCategoryDrawer
+usr/include/KDE/KCharMacroExpander
+usr/include/KDE/KCharSelect
+usr/include/KDE/KCharsets
+usr/include/KDE/KCmdLineArgs
+usr/include/KDE/KCmdLineOptions
+usr/include/KDE/KCodecs
+usr/include/KDE/KColor
+usr/include/KDE/KColorButton
+usr/include/KDE/KColorCells
+usr/include/KDE/KColorCollection
+usr/include/KDE/KColorCombo
+usr/include/KDE/KColorDialog
+usr/include/KDE/KColorMimeData
+usr/include/KDE/KColorPatch
+usr/include/KDE/KColorScheme
+usr/include/KDE/KColorTable
+usr/include/KDE/KColorUtils
+usr/include/KDE/KColorValueSelector
+usr/include/KDE/KComboBox
+usr/include/KDE/KCompletion
+usr/include/KDE/KCompletionBase
+usr/include/KDE/KCompletionBox
+usr/include/KDE/KCompletionMatches
+usr/include/KDE/KComponentData
+usr/include/KDE/KCompositeJob
+usr/include/KDE/KConfig
+usr/include/KDE/KConfigBase
+usr/include/KDE/KConfigDialog
+usr/include/KDE/KConfigDialogManager
+usr/include/KDE/KConfigGroup
+usr/include/KDE/KConfigSkeleton
+usr/include/KDE/KConfigSkeletonGenericItem
+usr/include/KDE/KConfigSkeletonItem
+usr/include/KDE/KCrash
+usr/include/KDE/KCrashBookmarkImporter
+usr/include/KDE/KCrashBookmarkImporterImpl
+usr/include/KDE/KCursor
+usr/include/KDE/KDBusServiceStarter
+usr/include/KDE/KDEDModule
+usr/include/KDE/KDEsuClient
+usr/include/KDE/KDataTool
+usr/include/KDE/KDataToolAction
+usr/include/KDE/KDataToolInfo
+usr/include/KDE/KDatePicker
+usr/include/KDE/KDateTable
+usr/include/KDE/KDateTime
+usr/include/KDE/KDateTimeWidget
+usr/include/KDE/KDateValidator
+usr/include/KDE/KDateWidget
+usr/include/KDE/KDebug
+usr/include/KDE/KDesktopFile
+usr/include/KDE/KDialog
+usr/include/KDE/KDialogButtonBox
+usr/include/KDE/KDirLister
+usr/include/KDE/KDirModel
+usr/include/KDE/KDirOperator
+usr/include/KDE/KDirSelectDialog
+usr/include/KDE/KDirWatch
+usr/include/KDE/KDiskFreeSpace
+usr/include/KDE/KDoubleNumInput
+usr/include/KDE/KDoubleSpinBox
+usr/include/KDE/KDoubleValidator
+usr/include/KDE/KEMailSettings
+usr/include/KDE/KEditListBox
+usr/include/KDE/KEditToolBar
+usr/include/KDE/KEncodingFileDialog
+usr/include/KDE/KExtendableItemDelegate
+usr/include/KDE/KFadeWidgetEffect
+usr/include/KDE/KFile
+usr/include/KDE/KFileDialog
+usr/include/KDE/KFileFilterCombo
+usr/include/KDE/KFileItem
+usr/include/KDE/KFileItemDelegate
+usr/include/KDE/KFileItemList
+usr/include/KDE/KFileMetaInfo
+usr/include/KDE/KFileMetaInfoGroup
+usr/include/KDE/KFileMetaInfoItem
+usr/include/KDE/KFileShare
+usr/include/KDE/KFileSharePropsPlugin
+usr/include/KDE/KFileTreeBranch
+usr/include/KDE/KFileTreeView
+usr/include/KDE/KFilterBase
+usr/include/KDE/KFilterDev
+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/KFontDialog
+usr/include/KDE/KFontRequester
+usr/include/KDE/KFontSizeAction
+usr/include/KDE/KGenericFactory
+usr/include/KDE/KGenericFactoryBase
+usr/include/KDE/KGlobal
+usr/include/KDE/KGlobalAccel
+usr/include/KDE/KGlobalSettings
+usr/include/KDE/KGradientSelector
+usr/include/KDE/KGuiItem
+usr/include/KDE/KHBox
+usr/include/KDE/KHE/CharColumnInterface
+usr/include/KDE/KHE/ClipboardInterface
+usr/include/KDE/KHE/ValueColumnInterface
+usr/include/KDE/KHE/ZoomInterface
+usr/include/KDE/KHTMLPart
+usr/include/KDE/KHTMLSettings
+usr/include/KDE/KHTMLView
+usr/include/KDE/KHelpMenu
+usr/include/KDE/KHistoryComboBox
+usr/include/KDE/KHueSaturationSelector
+usr/include/KDE/KIEBookmarkExporterImpl
+usr/include/KDE/KIEBookmarkImporter
+usr/include/KDE/KIEBookmarkImporterImpl
+usr/include/KDE/KIMProxy
+usr/include/KDE/KIO/AuthInfo
+usr/include/KDE/KIO/ChmodJob
+usr/include/KDE/KIO/Connection
+usr/include/KDE/KIO/CopyInfo
+usr/include/KDE/KIO/CopyJob
+usr/include/KDE/KIO/DavJob
+usr/include/KDE/KIO/DeleteJob
+usr/include/KDE/KIO/DirectCopyJob
+usr/include/KDE/KIO/FileCopyJob
+usr/include/KDE/KIO/FileJob
+usr/include/KDE/KIO/ForwardingSlaveBase
+usr/include/KDE/KIO/Job
+usr/include/KDE/KIO/JobUiDelegate
+usr/include/KDE/KIO/ListJob
+usr/include/KDE/KIO/MetaData
+usr/include/KDE/KIO/MetaInfoJob
+usr/include/KDE/KIO/MimetypeJob
+usr/include/KDE/KIO/MkdirJob
+usr/include/KDE/KIO/MultiGetJob
+usr/include/KDE/KIO/NetAccess
+usr/include/KDE/KIO/NetRC
+usr/include/KDE/KIO/PasswordDialog
+usr/include/KDE/KIO/PreviewJob
+usr/include/KDE/KIO/RenameDialog
+usr/include/KDE/KIO/RenameDialogPlugin
+usr/include/KDE/KIO/Scheduler
+usr/include/KDE/KIO/SessionData
+usr/include/KDE/KIO/SimpleJob
+usr/include/KDE/KIO/SkipDialog
+usr/include/KDE/KIO/Slave
+usr/include/KDE/KIO/SlaveBase
+usr/include/KDE/KIO/SlaveConfig
+usr/include/KDE/KIO/SlaveInterface
+usr/include/KDE/KIO/StatJob
+usr/include/KDE/KIO/StoredTransferJob
+usr/include/KDE/KIO/TCPSlaveBase
+usr/include/KDE/KIO/Task
+usr/include/KDE/KIO/TransferJob
+usr/include/KDE/KIO/UDSField
+usr/include/KDE/KIcon
+usr/include/KDE/KIconButton
+usr/include/KDE/KIconCanvas
+usr/include/KDE/KIconDialog
+usr/include/KDE/KIconEffect
+usr/include/KDE/KIconLoader
+usr/include/KDE/KIconTheme
+usr/include/KDE/KImageFilePreview
+usr/include/KDE/KImageIO
+usr/include/KDE/KInputDialog
+usr/include/KDE/KIntNumInput
+usr/include/KDE/KIntSpinBox
+usr/include/KDE/KIntValidator
+usr/include/KDE/KJob
+usr/include/KDE/KJobUiDelegate
+usr/include/KDE/KKeySequenceWidget
+usr/include/KDE/KLanguageButton
+usr/include/KDE/KLed
+usr/include/KDE/KLibFactory
+usr/include/KDE/KLibLoader
+usr/include/KDE/KLibrary
+usr/include/KDE/KLineEdit
+usr/include/KDE/KListWidget
+usr/include/KDE/KLocale
+usr/include/KDE/KLocalizedString
+usr/include/KDE/KLockFile
+usr/include/KDE/KMD5
+usr/include/KDE/KMacroExpanderBase
+usr/include/KDE/KMainWindow
+usr/include/KDE/KMakeTypeList
+usr/include/KDE/KMediaPlayer/Player
+usr/include/KDE/KMediaPlayer/View
+usr/include/KDE/KMenu
+usr/include/KDE/KMenuBar
+usr/include/KDE/KMessage
+usr/include/KDE/KMessageBox
+usr/include/KDE/KMessageBoxMessageHandler
+usr/include/KDE/KMessageHandler
+usr/include/KDE/KMimeType
+usr/include/KDE/KMimeTypeChooser
+usr/include/KDE/KMimeTypeChooserDialog
+usr/include/KDE/KMimeTypeResolver
+usr/include/KDE/KMimeTypeTrader
+usr/include/KDE/KMimeTypeValidator
+usr/include/KDE/KMozillaBookmarkImporterImpl
+usr/include/KDE/KMultiTabBar
+usr/include/KDE/KMultiTabBarButton
+usr/include/KDE/KMultiTabBarTab
+usr/include/KDE/KNFSShare
+usr/include/KDE/KNS/Author
+usr/include/KDE/KNS/Category
+usr/include/KDE/KNS/Engine
+usr/include/KDE/KNS/Entry
+usr/include/KDE/KNS/Installation
+usr/include/KDE/KNS/KTranslatable
+usr/include/KDE/KNSBookmarkExporter
+usr/include/KDE/KNSBookmarkExporterImpl
+usr/include/KDE/KNSBookmarkImporter
+usr/include/KDE/KNSBookmarkImporterImpl
+usr/include/KDE/KNTLM
+usr/include/KDE/KNetwork/KActiveSocketBase
+usr/include/KDE/KNetwork/KBufferedSocket
+usr/include/KDE/KNetwork/KClientSocketBase
+usr/include/KDE/KNetwork/KDatagramPacket
+usr/include/KDE/KNetwork/KDatagramSocket
+usr/include/KDE/KNetwork/KHttpProxySocketDevice
+usr/include/KDE/KNetwork/KInetSocketAddress
+usr/include/KDE/KNetwork/KIpAddress
+usr/include/KDE/KNetwork/KPassiveSocketBase
+usr/include/KDE/KNetwork/KResolver
+usr/include/KDE/KNetwork/KResolverEntry
+usr/include/KDE/KNetwork/KResolverResults
+usr/include/KDE/KNetwork/KReverseResolver
+usr/include/KDE/KNetwork/KServerSocket
+usr/include/KDE/KNetwork/KSocketAddress
+usr/include/KDE/KNetwork/KSocketBase
+usr/include/KDE/KNetwork/KSocketDevice
+usr/include/KDE/KNetwork/KSocketDeviceFactory
+usr/include/KDE/KNetwork/KSocksSocketDevice
+usr/include/KDE/KNetwork/KStreamSocket
+usr/include/KDE/KNetwork/KUnixSocketAddress
+usr/include/KDE/KNotification
+usr/include/KDE/KNotificationRestrictions
+usr/include/KDE/KNotifyConfigWidget
+usr/include/KDE/KNumInput
+usr/include/KDE/KOCRDialog
+usr/include/KDE/KOpenWithDialog
+usr/include/KDE/KOperaBookmarkExporterImpl
+usr/include/KDE/KOperaBookmarkImporter
+usr/include/KDE/KOperaBookmarkImporterImpl
+usr/include/KDE/KPageDialog
+usr/include/KDE/KPageModel
+usr/include/KDE/KPageView
+usr/include/KDE/KPageWidget
+usr/include/KDE/KPageWidgetItem
+usr/include/KDE/KPageWidgetModel
+usr/include/KDE/KParts/BrowserExtension
+usr/include/KDE/KParts/BrowserHostExtension
+usr/include/KDE/KParts/BrowserInterface
+usr/include/KDE/KParts/BrowserRun
+usr/include/KDE/KParts/ComponentFactory
+usr/include/KDE/KParts/DockMainWindow3
+usr/include/KDE/KParts/Event
+usr/include/KDE/KParts/Factory
+usr/include/KDE/KParts/GUIActivateEvent
+usr/include/KDE/KParts/GenericFactory
+usr/include/KDE/KParts/GenericFactoryBase
+usr/include/KDE/KParts/HistoryProvider
+usr/include/KDE/KParts/LiveConnectExtension
+usr/include/KDE/KParts/MainWindow
+usr/include/KDE/KParts/OpenURLEvent
+usr/include/KDE/KParts/Part
+usr/include/KDE/KParts/PartActivateEvent
+usr/include/KDE/KParts/PartBase
+usr/include/KDE/KParts/PartManager
+usr/include/KDE/KParts/PartSelectEvent
+usr/include/KDE/KParts/Plugin
+usr/include/KDE/KParts/ReadOnlyPart
+usr/include/KDE/KParts/ReadWritePart
+usr/include/KDE/KParts/StatusBarExtension
+usr/include/KDE/KParts/URLArgs
+usr/include/KDE/KParts/WindowArgs
+usr/include/KDE/KPassivePopup
+usr/include/KDE/KPassivePopupMessageHandler
+usr/include/KDE/KPasswordDialog
+usr/include/KDE/KPasteTextAction
+usr/include/KDE/KPixmapCache
+usr/include/KDE/KPixmapProvider
+usr/include/KDE/KPixmapRegionSelectorDialog
+usr/include/KDE/KPixmapRegionSelectorWidget
+usr/include/KDE/KPlotAxis
+usr/include/KDE/KPlotObject
+usr/include/KDE/KPlotPoint
+usr/include/KDE/KPlotWidget
+usr/include/KDE/KPluginFactory
+usr/include/KDE/KPluginInfo
+usr/include/KDE/KPluginLoader
+usr/include/KDE/KPluginSelector
+usr/include/KDE/KPopupFrame
+usr/include/KDE/KPreviewWidgetBase
+usr/include/KDE/KPrintPreview
+usr/include/KDE/KProcess
+usr/include/KDE/KProgressDialog
+usr/include/KDE/KPropertiesDialog
+usr/include/KDE/KProtocolInfo
+usr/include/KDE/KProtocolManager
+usr/include/KDE/KPty
+usr/include/KDE/KPtyDevice
+usr/include/KDE/KPtyProcess
+usr/include/KDE/KPushButton
+usr/include/KDE/KRandom
+usr/include/KDE/KRandomSequence
+usr/include/KDE/KRecentDocument
+usr/include/KDE/KRecentFilesAction
+usr/include/KDE/KRemoteEncoding
+usr/include/KDE/KReplace
+usr/include/KDE/KReplaceDialog
+usr/include/KDE/KRestrictedLine
+usr/include/KDE/KRuler
+usr/include/KDE/KRun
+usr/include/KDE/KSambaShare
+usr/include/KDE/KSaveFile
+usr/include/KDE/KScanDialog
+usr/include/KDE/KSelectAction
+usr/include/KDE/KSelectionOwner
+usr/include/KDE/KSelectionWatcher
+usr/include/KDE/KSelector
+usr/include/KDE/KSeparator
+usr/include/KDE/KService
+usr/include/KDE/KServiceGroup
+usr/include/KDE/KServiceType
+usr/include/KDE/KServiceTypeProfile
+usr/include/KDE/KServiceTypeTrader
+usr/include/KDE/KSessionManager
+usr/include/KDE/KSettings/Dialog
+usr/include/KDE/KSettings/Dispatcher
+usr/include/KDE/KSettings/PluginPage
+usr/include/KDE/KSharedConfig
+usr/include/KDE/KSharedConfigPtr
+usr/include/KDE/KSharedPtr
+usr/include/KDE/KShell
+usr/include/KDE/KShellCompletion
+usr/include/KDE/KShortcut
+usr/include/KDE/KShortcutsDialog
+usr/include/KDE/KShortcutsEditor
+usr/include/KDE/KSocks
+usr/include/KDE/KSortableItem
+usr/include/KDE/KSortableList
+usr/include/KDE/KSpeech
+usr/include/KDE/KSplashScreen
+usr/include/KDE/KSqueezedTextLabel
+usr/include/KDE/KStandardAction
+usr/include/KDE/KStandardDirs
+usr/include/KDE/KStandardGuiItem
+usr/include/KDE/KStandardShortcut
+usr/include/KDE/KStartupInfo
+usr/include/KDE/KStartupInfoData
+usr/include/KDE/KStartupInfoId
+usr/include/KDE/KStatusBar
+usr/include/KDE/KStringHandler
+usr/include/KDE/KStringListValidator
+usr/include/KDE/KStyle
+usr/include/KDE/KStyleFactory
+usr/include/KDE/KSvgRenderer
+usr/include/KDE/KSycoca
+usr/include/KDE/KSycocaEntry
+usr/include/KDE/KSystemTimeZone
+usr/include/KDE/KSystemTimeZoneSource
+usr/include/KDE/KSystemTimeZones
+usr/include/KDE/KSystemTrayIcon
+usr/include/KDE/KTabBar
+usr/include/KDE/KTabWidget
+usr/include/KDE/KTar
+usr/include/KDE/KTempDir
+usr/include/KDE/KTemporaryFile
+usr/include/KDE/KTextBrowser
+usr/include/KDE/KTextEdit
+usr/include/KDE/KTextEditor/Attribute
+usr/include/KDE/KTextEditor/CodeCompletionInterface
+usr/include/KDE/KTextEditor/CodeCompletionModel
+usr/include/KDE/KTextEditor/Command
+usr/include/KDE/KTextEditor/CommandExtension
+usr/include/KDE/KTextEditor/CommandInterface
+usr/include/KDE/KTextEditor/ConfigInterface
+usr/include/KDE/KTextEditor/ConfigPage
+usr/include/KDE/KTextEditor/Cursor
+usr/include/KDE/KTextEditor/Document
+usr/include/KDE/KTextEditor/Editor
+usr/include/KDE/KTextEditor/EditorChooser
+usr/include/KDE/KTextEditor/Factory
+usr/include/KDE/KTextEditor/MarkInterface
+usr/include/KDE/KTextEditor/ModificationInterface
+usr/include/KDE/KTextEditor/Plugin
+usr/include/KDE/KTextEditor/Range
+usr/include/KDE/KTextEditor/SearchInterface
+usr/include/KDE/KTextEditor/SessionConfigInterface
+usr/include/KDE/KTextEditor/SmartCursor
+usr/include/KDE/KTextEditor/SmartCursorNotifier
+usr/include/KDE/KTextEditor/SmartCursorWatcher
+usr/include/KDE/KTextEditor/SmartInterface
+usr/include/KDE/KTextEditor/SmartRange
+usr/include/KDE/KTextEditor/SmartRangeNotifier
+usr/include/KDE/KTextEditor/SmartRangeWatcher
+usr/include/KDE/KTextEditor/TemplateInterface
+usr/include/KDE/KTextEditor/TextHintInterface
+usr/include/KDE/KTextEditor/VariableInterface
+usr/include/KDE/KTextEditor/View
+usr/include/KDE/KTimeZone
+usr/include/KDE/KTimeZoneData
+usr/include/KDE/KTimeZoneSource
+usr/include/KDE/KTimeZoneWidget
+usr/include/KDE/KTimeZones
+usr/include/KDE/KTipDatabase
+usr/include/KDE/KTipDialog
+usr/include/KDE/KTitleWidget
+usr/include/KDE/KToggleAction
+usr/include/KDE/KToggleFullScreenAction
+usr/include/KDE/KToggleToolBarAction
+usr/include/KDE/KToolBar
+usr/include/KDE/KToolBarLabelAction
+usr/include/KDE/KToolBarPopupAction
+usr/include/KDE/KToolBarSpacerAction
+usr/include/KDE/KToolInvocation
+usr/include/KDE/KTreeWidgetSearchLine
+usr/include/KDE/KTreeWidgetSearchLineWidget
+usr/include/KDE/KTypeList
+usr/include/KDE/KTypeListIndexOf
+usr/include/KDE/KTypeListLength
+usr/include/KDE/KTzfileTimeZone
+usr/include/KDE/KTzfileTimeZoneSource
+usr/include/KDE/KUndoStack
+usr/include/KDE/KUniqueApplication
+usr/include/KDE/KUnitTest/Runner
+usr/include/KDE/KUnitTest/SlotTester
+usr/include/KDE/KUnitTest/TestResults
+usr/include/KDE/KUnitTest/Tester
+usr/include/KDE/KUriFilter
+usr/include/KDE/KUriFilterData
+usr/include/KDE/KUriFilterPlugin
+usr/include/KDE/KUrl
+usr/include/KDE/KUrlComboBox
+usr/include/KDE/KUrlComboRequester
+usr/include/KDE/KUrlCompletion
+usr/include/KDE/KUrlLabel
+usr/include/KDE/KUrlNavigator
+usr/include/KDE/KUrlPixmapProvider
+usr/include/KDE/KUrlRequester
+usr/include/KDE/KUrlRequesterDialog
+usr/include/KDE/KUser
+usr/include/KDE/KUserGroup
+usr/include/KDE/KVBox
+usr/include/KDE/KWallet/Wallet
+usr/include/KDE/KWindowInfo
+usr/include/KDE/KWindowSystem
+usr/include/KDE/KWordMacroExpander
+usr/include/KDE/KWordWrap
+usr/include/KDE/KXBELBookmarkImporterImpl
+usr/include/KDE/KXErrorHandler
+usr/include/KDE/KXMLGUIBuilder
+usr/include/KDE/KXMLGUIClient
+usr/include/KDE/KXMLGUIFactory
+usr/include/KDE/KXMessages
+usr/include/KDE/KXYSelector
+usr/include/KDE/KXmlGuiWindow
+usr/include/KDE/KZip
+usr/include/KDE/KZipFileEntry
+usr/include/KDE/KZoneAllocator
+usr/include/KDE/KonqBookmarkMenu
+usr/include/KDE/KonqBookmarkOwner
+usr/include/KDE/NET
+usr/include/KDE/NETRootInfo
+usr/include/KDE/NETWinInfo
+usr/include/KDE/Nepomuk/Resource
+usr/include/KDE/Nepomuk/ResourceManager
+usr/include/KDE/Nepomuk/Service
+usr/include/KDE/Nepomuk/Tag
+usr/include/KDE/Nepomuk/Tools
+usr/include/KDE/Nepomuk/Types/Class
+usr/include/KDE/Nepomuk/Types/Literal
+usr/include/KDE/Nepomuk/Types/Ontology
+usr/include/KDE/Nepomuk/Types/Property
+usr/include/KDE/Nepomuk/Variant
+usr/include/KDE/OrgKdeKDirNotifyInterface
+usr/include/KDE/OrgKdeKLauncherInterface
+usr/include/KDE/PtyProcess
+usr/include/KDE/Solid/AcAdapter
+usr/include/KDE/Solid/AudioInterface
+usr/include/KDE/Solid/Battery
+usr/include/KDE/Solid/Block
+usr/include/KDE/Solid/Button
+usr/include/KDE/Solid/Camera
+usr/include/KDE/Solid/Device
+usr/include/KDE/Solid/DeviceInterface
+usr/include/KDE/Solid/DeviceNotifier
+usr/include/KDE/Solid/DvbInterface
+usr/include/KDE/Solid/GenericInterface
+usr/include/KDE/Solid/NetworkInterface
+usr/include/KDE/Solid/Networking
+usr/include/KDE/Solid/OpticalDisc
+usr/include/KDE/Solid/OpticalDrive
+usr/include/KDE/Solid/PortableMediaPlayer
+usr/include/KDE/Solid/PowerManagement
+usr/include/KDE/Solid/Predicate
+usr/include/KDE/Solid/Processor
+usr/include/KDE/Solid/StorageAccess
+usr/include/KDE/Solid/StorageDrive
+usr/include/KDE/Solid/StorageVolume
+usr/include/KDE/SshProcess
+usr/include/KDE/StubProcess
+usr/include/KDE/SuProcess
+usr/include/KDE/ThreadWeaver/DependencyPolicy
+usr/include/KDE/ThreadWeaver/Job
+usr/include/KDE/ThreadWeaver/JobCollection
+usr/include/KDE/ThreadWeaver/JobSequence
+usr/include/KDE/ThreadWeaver/QueuePolicy
+usr/include/KDE/ThreadWeaver/ResourceRestrictionPolicy
+usr/include/KDE/ThreadWeaver/State
+usr/include/KDE/ThreadWeaver/Thread
+usr/include/KDE/ThreadWeaver/Weaver
+usr/include/KDE/ThreadWeaver/WeaverInterface
+usr/include/KDE/ThreadWeaver/WeaverObserver
+usr/include/KDE/ThumbCreator
+usr/include/KDE/kdbgstream
+usr/include/KDE/khtml/DrawContentsEvent
+usr/include/KDE/khtml/MouseDoubleClickEvent
+usr/include/KDE/khtml/MouseEvent
+usr/include/KDE/khtml/MouseMoveEvent
+usr/include/KDE/khtml/MousePressEvent
+usr/include/KDE/khtml/MouseReleaseEvent
+usr/include/KDE/kndbgstream
 usr/include/conversion_check.h
 usr/include/dnssd/*
 usr/include/dockmainwindow3.h

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.installgen	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,3 +1,5 @@
+depends libphonon-dev
+
 link:usr/lib/.+\.so\.[\d.]+$
 dst:apps/cmake/
 dst:/include/

Modified: branches/kde4/packages/kdelibs/debian/libphonon-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/libphonon-dev.install	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/libphonon-dev.install	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,2 +1,3 @@
+usr/include/KDE/Phonon/*
 usr/include/phonon/*
 usr/lib/libphonon*.so

Modified: branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,2 +1,2 @@
-dst:usr/include/phonon/.*
+dst:usr/include/.*(?i:phonon)/.*
 dst:usr/lib/libphonon.*\.so$

Modified: branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -6,7 +6,7 @@
 Debug output is not completely disabled, because QT_NO_DEBUG is not set.
 --- kde4libs-4.0.66+svn790271.orig/cmake/modules/FindKDE4Internal.cmake
 +++ kde4libs-4.0.66+svn790271/cmake/modules/FindKDE4Internal.cmake
-@@ -897,11 +897,13 @@
+@@ -896,11 +896,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")

Modified: branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -22,7 +22,7 @@
    if (kde_home[0] == '~')
 --- kde4libs-4.0.10~svn783501.orig/kinit/lnusertemp.c
 +++ kde4libs-4.0.10~svn783501/kinit/lnusertemp.c
-@@ -123,7 +123,7 @@
+@@ -127,7 +127,7 @@
  
    if (!kde_home || !kde_home[0])
    {

Modified: branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,6 +1,6 @@
 --- kde4libs-4.0.10~svn783501.orig/kded/kbuildsycoca.cpp
 +++ kde4libs-4.0.10~svn783501/kded/kbuildsycoca.cpp
-@@ -322,7 +322,7 @@
+@@ -307,7 +307,7 @@
       connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
               this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
  

Modified: branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,6 +1,6 @@
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -188,13 +188,7 @@
+@@ -192,13 +192,7 @@
      set(HAVE_OPENPTY)
  
      EXECUTE_PROCESS(

Modified: branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -42,7 +42,7 @@
  #include <kdebug.h>
 --- kde4libs-4.0.66+svn790271.orig/kio/kfile/kpropertiesdialog.cpp
 +++ kde4libs-4.0.66+svn790271/kio/kfile/kpropertiesdialog.cpp
-@@ -1887,7 +1887,15 @@
+@@ -1868,7 +1868,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
      fileSystemSupportsACLs =
@@ -97,7 +97,7 @@
      acl = acl_get_fd(src_fd);
 --- kde4libs-4.0.66+svn790271.orig/ConfigureChecks.cmake
 +++ kde4libs-4.0.66+svn790271/ConfigureChecks.cmake
-@@ -150,11 +150,11 @@
+@@ -154,11 +154,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
      endif (NOT login_in_libc)

Modified: branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -2,7 +2,7 @@
 ===================================================================
 --- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake	2008-04-20 04:40:43.000000000 +0300
 +++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake	2008-04-20 04:41:27.000000000 +0300
-@@ -217,6 +217,24 @@
+@@ -218,6 +218,24 @@
  # this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
  cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
  
@@ -27,7 +27,7 @@
  if(KDE4_FOUND)
    # Already found in this cmake run, nothing more to do
  else(KDE4_FOUND)
-@@ -658,24 +676,6 @@
+@@ -672,24 +690,6 @@
  endif(WIN32)
  
  

Modified: branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,6 +1,6 @@
 --- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake	2008-04-20 19:09:07.000000000 +0000
 +++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake	2008-04-20 19:09:52.000000000 +0000
-@@ -213,8 +213,8 @@
+@@ -214,8 +214,8 @@
  # Redistribution and use is allowed according to the terms of the BSD license.
  # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
  
@@ -11,7 +11,7 @@
  cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
  
  # cmake 2.5, i.e. the cvs version between 2.4 and 2.6, is not supported
-@@ -253,7 +253,6 @@
+@@ -254,7 +254,6 @@
  include (CheckCXXCompilerFlag)
  include (CheckCXXSourceCompiles)
  
@@ -19,7 +19,7 @@
  # get the directory of the current file, used later on in the file
  get_filename_component( kde_cmake_module_dir  ${CMAKE_CURRENT_LIST_FILE} PATH)
  
-@@ -269,23 +268,94 @@
+@@ -270,23 +269,94 @@
  
  #######################  #now try to find some kde stuff  ################################
  
@@ -129,7 +129,7 @@
     set(EXECUTABLE_OUTPUT_PATH ${kdelibs_BINARY_DIR}/bin )
  
     if (WIN32)
-@@ -354,89 +424,7 @@
+@@ -355,89 +425,7 @@
        get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
     endif (WIN32)
  
@@ -318,7 +318,7 @@
  if (Q_WS_MAC)
 --- kde4libs-4.0.70+svn798712.orig/kfile/CMakeLists.txt	2008-04-20 18:04:52.000000000 +0000
 +++ kde4libs-4.0.70+svn798712/kfile/CMakeLists.txt	2008-04-20 19:09:14.000000000 +0000
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
  )
  
  set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
@@ -329,7 +329,7 @@
    kdiroperator.h
 --- kde4libs-4.0.70+svn798712.orig/khtml/CMakeLists.txt	2008-04-20 18:04:52.000000000 +0000
 +++ kde4libs-4.0.70+svn798712/khtml/CMakeLists.txt	2008-04-20 19:09:14.000000000 +0000
-@@ -333,7 +333,7 @@
+@@ -334,7 +334,7 @@
  create_lut(ecma/kjs_audio.cpp kjs_audio.lut.h)
  
  

Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-04-24 22:33:01 UTC (rev 10253)
@@ -1,25 +1,61 @@
---- kde4libs.orig/dnssd/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/dnssd/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -61,6 +61,7 @@
+--- kde4libs.orig/dnssd/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/dnssd/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -59,8 +59,9 @@
+ if (HAVE_DNSSD)
+   target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${DNSSD_LIBRARIES} )
  else (HAVE_DNSSD)
-   target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS})
+-  target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS})
++  target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} )
  endif (HAVE_DNSSD)
-+set_target_properties(kdnssd PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui")
++set_target_properties(kdnssd PROPERTIES LINK_INTERFACE_LIBRARIES "$(QT_QTCORE_LIBRARY")
  
  set_target_properties(kdnssd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kdnssd ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/interfaces/ktexteditor/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/interfaces/ktexteditor/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/interfaces/kimproxy/library/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/interfaces/kimproxy/library/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -16,7 +16,7 @@
+ 
+ kde4_add_library(kimproxy SHARED ${kimproxy_LIB_SRCS})
+ 
+-target_link_libraries(kimproxy  ${KDE4_KIO_LIBS} )
++target_link_libraries(kimproxy  ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} )
+ 
+ set_target_properties(kimproxy PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ 
+--- kde4libs.orig/interfaces/kmediaplayer/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/interfaces/kmediaplayer/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -14,7 +14,7 @@
+ 
+ kde4_add_library(kmediaplayer SHARED ${kmediaplayer_LIB_SRCS})
+ 
+-target_link_libraries(kmediaplayer  ${KDE4_KPARTS_LIBS} )
++target_link_libraries(kmediaplayer  ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY} )
+ 
+ set_target_properties(kmediaplayer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kmediaplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/interfaces/ktexteditor/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/interfaces/ktexteditor/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -25,6 +25,7 @@
  kde4_add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS})
  
  target_link_libraries(ktexteditor  ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} kparts )
-+set_target_properties(ktexteditor PROPERTIES LINK_INTERFACE_LIBRARIES "kparts")
++set_target_properties(ktexteditor PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kdeui;kparts")
  
  set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS ktexteditor ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kde3support/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kde3support/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kate/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kate/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -144,7 +144,7 @@
+ kde4_add_plugin(katepart ${katepart_PART_SRCS})
+ 
+ # linking
+-target_link_libraries(katepart ${KDE4_KDECORE_LIBS} kutils ktexteditor kde3support ${QT_QTSCRIPT_LIBRARY})
++target_link_libraries(katepart ${KDE4_KDECORE_LIBS} kutils ktexteditor kde3support ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+ 
+ if(KDE4_ENABLE_FINAL)
+ 	macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/katepart_final_cpp.cpp )
+--- kde4libs.orig/kde3support/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kde3support/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -78,7 +78,9 @@
  
  kde4_add_library(kde3support SHARED ${kde3support_LIB_SRCS})
@@ -27,12 +63,12 @@
 -target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS})
 +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 "kio;${QT_QT3SUPPORT_LIBRARY}")
++set_target_properties(kde3support PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kparts;kdeui;${QT_QTGUI_LIBRARY};kio;${QT_QT3SUPPORT_LIBRARY}")
  
  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-20 17:33:42.000000000 +0000
-+++ kde4libs/kdecore/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kdecore/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kdecore/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -105,6 +105,7 @@
     if (NOT HAVE_TRUNC)
         target_link_libraries(kdefakes  m )
@@ -45,40 +81,49 @@
  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};${QT_QTNETWORK_LIBRARY};${QT_QTDBUS_LIBRARY}")
++set_target_properties(kdecore PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_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/kded/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kded/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kded/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kded/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -13,7 +13,7 @@
  
  kde4_add_kdeinit_executable(kded4  ${kded_KDEINIT_SRCS})
  
 -target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} )
-+target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} ${X11_X11_LIB} )
++target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY} )
  
  install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
  
---- kde4libs.orig/kdesu/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kdesu/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+@@ -47,7 +47,7 @@
+ kde4_add_kdeinit_executable( kbuildsycoca4 NOGUI ${kbuildsycoca_KDEINIT_SRCS})
+ 
+ # needs kio for KServiceGroup
+-target_link_libraries(kdeinit_kbuildsycoca4  ${KDE4_KIO_LIBS} )
++target_link_libraries(kdeinit_kbuildsycoca4  ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} )
+ 
+ install(TARGETS kdeinit_kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+--- kde4libs.orig/kdesu/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kdesu/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -18,6 +18,7 @@
  kde4_add_library(kdesu SHARED ${kdesu_LIB_SRCS})
  
  target_link_libraries(kdesu ${KDE4_KPTY_LIBS} )
-+set_target_properties(kdesu PROPERTIES LINK_INTERFACE_LIBRARIES "kpty")
++set_target_properties(kdesu PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY}")
  
  if(KDESU_USE_SUDO_DEFAULT)
     set_source_files_properties(su.cpp
---- kde4libs.orig/kdeui/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kdeui/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kdeui/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kdeui/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -280,7 +280,8 @@
  
  kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
  
 -target_link_libraries(kdeui  ${QT_QTSVG_LIBRARY} ${KDE4_KDECORE_LIBS} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} )
 +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 "kdecore;${QT_QTSVG_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTDBUS_LIBRARY}" )
++set_target_properties(kdeui PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kdecore" )
  
  if(MINGW)
     target_link_libraries(kdeui gdi32)
@@ -102,30 +147,34 @@
  
  install( TARGETS kded_globalaccel DESTINATION ${PLUGIN_INSTALL_DIR} )
  
---- kde4libs.orig/kfile/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kfile/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -37,6 +37,7 @@
+--- kde4libs.orig/kfile/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kfile/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -37,7 +37,9 @@
+    ${ZLIB_LIBRARY}
     ${STRIGI_LIBRARIES}
     ${KDE4_SOLID_LIBS}
++   ${QT_QTXML_LIBRARY}
  )
-+set_target_properties(kfile PROPERTIES LINK_INTERFACE_LIBRARIES "kde3support")
++set_target_properties(kfile PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kio;kdeui")
  
  set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kfile ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/khtml/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/khtml/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -296,7 +296,9 @@
+--- kde4libs.orig/khtml/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/khtml/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -297,7 +297,11 @@
  
  kde4_add_library(khtml SHARED ${khtml_LIB_SRCS})
  
 -target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} )
 +target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${X11_X11_LIB}
-+   ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} )
-+set_target_properties(khtml PROPERTIES LINK_INTERFACE_LIBRARIES "kparts")
++   ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES}
++   ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY}
++   )
++set_target_properties(khtml PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kparts")
  
  set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
  
-@@ -342,7 +344,7 @@
+@@ -343,7 +347,7 @@
  
  kde4_add_plugin(khtmlpart WITH_PREFIX ${khtmlpart_PART_SRCS})
  
@@ -134,8 +183,19 @@
  
  install(TARGETS khtmlpart  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
---- kde4libs.orig/khtml/kmultipart/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/khtml/kmultipart/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/khtml/java/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/khtml/java/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -23,7 +23,7 @@
+ 
+ kde4_add_plugin(kjavaappletviewer ${kjavaappletviewer_PART_SRCS})
+ 
+-target_link_libraries(kjavaappletviewer  ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
++target_link_libraries(kjavaappletviewer  ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+ 
+ install(TARGETS kjavaappletviewer  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+--- kde4libs.orig/khtml/kmultipart/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/khtml/kmultipart/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -9,7 +9,7 @@
  
  kde4_add_plugin(kmultipart WITH_PREFIX ${kmultipart_PART_SRCS})
@@ -145,38 +205,83 @@
  
  install(TARGETS kmultipart  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
---- kde4libs.orig/kinit/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kinit/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kinit/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kinit/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -136,7 +136,7 @@
  kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS})
  set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER)
  
 -target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} )
-+target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} ${X11_X11_LIB} )
++target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY} )
  
  install(TARGETS kdeinit_klauncher ${INSTALL_TARGETS_DEFAULT_ARGS})
  
---- kde4libs.orig/kio/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kio/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -235,7 +235,9 @@
+--- kde4libs.orig/kio/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kio/CMakeLists.txt	2008-04-25 00:38:49.000000000 +0300
+@@ -235,7 +235,10 @@
  
  kde4_add_library(kio SHARED ${kio_LIB_SRCS})
  
 -target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY} ${KDE4_SOLID_LIBS})
 +target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY} ${X11_X11_LIB}
-+  ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY} ${KDE4_SOLID_LIBS} )
-+set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui")
++  ${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;${QT_QTGUI_LIBRARY}")
  
  
  set(SYS_INOTIFY_H_FOUND 0)
---- kde4libs.orig/kioslave/http/CMakeLists.txt	2008-04-20 17:33:41.000000000 +0000
-+++ kde4libs/kioslave/http/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kio/misc/kpac/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kio/misc/kpac/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -15,7 +15,7 @@
+ 
+ kde4_add_plugin(kded_proxyscout ${kded_proxyscout_PART_SRCS})
+ 
+-target_link_libraries(kded_proxyscout  ${KDE4_KDECORE_LIBS} kio kjs )
++target_link_libraries(kded_proxyscout  ${KDE4_KDECORE_LIBS} kio kjs ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+ 
+ # this needs -lresolv e.g on Slackware, but not on FreeBSD
+ if (HAVE_RESOLV_LIBRARY)
+--- kde4libs.orig/kio/misc/kssld/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kio/misc/kssld/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -6,7 +6,7 @@
+ 
+ kde4_add_plugin(kded_kssld ${kded_kssld_PART_SRCS})
+ 
+-target_link_libraries(kded_kssld  ${KDE4_KDECORE_LIBS} kio )
++target_link_libraries(kded_kssld  ${KDE4_KDECORE_LIBS} kio ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+ 
+ install(TARGETS kded_kssld  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+--- kde4libs.orig/kio/misc/kwalletd/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kio/misc/kwalletd/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -22,7 +22,7 @@
+ kde4_add_plugin(kded_kwalletd ${kded_kwalletd_PART_SRCS})
+ 
+ # uses kio for KDirWatch
+-target_link_libraries(kded_kwalletd  ${KDE4_KIO_LIBS} kwalletbackend )
++target_link_libraries(kded_kwalletd  ${KDE4_KIO_LIBS} kwalletbackend ${QT_QTDBUS_LIBRARY} )
+ 
+ install(TARGETS kded_kwalletd  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+--- kde4libs.orig/kioslave/ftp/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kioslave/ftp/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -13,7 +13,7 @@
+ 
+ kde4_add_plugin(kio_ftp ${kio_ftp_PART_SRCS})
+ 
+-target_link_libraries(kio_ftp  ${KDE4_KDECORE_LIBS} kio )
++target_link_libraries(kio_ftp  ${KDE4_KDECORE_LIBS} kio ${QT_QTNETWORK_LIBRARY} )
+ 
+ install(TARGETS kio_ftp  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+--- kde4libs.orig/kioslave/http/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kioslave/http/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -37,7 +37,7 @@
  
  kde4_add_kdeinit_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_KDEINIT_SRCS})
  
 -target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} )
-+target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} ${ZLIB_LIBRARY} )
++target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${ZLIB_LIBRARY} )
  
  install(TARGETS kdeinit_kio_http_cache_cleaner ${INSTALL_TARGETS_DEFAULT_ARGS})
  
@@ -185,23 +290,32 @@
  kde4_add_plugin(kio_http ${kio_http_PART_SRCS})
  
 -target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm )
-+target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm ${ZLIB_LIBRARY} )
++target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
  if(GSSAPI_FOUND)
    target_link_libraries(kio_http ${GSSAPI_LIBS} )
  endif(GSSAPI_FOUND)
---- kde4libs.orig/kioslave/http/kcookiejar/CMakeLists.txt	2008-04-20 17:33:41.000000000 +0000
-+++ kde4libs/kioslave/http/kcookiejar/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kioslave/http/kcookiejar/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kioslave/http/kcookiejar/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -25,7 +25,7 @@
+     set_target_properties(kcookiejar4 PROPERTIES COMPILE_FLAGS "-include \"${CMAKE_CURRENT_SOURCE_DIR}/qdeclareqlistint_hack.h\"" )
+ endif(MSVC)
+ 
+-target_link_libraries( kcookiejar4 ${KDE4_KDECORE_LIBS} )
++target_link_libraries( kcookiejar4 ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} )
+ 
+ install(TARGETS kcookiejar4 DESTINATION ${BIN_INSTALL_DIR} )
+ 
 @@ -45,7 +45,7 @@
  
  kde4_add_plugin(kded_kcookiejar ${kded_kcookiejar_PART_SRCS})
  
 -target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
-+target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${X11_X11_LIB} )
++target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY} )
  
  install(TARGETS kded_kcookiejar  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
---- kde4libs.orig/kjs/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kjs/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kjs/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kjs/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -167,6 +167,7 @@
  
  if(UNIX)
@@ -210,18 +324,20 @@
  endif(UNIX)
  
  if(PCRE_FOUND)
---- kde4libs.orig/knewstuff/knewstuff2/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/knewstuff/knewstuff2/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -54,6 +54,7 @@
+--- kde4libs.orig/knewstuff/knewstuff2/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/knewstuff/knewstuff2/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -53,7 +53,8 @@
+ 
  kde4_add_library(knewstuff2 SHARED ${knewstuff2_core_SRCS} ${knewstuff2_dxs_SRCS} ${knewstuff2_ui_SRCS} ${knewstuff2_SRCS})
  
- target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
-+set_target_properties(knewstuff2 PROPERTIES LINK_INTERFACE_LIBRARIES "kio")
+-target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
++target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} )
++set_target_properties(knewstuff2 PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY}")
  set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  install(TARGETS knewstuff2 ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
  
---- kde4libs.orig/knotify/config/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/knotify/config/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/knotify/config/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/knotify/config/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -19,6 +19,7 @@
  
  # Needs KIO for KUrlRequester
@@ -230,70 +346,109 @@
  
  set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS knotifyconfig ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kparts/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kparts/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -25,6 +25,7 @@
+--- kde4libs.orig/kparts/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kparts/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -24,7 +24,8 @@
+ 
  kde4_add_library(kparts SHARED ${kparts_LIB_SRCS})
  
- target_link_libraries(kparts  ${KDE4_KDECORE_LIBS} kdeui kio)
-+set_target_properties(kparts PROPERTIES LINK_INTERFACE_LIBRARIES "kio")
+-target_link_libraries(kparts  ${KDE4_KDECORE_LIBS} kdeui kio)
++target_link_libraries(kparts  ${KDE4_KDECORE_LIBS} kdeui kio ${QT_QTXML_LIBRARY})
++set_target_properties(kparts PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kio;kdeui")
  
  set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kparts ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kpty/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kpty/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/kpty/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kpty/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -12,6 +12,7 @@
  kde4_add_library(kpty SHARED ${kpty_LIB_SRCS})
  
  target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY})
-+set_target_properties(kpty PROPERTIES LINK_INTERFACE_LIBRARIES "kdecore")
++set_target_properties(kpty PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore")
  
  set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kpty ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kross/core/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kross/core/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -12,6 +12,7 @@
+--- kde4libs.orig/kross/core/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kross/core/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -11,7 +11,8 @@
+ )
  
  kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
- target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY})
-+set_target_properties(krosscore PROPERTIES LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSCRIPT_LIBRARY}")
+-target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY})
++target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY})
++set_target_properties(krosscore PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTSCRIPT_LIBRARY};${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY}")
  set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  install(TARGETS krosscore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
  
---- kde4libs.orig/kross/ui/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kross/ui/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -15,6 +15,7 @@
+--- kde4libs.orig/kross/modules/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kross/modules/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -12,5 +12,5 @@
+ set(krossmoduleforms_SRCS form.cpp)
+ kde4_add_plugin(krossmoduleforms ${krossmoduleforms_SRCS})
  
+-target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore krossui)
++target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore)
+ install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR})
+--- kde4libs.orig/kross/qts/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/kross/qts/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -3,7 +3,7 @@
+ ########### next target ###############
+ set(krossqtsplugin_LIB_SRCS plugin.cpp)
+ kde4_add_library(krossqtsplugin SHARED ${krossqtsplugin_LIB_SRCS})
+-target_link_libraries(krossqtsplugin ${QT_QTUITOOLS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} krosscore ${QT_QTSCRIPT_LIBRARY})
++target_link_libraries(krossqtsplugin ${QT_QTUITOOLS_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} krosscore ${QT_QTSCRIPT_LIBRARY})
+ set_target_properties(krossqtsplugin PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS krossqtsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/script)
+ 
+--- kde4libs.orig/kross/ui/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kross/ui/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -14,7 +14,8 @@
+    )
+ 
  kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
- target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
-+set_target_properties(krossui PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui;kparts")
+-target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
++target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY})
++set_target_properties(krossui PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kparts")
  set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  install(TARGETS krossui ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
  
---- kde4libs.orig/kutils/CMakeLists.txt	2008-04-20 17:33:42.000000000 +0000
-+++ kde4libs/kutils/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
-@@ -31,6 +31,7 @@
+--- kde4libs.orig/kutils/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/kutils/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -30,7 +30,8 @@
+ 
  kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
  
- target_link_libraries(kutils  ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
-+set_target_properties(kutils PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui")
+-target_link_libraries(kutils  ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
++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 VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kutils ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/phonon/libkaudiodevicelist/CMakeLists.txt	2008-04-20 17:33:41.000000000 +0000
-+++ kde4libs/phonon/libkaudiodevicelist/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/phonon/kcm/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/phonon/kcm/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
+@@ -5,7 +5,7 @@
+ 
+ kde4_add_plugin(kcm_phonon ${kcmphonon_SRCS})
+ target_link_libraries(kcm_phonon ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS}
+-	${KDE4_KAUDIODEVICELIST_LIBS})
++	${KDE4_KAUDIODEVICELIST_LIBS} ${KDE4_KIO_LIBS})
+ 
+ install(TARGETS kcm_phonon  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+--- kde4libs.orig/phonon/libkaudiodevicelist/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/phonon/libkaudiodevicelist/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -28,7 +28,8 @@
  endif(ALSA_FOUND)
  
  kde4_add_library(kaudiodevicelist SHARED ${kaudiodevicelist_LIB_SRCS})
 -target_link_libraries(kaudiodevicelist ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${ASOUND_LIBRARY})
 +target_link_libraries(kaudiodevicelist ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${ASOUND_LIBRARY})
-+set_target_properties(kaudiodevicelist PROPERTIES LINK_INTERFACE_LIBRARIES "solid")
++set_target_properties(kaudiodevicelist PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};solid")
  
  set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  
---- kde4libs.orig/solid/solid/CMakeLists.txt	2008-04-20 17:33:41.000000000 +0000
-+++ kde4libs/solid/solid/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/solid/solid/CMakeLists.txt	2008-04-25 00:18:14.000000000 +0300
++++ kde4libs/solid/solid/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -181,6 +181,7 @@
  kde4_add_library(solid SHARED ${solid_LIB_SRCS})
  
@@ -302,8 +457,8 @@
  
  set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS solid ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/sonnet/plugins/hspell/CMakeLists.txt	2008-04-20 17:33:41.000000000 +0000
-+++ kde4libs/sonnet/plugins/hspell/CMakeLists.txt	2008-04-20 17:33:46.000000000 +0000
+--- kde4libs.orig/sonnet/plugins/hspell/CMakeLists.txt	2008-04-25 00:14:09.000000000 +0300
++++ kde4libs/sonnet/plugins/hspell/CMakeLists.txt	2008-04-25 00:18:53.000000000 +0300
 @@ -9,7 +9,7 @@
  
  kde4_add_plugin(kspell_hspell ${kspell_hspell_PART_SRCS})
@@ -313,14 +468,23 @@
  
  install(TARGETS kspell_hspell  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
---- kde4libs.orig/phonon/kcm/CMakeLists.txt	2008-04-20 17:33:41.000000000 +0000
-+++ kde4libs/phonon/kcm/CMakeLists.txt	2008-04-20 17:34:02.000000000 +0000
-@@ -5,7 +5,7 @@
+--- kde4libs.orig/kjsembed/kjsembed/CMakeLists.txt	2008-04-25 00:46:32.000000000 +0300
++++ kde4libs/kjsembed/kjsembed/CMakeLists.txt	2008-04-25 00:49:47.000000000 +0300
+@@ -69,6 +69,7 @@
+ kde4_add_library(${KJSEMBEDLIBNAME} SHARED ${kjsembed_LIB_SRCS})
  
- kde4_add_plugin(kcm_phonon ${kcmphonon_SRCS})
- target_link_libraries(kcm_phonon ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS}
--	${KDE4_KAUDIODEVICELIST_LIBS})
-+	${KDE4_KAUDIODEVICELIST_LIBS} ${KDE4_KIO_LIBS})
+ target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${KJSLIBNAME} )
++set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES LINK_INTERFACE_LIBRARIES ${KJSLIBNAME} ${QT_QTCORE_LIBRARY}) 
  
- install(TARGETS kcm_phonon  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/nepomuk/rcgen/CMakeLists.txt	2008-04-25 00:54:01.000000000 +0300
++++ kde4libs/nepomuk/rcgen/CMakeLists.txt	2008-04-25 00:54:06.000000000 +0300
+@@ -16,7 +16,6 @@
+   ${SOPRANO_LIBRARIES}
+   ${QT_QTCORE_LIBRARY}
+   ${QT_QTDBUS_LIBRARY}
+-  ${QT_QTTEST_LIBRARY}
+ )
  
+ install(TARGETS nepomuk-rcgen DESTINATION ${BIN_INSTALL_DIR} )

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2008-04-24 22:27:02 UTC (rev 10252)
+++ branches/kde4/packages/kdelibs/debian/rules	2008-04-24 22:33:01 UTC (rev 10253)
@@ -14,5 +14,8 @@
 # remove the dependency on kdebase-runtime
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime
 
+# Disable --as-needed. KDELibs is pretty clean now.
+DEB_KDE_LINK_WITH_AS_NEEDED := no
+
 include debian/cdbs/kde.mk
 




More information about the pkg-kde-commits mailing list