Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

9 files changed, 13 insertions, 276 deletions

diff --git a/kde/kdeedu/.footprint.i686 b/kde/kdeedu/.footprint.i686
index c2475d7e7..105b1d241 100644
--- a/kde/kdeedu/.footprint.i686
+++ b/kde/kdeedu/.footprint.i686
@@ -114,48 +114,13 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kigpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libcantorpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkmplotpart.so
--rwxr-xr-x	root/root	usr/lib/kde4/libmarble_part.so
 -rwxr-xr-x	root/root	usr/lib/kde4/nuclearCalculator.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_didyouknow.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_kalgebra.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_molmassCalculator.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_parley.so
--rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_worldclock.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_engine_kalzium.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_engine_parley.so
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/AprsPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/CompassFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/CrosshairsPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GosmorePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GraticulePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/HostipPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/LatLonPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/LocalDatabasePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/MapScaleFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/MonavPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NavigationFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NominatimPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OpenRouteServicePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OverviewMap.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Photo.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/PositionMarker.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/ProgressFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/QNamNetworkPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/RoutingPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/RoutinoPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/StarsPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Weather.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Wikipedia.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/YoursPlugin.so
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/marble/
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/marble/libMarbleDeclarativePlugin.so
--rw-r--r--	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/marble/qmldir
 -rwxr-xr-x	root/root	usr/lib/kde4/rocs_GraphStructure.so
 -rwxr-xr-x	root/root	usr/lib/kde4/rocs_ListStructure.so
 -rwxr-xr-x	root/root	usr/lib/kde4/rocs_kmlParser.so
@@ -184,9 +149,6 @@ lrwxrwxrwx	root/root	usr/lib/libkeduvocdocument.so.4 -> libkeduvocdocument.so.4.
 lrwxrwxrwx	root/root	usr/lib/libkiten.so -> libkiten.so.4
 lrwxrwxrwx	root/root	usr/lib/libkiten.so.4 -> libkiten.so.4.6.0
 -rwxr-xr-x	root/root	usr/lib/libkiten.so.4.6.0
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.11
--rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.11.0
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.11 -> libmarblewidget.so.0.11.0
 lrwxrwxrwx	root/root	usr/lib/librocslib.so -> librocslib.so.4
 lrwxrwxrwx	root/root	usr/lib/librocslib.so.4 -> librocslib.so.4.6.0
 -rwxr-xr-x	root/root	usr/lib/librocslib.so.4.6.0
@@ -213,7 +175,6 @@ drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/ktouch.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kturtle.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kwordquiz.desktop
--rwxr-xr-x	root/root	usr/share/applications/kde4/marble.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/parley.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/rocs.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/step.desktop
@@ -255,9 +216,6 @@ drwxr-xr-x	root/root	usr/share/apps/cantor/xslt/
 -rw-r--r--	root/root	usr/share/apps/cantor/xslt/latex.xsl
 drwxr-xr-x	root/root	usr/share/apps/cantorpart/
 -rw-r--r--	root/root	usr/share/apps/cantorpart/cantor_part.rc
-drwxr-xr-x	root/root	usr/share/apps/cmake/
-drwxr-xr-x	root/root	usr/share/apps/cmake/modules/
--rw-r--r--	root/root	usr/share/apps/cmake/modules/FindMarble.cmake
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/widgets/
@@ -2730,8 +2688,6 @@ drwxr-xr-x	root/root	usr/share/apps/libkdeedu/data/
 -rw-r--r--	root/root	usr/share/apps/libkdeedu/data/spectra.xml
 -rw-r--r--	root/root	usr/share/apps/libkdeedu/data/symbols.csv
 -rw-r--r--	root/root	usr/share/apps/libkdeedu/data/symbols2.csv
-drwxr-xr-x	root/root	usr/share/apps/marble_part/
--rw-r--r--	root/root	usr/share/apps/marble_part/marble_part.rc
 drwxr-xr-x	root/root	usr/share/apps/parley/
 -rw-r--r--	root/root	usr/share/apps/parley/editorui.rc
 drwxr-xr-x	root/root	usr/share/apps/parley/icons/
