3 files changed, 457 insertions, 25 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index f362e482a415..32a89e524fb8 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,8 +14,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl \
-		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
@@ -24,7 +22,7 @@ LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion \
 
 LATEST_LINK=	${PORTNAME}4
 
-CONFLICTS=	kdebase-4.4.[1-5]
+CONFLICTS=	kdeutils-4.5.[0-5]
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier \
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 17cc638a4991..102e96e20f08 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdesdk-4.5.5.tar.bz2) = 6fce6c8b4dec64a5d3495ca25823fe64b85a579cedff2c217af37505df13150c
-SIZE (KDE/kdesdk-4.5.5.tar.bz2) = 5764870
+SHA256 (KDE/kdesdk-4.6.1.tar.bz2) = 14da414a1e21f31430036398ce293c69e78d6062c7f43dbb4200af89d0fadb54
+SIZE (KDE/kdesdk-4.6.1.tar.bz2) = 6072419
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index a2cee351b389..67ea02fb00af 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -33,7 +33,6 @@ bin/hotshot2calltree
 bin/includemocs
 bin/kapptemplate
 bin/kate
-bin/kbugbuster
 bin/kcachegrind
 bin/kde-systemsettings-tree.py
 bin/kde_generate_export_header
@@ -54,6 +53,7 @@ bin/makeobj
 bin/memprof2calltree
 bin/noncvslist
 bin/nonsvnlist
+bin/okteta
 bin/op2calltree
 bin/optimizegraphics
 bin/package_crystalsvg
@@ -78,6 +78,323 @@ bin/umbrello
 bin/wcgrep
 bin/xml2pot
 bin/zonetab2pot.py
+include/KDE/Kasten/AbstractConnectJob
+include/KDE/Kasten/AbstractDocument
+include/KDE/Kasten/AbstractDocumentFactory
+include/KDE/Kasten/AbstractExportJob
+include/KDE/Kasten/AbstractFileSystemConnectJob
+include/KDE/Kasten/AbstractFileSystemExportJob
+include/KDE/Kasten/AbstractFileSystemLoadJob
+include/KDE/Kasten/AbstractFileSystemSyncFromRemoteJob
+include/KDE/Kasten/AbstractFileSystemSyncToRemoteJob
+include/KDE/Kasten/AbstractFileSystemSyncWithRemoteJob
+include/KDE/Kasten/AbstractGroupedViews
+include/KDE/Kasten/AbstractLinePopup
+include/KDE/Kasten/AbstractLoadJob
+include/KDE/Kasten/AbstractModel
+include/KDE/Kasten/AbstractModelDataGenerator
+include/KDE/Kasten/AbstractModelDataGeneratorConfigEditor
+include/KDE/Kasten/AbstractModelDataGeneratorConfigEditorFactory
+include/KDE/Kasten/AbstractModelExporter
+include/KDE/Kasten/AbstractModelExporterConfigEditor
+include/KDE/Kasten/AbstractModelExporterConfigEditorFactory
+include/KDE/Kasten/AbstractModelFileSystemSynchronizer
+include/KDE/Kasten/AbstractModelSelection
+include/KDE/Kasten/AbstractModelStreamEncoder
+include/KDE/Kasten/AbstractModelStreamEncoderConfigEditor
+include/KDE/Kasten/AbstractModelStreamEncoderConfigEditorFactory
+include/KDE/Kasten/AbstractModelSynchronizer
+include/KDE/Kasten/AbstractModelSynchronizerFactory
+include/KDE/Kasten/AbstractSelectionView
+include/KDE/Kasten/AbstractSyncFromRemoteJob
+include/KDE/Kasten/AbstractSyncToRemoteJob
+include/KDE/Kasten/AbstractSyncWithRemoteJob
+include/KDE/Kasten/AbstractTool
+include/KDE/Kasten/AbstractToolFactory
+include/KDE/Kasten/AbstractToolInlineView
+include/KDE/Kasten/AbstractToolView
+include/KDE/Kasten/AbstractToolViewFactory
+include/KDE/Kasten/AbstractToolWidget
+include/KDE/Kasten/AbstractView
+include/KDE/Kasten/AbstractViewArea
+include/KDE/Kasten/AbstractViewFactory
+include/KDE/Kasten/AbstractXmlGuiController
+include/KDE/Kasten/ClipboardController
+include/KDE/Kasten/CloseController
+include/KDE/Kasten/CopyAsController
+include/KDE/Kasten/CreatorController
+include/KDE/Kasten/DataSelectable
+include/KDE/Kasten/DocumentCreateManager
+include/KDE/Kasten/DocumentManager
+include/KDE/Kasten/DocumentSyncManager
+include/KDE/Kasten/DocumentVersionData
+include/KDE/Kasten/DocumentsTool
+include/KDE/Kasten/DocumentsToolView
+include/KDE/Kasten/DummyView
+include/KDE/Kasten/ExportController
+include/KDE/Kasten/FileSystemBrowserTool
+include/KDE/Kasten/FileSystemBrowserToolView
+include/KDE/Kasten/FullScreenController
+include/KDE/Kasten/JobManager
+include/KDE/Kasten/LoaderController
+include/KDE/Kasten/ModelCodecManager
+include/KDE/Kasten/ModelCodecViewManager
+include/KDE/Kasten/ModelDataGenerateThread
+include/KDE/Kasten/ModelEncoderFileSystemExportJob
+include/KDE/Kasten/ModelEncoderFileSystemExporter
+include/KDE/Kasten/ModelEncoderFileSystemExporterConfigEditor
+include/KDE/Kasten/ModelEncoderFileSystemExporterConfigEditorFactory
+include/KDE/Kasten/ModelStreamEncodeThread
+include/KDE/Kasten/ModifiedBarController
+include/KDE/Kasten/MultiViewAreas
+include/KDE/Kasten/Person
+include/KDE/Kasten/QuitController
+include/KDE/Kasten/ReadOnlyBarController
+include/KDE/Kasten/ReadOnlyController
+include/KDE/Kasten/SelectController
+include/KDE/Kasten/SelectedDataWriteable
+include/KDE/Kasten/SetRemoteController
+include/KDE/Kasten/ShellWindow
+include/KDE/Kasten/StatusBar
+include/KDE/Kasten/SwitchViewController
+include/KDE/Kasten/SynchronizeController
+include/KDE/Kasten/TabbedViews
+include/KDE/Kasten/ToggleButton
+include/KDE/Kasten/ToolInlineViewable
+include/KDE/Kasten/ToolListMenuController
+include/KDE/Kasten/UserListable
+include/KDE/Kasten/VersionController
+include/KDE/Kasten/VersionViewTool
+include/KDE/Kasten/VersionViewToolView
+include/KDE/Kasten/Versionable
+include/KDE/Kasten/ViewAreaSplitable
+include/KDE/Kasten/ViewListMenuController
+include/KDE/Kasten/ViewManager
+include/KDE/Kasten/WidgetsDockable
+include/KDE/Kasten/ZoomBarController
+include/KDE/Kasten/ZoomController
+include/KDE/Kasten/Zoomable
+include/KDE/Okteta/AbstractByteArrayColumnRenderer
+include/KDE/Okteta/AbstractByteArrayModel
+include/KDE/Okteta/AbstractByteArrayView
+include/KDE/Okteta/AbstractColumnRenderer
+include/KDE/Okteta/AbstractColumnStylist
+include/KDE/Okteta/Address
+include/KDE/Okteta/AddressRange
+include/KDE/Okteta/ArrayChangeMetrics
+include/KDE/Okteta/Bookmark
+include/KDE/Okteta/Bookmarkable
+include/KDE/Okteta/BookmarksConstIterator
+include/KDE/Okteta/BorderColumnRenderer
+include/KDE/Okteta/Byte
+include/KDE/Okteta/ByteArrayChange
+include/KDE/Okteta/ByteArrayColumnView
+include/KDE/Okteta/ByteArrayModel
+include/KDE/Okteta/ByteArrayRowColumnRenderer
+include/KDE/Okteta/ByteArrayRowView
+include/KDE/Okteta/ByteArrayTableLayout
+include/KDE/Okteta/ByteArrayTableRanges
+include/KDE/Okteta/ChangeHistory
+include/KDE/Okteta/ChangesDescribable
+include/KDE/Okteta/CharByteArrayColumnRenderer
+include/KDE/Okteta/CharCodec
+include/KDE/Okteta/Character
+include/KDE/Okteta/ColumnsView
+include/KDE/Okteta/Line
+include/KDE/Okteta/LinePosition
+include/KDE/Okteta/LinePositionRange
+include/KDE/Okteta/LineRange
+include/KDE/Okteta/NumberRange
+include/KDE/Okteta/OffsetColumnRenderer
+include/KDE/Okteta/OffsetFormat
+include/KDE/Okteta/PieceTableByteArrayModel
+include/KDE/Okteta/Range
+include/KDE/Okteta/Size
+include/KDE/Okteta/ValueByteArrayColumnRenderer
+include/KDE/Okteta/ValueCodec
+include/KDE/Okteta/Versionable
+include/KDE/Okteta/WidgetColumnStylist
+include/KDE/Okteta/WordByteArrayService
+include/kasten/abstractbytearraystreamencoder.h
+include/kasten/abstractconnectjob.h
+include/kasten/abstractcontroller.h
+include/kasten/abstractdocument.h
+include/kasten/abstractdocumentfactory.h
+include/kasten/abstractexportjob.h
+include/kasten/abstractfilesystemconnectjob.h
+include/kasten/abstractfilesystemexportjob.h
+include/kasten/abstractfilesystemloadjob.h
+include/kasten/abstractfilesystemsyncfromremotejob.h
+include/kasten/abstractfilesystemsynctoremotejob.h
+include/kasten/abstractfilesystemsyncwithremotejob.h
+include/kasten/abstractgroupedviews.h
+include/kasten/abstractlinepopup.h
+include/kasten/abstractloadjob.h
+include/kasten/abstractmodel.h
+include/kasten/abstractmodeldatagenerator.h
+include/kasten/abstractmodeldatageneratorconfigeditor.h
+include/kasten/abstractmodeldatageneratorconfigeditorfactory.h
+include/kasten/abstractmodelexporter.h
+include/kasten/abstractmodelexporterconfigeditor.h
+include/kasten/abstractmodelexporterconfigeditorfactory.h
+include/kasten/abstractmodelfilesystemsynchronizer.h
+include/kasten/abstractmodelselection.h
+include/kasten/abstractmodelstreamencoder.h
+include/kasten/abstractmodelstreamencoderconfigeditor.h
+include/kasten/abstractmodelstreamencoderconfigeditorfactory.h
+include/kasten/abstractmodelsynchronizer.h
+include/kasten/abstractmodelsynchronizerfactory.h
+include/kasten/abstractselectionview.h
+include/kasten/abstractsyncfromremotejob.h
+include/kasten/abstractsynctoremotejob.h
+include/kasten/abstractsyncwithremotejob.h
+include/kasten/abstracttool.h
+include/kasten/abstracttoolfactory.h
+include/kasten/abstracttoolinlineview.h
+include/kasten/abstracttoolview.h
+include/kasten/abstracttoolviewfactory.h
+include/kasten/abstracttoolwidget.h
+include/kasten/abstractview.h
+include/kasten/abstractviewarea.h
+include/kasten/abstractviewfactory.h
+include/kasten/abstractxmlguicontroller.h
+include/kasten/bookmarkscontroller.h
+include/kasten/bookmarkstool.h
+include/kasten/bookmarkstoolfactory.h
+include/kasten/bookmarkstoolview.h
+include/kasten/bookmarkstoolviewfactory.h
+include/kasten/bytearraycharsstreamencoder.h
+include/kasten/bytearraydocument.h
+include/kasten/bytearraydocumentfactory.h
+include/kasten/bytearrayrawfilesynchronizer.h
+include/kasten/bytearrayrawfilesynchronizerfactory.h
+include/kasten/bytearrayselection.h
+include/kasten/bytearraysourcecodestreamencoder.h
+include/kasten/bytearraysourcecodestreamencoderconfigeditor.h
+include/kasten/bytearraysourcecodestreamencoderconfigeditorfactory.h
+include/kasten/bytearraytextstreamencoderpreview.h
+include/kasten/bytearrayvaluesstreamencoder.h
+include/kasten/bytearrayvaluesstreamencoderconfigeditor.h
+include/kasten/bytearrayvaluesstreamencoderconfigeditorfactory.h
+include/kasten/bytearrayview.h
+include/kasten/bytearrayviewfactory.h
+include/kasten/bytearrayviewtextstreamencoder.h
+include/kasten/bytetabletool.h
+include/kasten/bytetabletoolfactory.h
+include/kasten/bytetabletoolview.h
+include/kasten/bytetabletoolviewfactory.h
+include/kasten/checksumtool.h
+include/kasten/checksumtoolfactory.h
+include/kasten/checksumtoolview.h
+include/kasten/checksumtoolviewfactory.h
+include/kasten/clipboardcontroller.h
+include/kasten/closecontroller.h
+include/kasten/copyascontroller.h
+include/kasten/creatorcontroller.h
+include/kasten/dataselectable.h
+include/kasten/documentcreatemanager.h
+include/kasten/documentinfotool.h
+include/kasten/documentinfotoolview.h
+include/kasten/documentmanager.h
+include/kasten/documentstool.h
+include/kasten/documentstoolview.h
+include/kasten/documentsyncmanager.h
+include/kasten/documentversiondata.h
+include/kasten/documentversionid.h
+include/kasten/dummyview.h
+include/kasten/exportcontroller.h
+include/kasten/filesystembrowsertool.h
+include/kasten/filesystembrowsertoolview.h
+include/kasten/filtertool.h
+include/kasten/filtertoolfactory.h
+include/kasten/filtertoolview.h
+include/kasten/filtertoolviewfactory.h
+include/kasten/fullscreencontroller.h
+include/kasten/gotooffsetcontroller.h
+include/kasten/gotooffsettool.h
+include/kasten/gotooffsettoolview.h
+include/kasten/infotool.h
+include/kasten/infotoolfactory.h
+include/kasten/infotoolview.h
+include/kasten/infotoolviewfactory.h
+include/kasten/insertcontroller.h
+include/kasten/jobmanager.h
+include/kasten/kastencontrollers_export.h
+include/kasten/kastencore.h
+include/kasten/kastencore_export.h
+include/kasten/kastengui.h
+include/kasten/kastengui_export.h
+include/kasten/kfinddirection.h
+include/kasten/loadercontroller.h
+include/kasten/modelcodecmanager.h
+include/kasten/modelcodecviewmanager.h
+include/kasten/modeldatageneratethread.h
+include/kasten/modelencoderfilesystemexporter.h
+include/kasten/modelencoderfilesystemexporterconfigeditor.h
+include/kasten/modelencoderfilesystemexporterconfigeditorfactory.h
+include/kasten/modelencoderfilesystemexportjob.h
+include/kasten/modelstreamencodethread.h
+include/kasten/modifiedbarcontroller.h
+include/kasten/multiviewareas.h
+include/kasten/oktetakastencontrollers_export.h
+include/kasten/oktetakastencore_export.h
+include/kasten/oktetakastengui_export.h
+include/kasten/overwritemodecontroller.h
+include/kasten/overwriteonlycontroller.h
+include/kasten/person.h
+include/kasten/poddecodertool.h
+include/kasten/poddecodertoolfactory.h
+include/kasten/poddecodertoolview.h
+include/kasten/poddecodertoolviewfactory.h
+include/kasten/printcontroller.h
+include/kasten/quitcontroller.h
+include/kasten/readonlybarcontroller.h
+include/kasten/readonlycontroller.h
+include/kasten/replacecontroller.h
+include/kasten/replaceuserqueryable.h
+include/kasten/searchcontroller.h
+include/kasten/searchuserqueryable.h
+include/kasten/selectcontroller.h
+include/kasten/selecteddatawriteable.h
+include/kasten/selectrangecontroller.h
+include/kasten/setremotecontroller.h
+include/kasten/shellwindow.h
+include/kasten/statusbar.h
+include/kasten/statusbarlayout.h
+include/kasten/stringsextracttool.h
+include/kasten/stringsextracttoolfactory.h
+include/kasten/stringsextracttoolview.h
+include/kasten/stringsextracttoolviewfactory.h
+include/kasten/structtool.h
+include/kasten/structtoolview.h
+include/kasten/structurestoolfactory.h
+include/kasten/structurestoolviewfactory.h
+include/kasten/switchviewcontroller.h
+include/kasten/synchronizecontroller.h
+include/kasten/tabbedviews.h
+include/kasten/togglebutton.h
+include/kasten/toolinlineviewable.h
+include/kasten/toolinlineviewwidget.h
+include/kasten/toollistmenucontroller.h
+include/kasten/toolviewdockwidget.h
+include/kasten/userlistable.h
+include/kasten/versionable.h
+include/kasten/versioncontroller.h
+include/kasten/versionviewtool.h
+include/kasten/versionviewtoolview.h
+include/kasten/viewareabox.h
+include/kasten/viewareasplitable.h
+include/kasten/viewareasplitcontroller.h
+include/kasten/viewbox.h
+include/kasten/viewconfigcontroller.h
+include/kasten/viewlistmenucontroller.h
+include/kasten/viewmanager.h
+include/kasten/viewmodecontroller.h
+include/kasten/viewstatuscontroller.h
+include/kasten/widgetsdockable.h
+include/kasten/zoomable.h
+include/kasten/zoombarcontroller.h
+include/kasten/zoomcontroller.h
 include/kate/application.h
 include/kate/documentmanager.h
 include/kate/mainwindow.h