@@ -3021,7 +2977,6 @@ drwxr-xr-x	root/root	usr/share/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/ktouch.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kwordquiz.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/languagesettings.kcfg
--rw-r--r--	root/root	usr/share/config.kcfg/marble.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/maximabackend.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/octavebackend.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/parley.kcfg
@@ -3395,30 +3350,6 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kwordquiz/common -> /usr/share/do
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kwordquiz/kwq-flashcard.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kwordquiz/kwq-multiple.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kwordquiz/kwq-qanda.png
-drwxr-xr-x	root/root	usr/share/doc/kde/html/en/marble/
-lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/marble/common -> /usr/share/doc/kde/html/en/common
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-cacheproxy.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-navigation.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-plugins.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-routing.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-view.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/download-region-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/download-region-2.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/download-region-3.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/index.cache.bz2
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/index.docbook
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/logo-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/mapview-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/measure-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/quick-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-2.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-3.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-4.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-5.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-6.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/search-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/search-2.png
 drwxr-xr-x	root/root	usr/share/doc/kde/html/en/parley/
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/parley/800px-Parley_mixed_letters_0-9-4_001.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/parley/Configure_blocking.png
@@ -3533,7 +3464,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/mimetypes/
@@ -3567,7 +3497,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/mimetypes/
@@ -3598,7 +3527,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/mimetypes/application-x-kig.png
@@ -3638,7 +3566,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/mimetypes/
@@ -3673,7 +3600,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/maximabackend.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/octavebackend.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/parley.png
@@ -3701,7 +3627,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kstars.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/mimetypes/
@@ -3765,10 +3690,8 @@ drwxr-xr-x	root/root	usr/share/kde4/services/cantor/
 -rw-r--r--	root/root	usr/share/kde4/services/kalgebraplasmoid.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kig_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kmplot_part.desktop
--rw-r--r--	root/root	usr/share/kde4/services/marble_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/nuclearCalculator.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-applet-Molmasscalculator.desktop
--rw-r--r--	root/root	usr/share/kde4/services/plasma-applet-kworldclock.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-dataengine-kalzium.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-dataengine-parley.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma_didyouknow.desktop
diff --git a/kde/kdeedu/.footprint.x86_64 b/kde/kdeedu/.footprint.x86_64
index df9da46c1..105b1d241 100644
--- a/kde/kdeedu/.footprint.x86_64
+++ b/kde/kdeedu/.footprint.x86_64
@@ -3,7 +3,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/blinken
 -rwxr-xr-x	root/root	usr/bin/calgebra
 -rwxr-xr-x	root/root	usr/bin/cantor
--rwxr-xr-x	root/root	usr/bin/geodatatest
 -rwxr-xr-x	root/root	usr/bin/kalgebra
 -rwxr-xr-x	root/root	usr/bin/kalgebramobile
 -rwxr-xr-x	root/root	usr/bin/kalzium
@@ -21,13 +20,10 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ktouch
 -rwxr-xr-x	root/root	usr/bin/kturtle
 -rwxr-xr-x	root/root	usr/bin/kwordquiz
--rwxr-xr-x	root/root	usr/bin/marble
 -rwxr-xr-x	root/root	usr/bin/parley
 -rwxr-xr-x	root/root	usr/bin/pykig.py
 -rwxr-xr-x	root/root	usr/bin/rocs
--rwxr-xr-x	root/root	usr/bin/routing-instructions
 -rwxr-xr-x	root/root	usr/bin/step
--rwxr-xr-x	root/root	usr/bin/tilecreator
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/libkdeedu/
 -rw-r--r--	root/root	usr/include/libkdeedu/chemicaldataobject.h
@@ -72,99 +68,6 @@ drwxr-xr-x	root/root	usr/include/libkiten/
 -rw-r--r--	root/root	usr/include/libkiten/HistoryPtrList.h
 -rw-r--r--	root/root	usr/include/libkiten/kromajiedit.h
 -rw-r--r--	root/root	usr/include/libkiten/libkitenexport.h