@@ -90,6 +407,53 @@ include/kprofilemethod.h
 include/ktexteditor_codesnippets_core/completionmodel.h
 include/ktexteditor_codesnippets_core/ktexteditor_codesnippets_core_export.h
 include/ktexteditor_codesnippets_core/repository.h
+include/okteta/abstractbytearraycolumnrenderer.h
+include/okteta/abstractbytearraymodel.h
+include/okteta/abstractbytearrayview.h
+include/okteta/abstractcolumnrenderer.h
+include/okteta/abstractcolumnstylist.h
+include/okteta/address.h
+include/okteta/addressrange.h
+include/okteta/arraychangemetrics.h
+include/okteta/bookmark.h
+include/okteta/bookmarkable.h
+include/okteta/bookmarksconstiterator.h
+include/okteta/bookmarksconstiteratoradapter.h
+include/okteta/bordercolumnrenderer.h
+include/okteta/byte.h
+include/okteta/bytearraychange.h
+include/okteta/bytearraycolumnview.h
+include/okteta/bytearraymodel.h
+include/okteta/bytearrayrowcolumnrenderer.h
+include/okteta/bytearrayrowview.h
+include/okteta/bytearraytablelayout.h
+include/okteta/bytearraytableranges.h
+include/okteta/changehistory.h
+include/okteta/changesdescribable.h
+include/okteta/character.h
+include/okteta/charbytearraycolumnrenderer.h
+include/okteta/charcodec.h
+include/okteta/columnsview.h
+include/okteta/kadds.h
+include/okteta/line.h
+include/okteta/lineposition.h
+include/okteta/linepositionrange.h
+include/okteta/linerange.h
+include/okteta/numberrange.h
+include/okteta/offsetcolumnrenderer.h
+include/okteta/offsetformat.h
+include/okteta/oktetacore.h
+include/okteta/oktetacore_export.h
+include/okteta/oktetagui.h
+include/okteta/oktetagui_export.h
+include/okteta/piecetablebytearraymodel.h
+include/okteta/range.h
+include/okteta/size.h
+include/okteta/valuebytearraycolumnrenderer.h
+include/okteta/valuecodec.h
+include/okteta/versionable.h
+include/okteta/widgetcolumnstylist.h
+include/okteta/wordbytearrayservice.h
 lib/kde4/cervisiapart.so
 lib/kde4/fileviewgitplugin.so
 lib/kde4/fileviewsvnplugin.so