-drwxr-xr-x	root/root	usr/include/marble/
--rw-r--r--	root/root	usr/include/marble/AbstractDataPlugin.h
--rw-r--r--	root/root	usr/include/marble/AbstractDataPluginItem.h
--rw-r--r--	root/root	usr/include/marble/AbstractDataPluginModel.h
--rw-r--r--	root/root	usr/include/marble/AbstractFloatItem.h
--rw-r--r--	root/root	usr/include/marble/AbstractMarbleGraphicsLayout.h
--rw-r--r--	root/root	usr/include/marble/AbstractProjection.h
--rw-r--r--	root/root	usr/include/marble/AbstractWorkerThread.h
--rw-r--r--	root/root	usr/include/marble/ClipPainter.h
--rw-r--r--	root/root	usr/include/marble/CurrentLocationWidget.h
--rw-r--r--	root/root	usr/include/marble/DownloadRegionDialog.h
--rw-r--r--	root/root	usr/include/marble/EquirectProjection.h
--rw-r--r--	root/root	usr/include/marble/FileViewWidget.h
--rw-r--r--	root/root	usr/include/marble/FrameGraphicsItem.h
--rw-r--r--	root/root	usr/include/marble/GeoDataAbstractView.h
--rw-r--r--	root/root	usr/include/marble/GeoDataAccuracy.h
--rw-r--r--	root/root	usr/include/marble/GeoDataColorStyle.h
--rw-r--r--	root/root	usr/include/marble/GeoDataContainer.h
--rw-r--r--	root/root	usr/include/marble/GeoDataCoordinates.h
--rw-r--r--	root/root	usr/include/marble/GeoDataDocument.h
--rw-r--r--	root/root	usr/include/marble/GeoDataFeature.h
--rw-r--r--	root/root	usr/include/marble/GeoDataFolder.h
--rw-r--r--	root/root	usr/include/marble/GeoDataGeometry.h
--rw-r--r--	root/root	usr/include/marble/GeoDataHotSpot.h
--rw-r--r--	root/root	usr/include/marble/GeoDataIconStyle.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLabelStyle.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLatLonAltBox.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLatLonBox.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLineString.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLineStyle.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLinearRing.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLod.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLookAt.h
--rw-r--r--	root/root	usr/include/marble/GeoDataMultiGeometry.h
--rw-r--r--	root/root	usr/include/marble/GeoDataObject.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPlacemark.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPoint.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPolyStyle.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPolygon.h
--rw-r--r--	root/root	usr/include/marble/GeoDataRegion.h
--rw-r--r--	root/root	usr/include/marble/GeoDataStyle.h
--rw-r--r--	root/root	usr/include/marble/GeoDataStyleMap.h
--rw-r--r--	root/root	usr/include/marble/GeoDataStyleSelector.h
--rw-r--r--	root/root	usr/include/marble/GeoDocument.h
--rw-r--r--	root/root	usr/include/marble/GeoGraphicsItem.h
--rw-r--r--	root/root	usr/include/marble/GeoPainter.h
--rw-r--r--	root/root	usr/include/marble/LabelGraphicsItem.h
--rw-r--r--	root/root	usr/include/marble/LatLonBoxWidget.h
--rw-r--r--	root/root	usr/include/marble/LatLonEdit.h
--rw-r--r--	root/root	usr/include/marble/LayerInterface.h
--rw-r--r--	root/root	usr/include/marble/LegendWidget.h
--rw-r--r--	root/root	usr/include/marble/MapThemeManager.h
--rw-r--r--	root/root	usr/include/marble/MapViewWidget.h
--rw-r--r--	root/root	usr/include/marble/MarbleAboutDialog.h
--rw-r--r--	root/root	usr/include/marble/MarbleAbstractRunner.h
--rw-r--r--	root/root	usr/include/marble/MarbleControlBox.h
--rw-r--r--	root/root	usr/include/marble/MarbleDataFacade.h
--rw-r--r--	root/root	usr/include/marble/MarbleDirs.h
--rw-r--r--	root/root	usr/include/marble/MarbleGraphicsGridLayout.h
--rw-r--r--	root/root	usr/include/marble/MarbleGraphicsItem.h
--rw-r--r--	root/root	usr/include/marble/MarbleMap.h
--rw-r--r--	root/root	usr/include/marble/MarbleModel.h
--rw-r--r--	root/root	usr/include/marble/MarbleNavigator.h
--rw-r--r--	root/root	usr/include/marble/MarbleWidget.h
--rw-r--r--	root/root	usr/include/marble/MarbleWidgetInputHandler.h
--rw-r--r--	root/root	usr/include/marble/MercatorProjection.h
--rw-r--r--	root/root	usr/include/marble/NavigationWidget.h
--rw-r--r--	root/root	usr/include/marble/Planet.h
--rw-r--r--	root/root	usr/include/marble/PluginAboutDialog.h
--rw-r--r--	root/root	usr/include/marble/PluginInterface.h
--rw-r--r--	root/root	usr/include/marble/PositionTracking.h
--rw-r--r--	root/root	usr/include/marble/QtMarbleConfigDialog.h
--rw-r--r--	root/root	usr/include/marble/Quaternion.h
--rw-r--r--	root/root	usr/include/marble/RenderPlugin.h
--rw-r--r--	root/root	usr/include/marble/RenderPluginInterface.h
--rw-r--r--	root/root	usr/include/marble/RoutingManager.h
--rw-r--r--	root/root	usr/include/marble/RoutingWidget.h
--rw-r--r--	root/root	usr/include/marble/RunnerPlugin.h
--rw-r--r--	root/root	usr/include/marble/ScreenGraphicsItem.h
--rw-r--r--	root/root	usr/include/marble/Serializable.h
--rw-r--r--	root/root	usr/include/marble/SphericalProjection.h
--rw-r--r--	root/root	usr/include/marble/SunLocator.h
--rw-r--r--	root/root	usr/include/marble/TileCoordsPyramid.h
--rw-r--r--	root/root	usr/include/marble/TileCreator.h
--rw-r--r--	root/root	usr/include/marble/TileCreatorDialog.h
--rw-r--r--	root/root	usr/include/marble/TileLevelRangeWidget.h
--rw-r--r--	root/root	usr/include/marble/TinyWebBrowser.h
--rw-r--r--	root/root	usr/include/marble/ViewParams.h
--rw-r--r--	root/root	usr/include/marble/ViewportParams.h
--rw-r--r--	root/root	usr/include/marble/WidgetGraphicsItem.h
--rw-r--r--	root/root	usr/include/marble/geodata_export.h
--rw-r--r--	root/root	usr/include/marble/global.h
--rw-r--r--	root/root	usr/include/marble/marble_export.h
 drwxr-xr-x	root/root	usr/include/rocs/
 -rw-r--r--	root/root	usr/include/rocs/Data.h
 -rw-r--r--	root/root	usr/include/rocs/DataType.h