@@ -101,28 +465,42 @@ lib/kde4/katectagsplugin.so
 lib/kde4/kateexternaltoolsplugin.so
 lib/kde4/katefilebrowserplugin.so
 lib/kde4/katefiletemplates.so
+lib/kde4/katefiletreeplugin.so
 lib/kde4/katefindinfilesplugin.so
+lib/kde4/kategdbplugin.so
 lib/kde4/katekonsoleplugin.so
 lib/kde4/katemailfilesplugin.so
 lib/kde4/kateopenheaderplugin.so
 lib/kde4/katequickdocumentswitcherplugin.so
 lib/kde4/katesnippets_tngplugin.so
+lib/kde4/katesqlplugin.so
 lib/kde4/katesymbolviewerplugin.so
 lib/kde4/katetabbarextensionplugin.so
 lib/kde4/katetabifyplugin.so
 lib/kde4/katetextfilterplugin.so
 lib/kde4/katexmlcheckplugin.so
 lib/kde4/katexmltoolsplugin.so
-lib/kde4/kcal_bugzilla.so
 lib/kde4/kded_ksvnd.so
 lib/kde4/kio_perldoc.so
 lib/kde4/kio_svn.so
 lib/kde4/kstartperf.so
+lib/kde4/kuiviewerpart.so
+lib/kde4/libkbytearrayedit.so
 lib/kde4/libkomparenavtreepart.so
 lib/kde4/libkomparepart.so
-lib/kde4/libkuiviewerpart.so
+lib/kde4/oktetapart.so
 lib/kde4/plasma_applet_katesession.so
+lib/kde4/plugins/designer/oktetadesignerplugin.so
 lib/kde4/quithumbnail.so
+lib/libkastencontrollers.so
+lib/libkastencontrollers.so.5
+lib/libkastencontrollers.so.5.0.1
+lib/libkastencore.so
+lib/libkastencore.so.5
+lib/libkastencore.so.5.0.1
+lib/libkastengui.so
+lib/libkastengui.so.5
+lib/libkastengui.so.5.0.1
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.5
 lib/libkateinterfaces.so.5.0.1
@@ -142,28 +520,48 @@ lib/libkompareinterface.so.5.0.1
 lib/libktexteditor_codesnippets_core.so
 lib/libktexteditor_codesnippets_core.so.0
 lib/libktexteditor_codesnippets_core.so.0.0.1
+lib/liboktetacore.so
+lib/liboktetacore.so.5
+lib/liboktetacore.so.5.0.1
+lib/liboktetagui.so
+lib/liboktetagui.so.5
+lib/liboktetagui.so.5.0.1
+lib/liboktetakastencontrollers.so
+lib/liboktetakastencontrollers.so.5
+lib/liboktetakastencontrollers.so.5.0.1
+lib/liboktetakastencore.so
+lib/liboktetakastencore.so.5
+lib/liboktetakastencore.so.5.0.1
+lib/liboktetakastengui.so
+lib/liboktetakastengui.so.5
+lib/liboktetakastengui.so.5.0.1
 lib/strigi/strigila_diff.so
 lib/strigi/strigila_po.so
 lib/strigi/strigita_ts.so
 share/applications/kde4/cervisia.desktop
 share/applications/kde4/kapptemplate.desktop
 share/applications/kde4/kate.desktop
-share/applications/kde4/kbugbuster.desktop
 share/applications/kde4/kcachegrind.desktop
 share/applications/kde4/kdesrc-build.desktop
 share/applications/kde4/kompare.desktop
 share/applications/kde4/ktesnippets_editor.desktop
 share/applications/kde4/kuiviewer.desktop
 share/applications/kde4/lokalize.desktop
+share/applications/kde4/okteta.desktop
 share/applications/kde4/umbrello.desktop
 share/apps/cervisia/cervisia.notifyrc
 share/apps/cervisia/cervisiashellui.rc
 share/apps/cervisiapart/cervisiaui.rc
 share/apps/kabc/formats/kdeaccountsplugin.desktop
-share/apps/kate/default.katesession
 share/apps/kate/externaltools
 share/apps/kate/icons/oxygen/16x16/actions/null.png