@@ -211,48 +114,13 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kigpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libcantorpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/libkmplotpart.so
--rwxr-xr-x	root/root	usr/lib/kde4/libmarble_part.so
 -rwxr-xr-x	root/root	usr/lib/kde4/nuclearCalculator.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_didyouknow.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_kalgebra.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_molmassCalculator.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_parley.so
--rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_worldclock.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_engine_kalzium.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_engine_parley.so
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/AprsPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/CompassFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/CrosshairsPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GosmorePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GraticulePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/HostipPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/LatLonPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/LocalDatabasePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/MapScaleFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/MonavPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NavigationFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NominatimPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OpenRouteServicePlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OverviewMap.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Photo.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/PositionMarker.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/ProgressFloatItem.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/QNamNetworkPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/RoutingPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/RoutinoPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/StarsPlugin.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Weather.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Wikipedia.so
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/YoursPlugin.so
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/
-drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/marble/
--rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/marble/libMarbleDeclarativePlugin.so
--rw-r--r--	root/root	usr/lib/kde4/plugins/marble/org/kde/edu/marble/qmldir
 -rwxr-xr-x	root/root	usr/lib/kde4/rocs_GraphStructure.so
 -rwxr-xr-x	root/root	usr/lib/kde4/rocs_ListStructure.so
 -rwxr-xr-x	root/root	usr/lib/kde4/rocs_kmlParser.so