+share/apps/kate/icons/oxygen/16x16/actions/sql-field-pk.png
+share/apps/kate/icons/oxygen/16x16/actions/sql-field-red.png
+share/apps/kate/icons/oxygen/16x16/actions/sql-field.png
+share/apps/kate/icons/oxygen/16x16/actions/sql-table.png
+share/apps/kate/icons/oxygen/16x16/actions/sql-view.png
 share/apps/kate/kateui.rc
+share/apps/kate/plugins/filetree/ui.rc
 share/apps/kate/plugins/findinfiles/ui.rc
 share/apps/kate/plugins/kate_kttsd/ui.rc
 share/apps/kate/plugins/katebuild/ui.rc
@@ -177,11 +575,13 @@ share/apps/kate/plugins/katefiletemplates/templates/docbookchapter.xml.katetempl
 share/apps/kate/plugins/katefiletemplates/templates/html.katetemplate
 share/apps/kate/plugins/katefiletemplates/templates/language.xml.katetemplate
 share/apps/kate/plugins/katefiletemplates/ui.rc
+share/apps/kate/plugins/kategdb/ui.rc
 share/apps/kate/plugins/katekonsole/ui.rc
 share/apps/kate/plugins/katemailfiles/ui.rc
 share/apps/kate/plugins/kateopenheader/ui.rc
 share/apps/kate/plugins/katequickdocumentswitcher/ui.rc
 share/apps/kate/plugins/katesnippets_tng/ui.rc
+share/apps/kate/plugins/katesql/ui.rc
 share/apps/kate/plugins/katesymbolviewer/ui.rc
 share/apps/kate/plugins/katetabbarextension/ui.rc
 share/apps/kate/plugins/katetabify/ui.rc
@@ -203,11 +603,6 @@ share/apps/katexmltools/xhtml1-frameset.dtd.xml
 share/apps/katexmltools/xhtml1-strict.dtd.xml
 share/apps/katexmltools/xhtml1-transitional.dtd.xml
 share/apps/katexmltools/xslt-1.0.dtd.xml
-share/apps/kbugbuster/kbugbusterui.rc
-share/apps/kbugbuster/pics/bars.png
-share/apps/kbugbuster/pics/logo.png
-share/apps/kbugbuster/pics/tools.png
-share/apps/kbugbuster/pics/top-right.png
 share/apps/kcachegrind/icons/hicolor/16x16/actions/move.png
 share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
 share/apps/kcachegrind/icons/hicolor/22x22/actions/hidetemplates.png
@@ -273,6 +668,14 @@ share/apps/lokalize/scripts/odf/xliff2odf.rc
 share/apps/lokalize/scripts/odf/xliffmerge.py
 share/apps/lokalize/scriptsui.rc
 share/apps/lokalize/translationmemoryrui.rc
+share/apps/okteta/oktetaui.rc
+share/apps/okteta/structures/elf/elf.desktop
+share/apps/okteta/structures/elf/elf.osd
+share/apps/okteta/structures/png/png.desktop
+share/apps/okteta/structures/png/png.osd
+share/apps/oktetapart/oktetapartbrowserui.rc
+share/apps/oktetapart/oktetapartreadonlyui.rc
+share/apps/oktetapart/oktetapartreadwriteui.rc
 share/apps/umbrello/common.ent
 share/apps/umbrello/docbook2xhtml.xsl
 share/apps/umbrello/headings/heading.adb
@@ -443,12 +846,15 @@ share/apps/umbrello/umbrelloui.rc
 share/apps/umbrello/xmi.css
 share/apps/umbrello/xmi2docbook.xsl
 share/config.kcfg/cervisiapart.kcfg
+share/config.kcfg/fileviewgitpluginsettings.kcfg
 share/config.kcfg/fileviewsvnpluginsettings.kcfg
 share/config.kcfg/kapptemplate.kcfg
 share/config.kcfg/lokalize.kcfg
+share/config.kcfg/structviewpreferences.kcfg
 share/config/katefiletemplates.knsrc
 share/config/katerc
 share/config/ktexteditor_codesnippets_core.knsrc
+share/config/okteta-structures.knsrc
 share/dbus-1/interfaces/org.kde.cervisia.cvsjob.xml
 share/dbus-1/interfaces/org.kde.cervisia.cvsloginjob.xml
 share/dbus-1/interfaces/org.kde.cervisia.cvsservice.xml
@@ -524,6 +930,9 @@ share/doc/HTML/en/lokalize/index.docbook
 share/doc/HTML/en/lokalize/original-diff.png
 share/doc/HTML/en/lokalize/sync.png
 share/doc/HTML/en/lokalize/tmview.png
+share/doc/HTML/en/okteta/common
+share/doc/HTML/en/okteta/index.cache.bz2
+share/doc/HTML/en/okteta/index.docbook
 share/doc/HTML/en/umbrello/activity-diagram.png
 share/doc/HTML/en/umbrello/add-remove-languages.png
 share/doc/HTML/en/umbrello/aggregation.png