@@ -281,9 +149,6 @@ lrwxrwxrwx	root/root	usr/lib/libkeduvocdocument.so.4 -> libkeduvocdocument.so.4.
 lrwxrwxrwx	root/root	usr/lib/libkiten.so -> libkiten.so.4
 lrwxrwxrwx	root/root	usr/lib/libkiten.so.4 -> libkiten.so.4.6.0
 -rwxr-xr-x	root/root	usr/lib/libkiten.so.4.6.0
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.11
--rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.11.0
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.11 -> libmarblewidget.so.0.11.0
 lrwxrwxrwx	root/root	usr/lib/librocslib.so -> librocslib.so.4
 lrwxrwxrwx	root/root	usr/lib/librocslib.so.4 -> librocslib.so.4.6.0
 -rwxr-xr-x	root/root	usr/lib/librocslib.so.4.6.0
@@ -310,7 +175,6 @@ drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/ktouch.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kturtle.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kwordquiz.desktop
--rwxr-xr-x	root/root	usr/share/applications/kde4/marble.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/parley.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/rocs.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/step.desktop
@@ -352,9 +216,6 @@ drwxr-xr-x	root/root	usr/share/apps/cantor/xslt/
 -rw-r--r--	root/root	usr/share/apps/cantor/xslt/latex.xsl
 drwxr-xr-x	root/root	usr/share/apps/cantorpart/
 -rw-r--r--	root/root	usr/share/apps/cantorpart/cantor_part.rc
-drwxr-xr-x	root/root	usr/share/apps/cmake/
-drwxr-xr-x	root/root	usr/share/apps/cmake/modules/
--rw-r--r--	root/root	usr/share/apps/cmake/modules/FindMarble.cmake
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/widgets/
@@ -2827,8 +2688,6 @@ drwxr-xr-x	root/root	usr/share/apps/libkdeedu/data/
 -rw-r--r--	root/root	usr/share/apps/libkdeedu/data/spectra.xml
 -rw-r--r--	root/root	usr/share/apps/libkdeedu/data/symbols.csv
 -rw-r--r--	root/root	usr/share/apps/libkdeedu/data/symbols2.csv
-drwxr-xr-x	root/root	usr/share/apps/marble_part/
--rw-r--r--	root/root	usr/share/apps/marble_part/marble_part.rc
 drwxr-xr-x	root/root	usr/share/apps/parley/
 -rw-r--r--	root/root	usr/share/apps/parley/editorui.rc
 drwxr-xr-x	root/root	usr/share/apps/parley/icons/
@@ -3118,7 +2977,6 @@ drwxr-xr-x	root/root	usr/share/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/ktouch.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/kwordquiz.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/languagesettings.kcfg
--rw-r--r--	root/root	usr/share/config.kcfg/marble.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/maximabackend.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/octavebackend.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/parley.kcfg
@@ -3492,30 +3350,6 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kwordquiz/common -> /usr/share/do
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kwordquiz/kwq-flashcard.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kwordquiz/kwq-multiple.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kwordquiz/kwq-qanda.png
-drwxr-xr-x	root/root	usr/share/doc/kde/html/en/marble/
-lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/marble/common -> /usr/share/doc/kde/html/en/common
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-cacheproxy.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-navigation.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-plugins.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-routing.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/configure-view.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/download-region-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/download-region-2.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/download-region-3.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/index.cache.bz2
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/index.docbook
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/logo-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/mapview-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/measure-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/quick-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-2.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-3.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-4.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-5.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/routing-6.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/search-1.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/marble/search-2.png
 drwxr-xr-x	root/root	usr/share/doc/kde/html/en/parley/
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/parley/800px-Parley_mixed_letters_0-9-4_001.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/parley/Configure_blocking.png
@@ -3630,7 +3464,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/mimetypes/
@@ -3664,7 +3497,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/mimetypes/
@@ -3695,7 +3527,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/mimetypes/application-x-kig.png
@@ -3735,7 +3566,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/mimetypes/
@@ -3770,7 +3600,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/ktouch.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/maximabackend.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/octavebackend.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/parley.png
@@ -3798,7 +3627,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kstars.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kturtle.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kwordquiz.png
--rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/marble.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/parley.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/step.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/mimetypes/
@@ -3862,10 +3690,8 @@ drwxr-xr-x	root/root	usr/share/kde4/services/cantor/
 -rw-r--r--	root/root	usr/share/kde4/services/kalgebraplasmoid.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kig_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kmplot_part.desktop