@@ -559,7 +968,6 @@ share/doc/HTML/en/umbrello/use-case-diagram.png
 share/doc/HTML/en/umbrello/working_with_umbrello.docbook
 share/icons/hicolor/128x128/apps/kapptemplate.png
 share/icons/hicolor/128x128/apps/kate.png
-share/icons/hicolor/128x128/apps/kbugbuster.png
 share/icons/hicolor/128x128/apps/kompare.png
 share/icons/hicolor/128x128/apps/lokalize.png
 share/icons/hicolor/128x128/apps/umbrello.png
@@ -584,9 +992,9 @@ share/icons/hicolor/16x16/actions/transsearch.png
 share/icons/hicolor/16x16/apps/cervisia.png
 share/icons/hicolor/16x16/apps/kapptemplate.png
 share/icons/hicolor/16x16/apps/kate.png
-share/icons/hicolor/16x16/apps/kbugbuster.png
 share/icons/hicolor/16x16/apps/kompare.png
 share/icons/hicolor/16x16/apps/kuiviewer.png
+share/icons/hicolor/16x16/apps/okteta.png
 share/icons/hicolor/16x16/apps/umbrello.png
 share/icons/hicolor/16x16/mimetypes/application-x-uml.png
 share/icons/hicolor/22x22/actions/approved.png
@@ -611,7 +1019,6 @@ share/icons/hicolor/22x22/actions/transsearch.png
 share/icons/hicolor/22x22/apps/cervisia.png
 share/icons/hicolor/22x22/apps/kapptemplate.png
 share/icons/hicolor/22x22/apps/kate.png
-share/icons/hicolor/22x22/apps/kbugbuster.png
 share/icons/hicolor/22x22/apps/kompare.png
 share/icons/hicolor/22x22/apps/umbrello.png
 share/icons/hicolor/32x32/actions/approved.png
@@ -637,25 +1044,24 @@ share/icons/hicolor/32x32/actions/transsearch.png
 share/icons/hicolor/32x32/apps/cervisia.png
 share/icons/hicolor/32x32/apps/kapptemplate.png
 share/icons/hicolor/32x32/apps/kate.png
-share/icons/hicolor/32x32/apps/kbugbuster.png
 share/icons/hicolor/32x32/apps/kcachegrind.png
 share/icons/hicolor/32x32/apps/kompare.png
 share/icons/hicolor/32x32/apps/kuiviewer.png
 share/icons/hicolor/32x32/apps/lokalize.png
+share/icons/hicolor/32x32/apps/okteta.png
 share/icons/hicolor/32x32/apps/umbrello.png
 share/icons/hicolor/32x32/mimetypes/application-x-uml.png
 share/icons/hicolor/48x48/actions/approved.png
 share/icons/hicolor/48x48/apps/cervisia.png
 share/icons/hicolor/48x48/apps/kapptemplate.png
 share/icons/hicolor/48x48/apps/kate.png
-share/icons/hicolor/48x48/apps/kbugbuster.png
 share/icons/hicolor/48x48/apps/kcachegrind.png
 share/icons/hicolor/48x48/apps/kompare.png
 share/icons/hicolor/48x48/apps/kuiviewer.png
+share/icons/hicolor/48x48/apps/okteta.png
 share/icons/hicolor/48x48/apps/umbrello.png
 share/icons/hicolor/64x64/apps/kapptemplate.png
 share/icons/hicolor/64x64/apps/kate.png
-share/icons/hicolor/64x64/apps/kbugbuster.png
 share/icons/hicolor/64x64/apps/lokalize.png
 share/icons/hicolor/64x64/apps/umbrello.png
 share/icons/hicolor/scalable/actions/approved.svgz
@@ -707,6 +1113,9 @@ share/icons/oxygen/128x128/actions/svn_merge.png
 share/icons/oxygen/128x128/actions/svn_remove.png
 share/icons/oxygen/128x128/actions/svn_status.png
 share/icons/oxygen/128x128/actions/svn_switch.png
+share/icons/oxygen/16x16/actions/debug.png
+share/icons/oxygen/16x16/actions/interrupt.png
+share/icons/oxygen/16x16/actions/kill.png
 share/icons/oxygen/16x16/actions/repoadd.png
 share/icons/oxygen/16x16/actions/repomanage.png
 share/icons/oxygen/16x16/actions/snippetadd.png
@@ -808,23 +1217,27 @@ share/kde4/services/katectagsplugin.desktop
 share/kde4/services/kateexternaltoolsplugin.desktop
 share/kde4/services/katefilebrowserplugin.desktop
 share/kde4/services/katefiletemplates.desktop
+share/kde4/services/katefiletreeplugin.desktop
 share/kde4/services/katefindinfilesplugin.desktop