--rw-r--r--	root/root	usr/share/kde4/services/marble_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/nuclearCalculator.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-applet-Molmasscalculator.desktop
--rw-r--r--	root/root	usr/share/kde4/services/plasma-applet-kworldclock.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-dataengine-kalzium.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-dataengine-parley.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma_didyouknow.desktop
diff --git a/kde/kdeedu/Pkgfile b/kde/kdeedu/Pkgfile
index bb12809d8..6a5f48eed 100755
--- a/kde/kdeedu/Pkgfile
+++ b/kde/kdeedu/Pkgfile
@@ -2,12 +2,12 @@
 # URL: http://www.kde.org
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: cmake, automoc4, boost, qt, kdelibs, kdebase-runtime, pyqt, xorg-libxtst, xorg-libxscrnsaver, kdebase-runtime, libxslt, libxml2, docbook-xsl, libspectre, gsl, eigen2, gpsd,marble
-# Run on: kdebase-runtime,libxslt,pyqt,libspectre,gsl,eigen2,gpsd,marble
+# Depends on: cmake, automoc4, boost, qt, kdelibs, kdebase-runtime, pyqt, xorg-libxtst, xorg-libxscrnsaver, kdebase-runtime, libxslt, libxml2, docbook-xsl, libspectre, gsl, eigen2, gpsd
+# Run on: kdebase-runtime,libxslt,pyqt,libspectre,gsl,eigen2,gpsd
 
 name=kdeedu
 version=4.6.5
-release=1
+release=2
 
 source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
 
@@ -19,23 +19,11 @@ build() {
 		-DCMAKE_SKIP_RPATH=OFF \
 		-DBUILD_doc=ON \
 		-DKDE_DEFAULT_HOME=.kde \
-                -DSYSCONF_INSTALL_DIR=/etc 
+                -DSYSCONF_INSTALL_DIR=/etc \
+		-DBUILD_marble=FALSE
 
 	make
 	make DESTDIR=$PKG install
 
 	sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $PKG/usr/bin/pykig.py
-
-	rm -rf $PKG/usr/share/apps/marble
-	rm $PKG/usr/bin/geodatatest
-	rm $PKG/usr/bin/marble
-	rm $PKG/usr/bin/routing-instructions
-	rm $PKG/usr/bin/tilecreator
-	rm -rf $PKG/usr/include/marble/
-
-#	install -D -m644 $SRC/$name-$version/cmake/modules/FindKDEEdu.cmake \
-#		$PKG/usr/share/apps/cmake/modules/FindKDEEdu.cmake
-
-#	install -D -m644 $SRC/$name-$version/cmake/modules/FindMarbleWidget.cmake \
-#		$PKG/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
 }
diff --git a/kde/koffice/.md5sum.i686 b/kde/koffice/.md5sum.i686
index 206a9d68f..94e394a0c 100644
--- a/kde/koffice/.md5sum.i686
+++ b/kde/koffice/.md5sum.i686
@@ -1,4 +1,4 @@
-e22b9839e1ca4d0e2ce98cd8a970edd3  koffice-2.3.2.tar.bz2
+1ebb955d54b6d6032999cc92e4b13bfe  koffice-2.3.3.tar.bz2
 9966cc70082ae30e75c3ef9f9cad612e  koffice-gcc46.patch
 13742058ef7bfd3f23f89b8a9d112040  koffice-l10n-fr-2.3.2.tar.bz2
 4022a7262c11270592576a3b56f1daab  koffice-libwpg02.patch
diff --git a/kde/koffice/.md5sum.x86_64 b/kde/koffice/.md5sum.x86_64
index 206a9d68f..94e394a0c 100644
--- a/kde/koffice/.md5sum.x86_64
+++ b/kde/koffice/.md5sum.x86_64
@@ -1,4 +1,4 @@
-e22b9839e1ca4d0e2ce98cd8a970edd3  koffice-2.3.2.tar.bz2
+1ebb955d54b6d6032999cc92e4b13bfe  koffice-2.3.3.tar.bz2
 9966cc70082ae30e75c3ef9f9cad612e  koffice-gcc46.patch
 13742058ef7bfd3f23f89b8a9d112040  koffice-l10n-fr-2.3.2.tar.bz2
 4022a7262c11270592576a3b56f1daab  koffice-libwpg02.patch
diff --git a/kde/koffice/Pkgfile b/kde/koffice/Pkgfile
index 562bbdc45..b279c3371 100644
--- a/kde/koffice/Pkgfile
+++ b/kde/koffice/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: kdelibs,kdegraphics,sqlite3,lcms2,eigen2,kdepimlibs,boost,avahi,aspell,libxslt,shared-mime-info,upower,udisks,enchant,jasper,openexr,strigi,xorg-libxtst,soprano,ca-certificates,xdg-utils,qca,polkit-qt,xscreensaver,phonon,shared-desktop-ontologies,attica,xorg-libxcursor,hicolor-icon-theme,docbook-xsl,docbook-xml,libdbusmenu-qt,grantlee,pstoedit,libmysql,glew
 
 name=koffice
-version=2.3.2
-release=3
+version=2.3.3
+release=1
 source=(ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-$version.tar.bz2 \
         ftp://ftp.kde.org/pub/kde/stable/$name-$version/$name-l10n/$name-l10n-fr-2.3.2.tar.bz2
 	koffice-libwpg02.patch
diff --git a/kde/oxygen-gtk/.md5sum.i686 b/kde/oxygen-gtk/.md5sum.i686
index c5110f744..dbd5a7e90 100644
--- a/kde/oxygen-gtk/.md5sum.i686
+++ b/kde/oxygen-gtk/.md5sum.i686
@@ -1 +1 @@
-bacbe2be37db8e8fb3e60a3e13be7fb8  oxygen-gtk-1.1.0.tar.bz2
+8e7454f2a1a97f7580995276d78aa35d  oxygen-gtk-1.1.1.tar.bz2
diff --git a/kde/oxygen-gtk/.md5sum.x86_64 b/kde/oxygen-gtk/.md5sum.x86_64
index c5110f744..dbd5a7e90 100644
--- a/kde/oxygen-gtk/.md5sum.x86_64
+++ b/kde/oxygen-gtk/.md5sum.x86_64
@@ -1 +1 @@
-bacbe2be37db8e8fb3e60a3e13be7fb8  oxygen-gtk-1.1.0.tar.bz2
+8e7454f2a1a97f7580995276d78aa35d  oxygen-gtk-1.1.1.tar.bz2
diff --git a/kde/oxygen-gtk/Pkgfile b/kde/oxygen-gtk/Pkgfile
index 8e5d501d9..9f0ef1573 100755
--- a/kde/oxygen-gtk/Pkgfile
+++ b/kde/oxygen-gtk/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on: gtk, cmake, xorg-libxinerama xorg-libxrandr xorg-libxdamage
 
 name=oxygen-gtk
-version=1.1.0
-release=2
+version=1.1.1
+release=1
 source=(ftp://ftp.kde.org/pub/kde/stable/$name/$version/src/$name-$version.tar.bz2 )
 
 build() {