+share/kde4/services/kategdbplugin.desktop
 share/kde4/services/katekonsoleplugin.desktop
 share/kde4/services/katemailfilesplugin.desktop
 share/kde4/services/kateopenheader.desktop
 share/kde4/services/katequickdocumentswitcher.desktop
 share/kde4/services/katesnippets_tngplugin.desktop
+share/kde4/services/katesql.desktop
 share/kde4/services/katesymbolviewer.desktop
 share/kde4/services/katetabbarextension.desktop
 share/kde4/services/katetabifyplugin.desktop
 share/kde4/services/katetextfilter.desktop
 share/kde4/services/katexmlcheck.desktop
 share/kde4/services/katexmltools.desktop
+share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kded/ksvnd.desktop
 share/kde4/services/komparenavtreepart.desktop
 share/kde4/services/komparepart.desktop
-share/kde4/services/kresources/kcal/bugzilla.desktop
 share/kde4/services/kuiviewer_part.desktop
+share/kde4/services/oktetapart.desktop
 share/kde4/services/perldoc.protocol
 share/kde4/services/plasma-applet-katesession.desktop
 share/kde4/services/svn+file.protocol
@@ -835,8 +1248,18 @@ share/kde4/services/svn.protocol
 share/kde4/servicetypes/kateplugin.desktop
 share/kde4/servicetypes/komparenavigationpart.desktop
 share/kde4/servicetypes/kompareviewpart.desktop
+share/mime/application/base64.xml
+share/mime/application/btoa.xml
 share/mime/application/x-ktesnippets.xml
+share/mime/application/x-vnd.kde.okteta.structure.xml
 share/mime/packages/ktesnippets.xml
+share/mime/packages/okteta.xml
+share/mime/text/x-ascii85.xml
+share/mime/text/x-base32.xml
+share/mime/text/x-ihex.xml
+share/mime/text/x-srecord.xml
+share/mime/text/x-uuencode.xml
+share/mime/text/x-xxencode.xml
 share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrmtry share/strigi/fieldproperties
 @dirrmtry share/strigi
@@ -846,6 +1269,7 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrmtry share/icons/locolor/16x16
 @dirrmtry share/icons/locolor
 @dirrm share/doc/HTML/en/umbrello
+@dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/lokalize
 @dirrm share/doc/HTML/en/kompare
 @dirrm share/doc/HTML/en/kdesrc-build
@@ -856,6 +1280,11 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/umbrello/pics
 @dirrm share/apps/umbrello/headings
 @dirrm share/apps/umbrello
+@dirrm share/apps/oktetapart
+@dirrm share/apps/okteta/structures/png
+@dirrm share/apps/okteta/structures/elf
+@dirrm share/apps/okteta/structures
+@dirrm share/apps/okteta
 @dirrm share/apps/lokalize/scripts/odf
 @dirrm share/apps/lokalize/scripts/kde
 @dirrmtry share/apps/lokalize/scripts
@@ -879,8 +1308,6 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/kcachegrind/icons/hicolor
 @dirrm share/apps/kcachegrind/icons
 @dirrm share/apps/kcachegrind
-@dirrm share/apps/kbugbuster/pics
-@dirrm share/apps/kbugbuster
 @dirrm share/apps/katexmltools
 @dirrm share/apps/kate/plugins/katexmltools
 @dirrm share/apps/kate/plugins/katexmlcheck
@@ -888,11 +1315,13 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/kate/plugins/katetabify
 @dirrm share/apps/kate/plugins/katetabbarextension
 @dirrm share/apps/kate/plugins/katesymbolviewer
+@dirrm share/apps/kate/plugins/katesql
 @dirrm share/apps/kate/plugins/katesnippets_tng
 @dirrm share/apps/kate/plugins/katequickdocumentswitcher
 @dirrm share/apps/kate/plugins/kateopenheader
 @dirrm share/apps/kate/plugins/katemailfiles
 @dirrm share/apps/kate/plugins/katekonsole
+@dirrm share/apps/kate/plugins/kategdb
 @dirrm share/apps/kate/plugins/katefiletemplates/templates
 @dirrm share/apps/kate/plugins/katefiletemplates
 @dirrm share/apps/kate/plugins/kateexternaltools
@@ -900,6 +1329,7 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/kate/plugins/katebuild
 @dirrm share/apps/kate/plugins/kate_kttsd
 @dirrm share/apps/kate/plugins/findinfiles
+@dirrm share/apps/kate/plugins/filetree
 @dirrmtry share/apps/kate/plugins
 @dirrm share/apps/kate/icons/oxygen/16x16/actions
 @dirrm share/apps/kate/icons/oxygen/16x16
@@ -908,6 +1338,10 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrmtry share/apps/kate
 @dirrm share/apps/cervisiapart
 @dirrm share/apps/cervisia
+@dirrmtry include/okteta
 @dirrm include/ktexteditor_codesnippets_core
 @dirrm include/kompare
 @dirrmtry include/kate
+@dirrmtry include/kasten
+@dirrmtry include/KDE/Okteta
+@dirrmtry include/KDE/Kasten