marble 4.8.0-1 maj port

5 files changed, 129 insertions, 25 deletions

diff --git a/marble/.footprint.i686 b/marble/.footprint.i686
index 8593f839c..6eea49afa 100644
--- a/marble/.footprint.i686
+++ b/marble/.footprint.i686
@@ -1,7 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/geodatatest
 -rwxr-xr-x	root/root	usr/bin/marble
+-rwxr-xr-x	root/root	usr/bin/marble-touch
 -rwxr-xr-x	root/root	usr/bin/routing-instructions
 -rwxr-xr-x	root/root	usr/bin/tilecreator
 drwxr-xr-x	root/root	usr/include/
@@ -13,10 +13,12 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/AlternativeRoutesModel.h
 -rw-r--r--	root/root	usr/include/marble/BookmarkManager.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/ElevationModel.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
@@ -51,12 +53,14 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/GeoGraphicsScene.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/Maneuver.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/MapWizard.h
@@ -82,7 +86,12 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/Route.h
+-rw-r--r--	root/root	usr/include/marble/RouteRequest.h
+-rw-r--r--	root/root	usr/include/marble/RouteSegment.h
 -rw-r--r--	root/root	usr/include/marble/RoutingManager.h
+-rw-r--r--	root/root	usr/include/marble/RoutingModel.h
+-rw-r--r--	root/root	usr/include/marble/RoutingProfile.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
@@ -94,7 +103,6 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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
@@ -102,18 +110,44 @@ drwxr-xr-x	root/root	usr/include/marble/
 -rw-r--r--	root/root	usr/include/marble/marble_export.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/kde4/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/MarbleSettings.qml
+-rwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qmldir
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
+-rwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/qmldir
 -rwxr-xr-x	root/root	usr/lib/kde4/libmarble_part.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_worldclock.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plasma_runner_marble.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/CachePlugin.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/EarthquakePlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/ElevationProfileFloatItem.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GosmorePlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpsInfo.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpxPlugin.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/KmlPlugin.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/LocalOsmSearchPlugin.so
@@ -123,26 +157,26 @@ drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NominatimPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OpenDesktopPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OpenRouteServicePlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OsmPlugin.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/PlacemarkPositionProviderPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/PntPlugin.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/SatellitesPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Speedometer.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/StarsPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/SunPlugin.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
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.12
--rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.12.0
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.12 -> libmarblewidget.so.0.12.0
+lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.13
+-rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.13 -> libmarblewidget.so.0.13.0
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/applications/kde4/
@@ -191,6 +225,7 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/cursor_tr.xpm
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/default_location.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/earth_apollo.jpg
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/flag.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/folder.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/hand.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/lake.png
@@ -222,6 +257,16 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/poi/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/health_pharmacy.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/money_atm2.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/money_bank2.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_bahai3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_buddhist3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_christian3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_hindu3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_islamic3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_jain3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_jewish3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_shinto3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_sikh3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_unknown3.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/shopping_alcohol.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/shopping_hifi.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/shopping_supermarket.p.16.png
@@ -799,6 +844,12 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm/3/000007/
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm/3/000007/000007_000015.jpg
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm/srtm-preview.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm/srtm.dgml
+drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm2/
+drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/
+drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/000000/
+-rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/000000/000000_000000.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/000000/000000_000001.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm2/srtm2.dgml
 drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/temp-dec/
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/temp-dec/temp-dec-preview.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/temp-dec/temp-dec.dgml
@@ -937,3 +988,4 @@ drwxr-xr-x	root/root	usr/share/kde4/
 drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/marble_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-applet-kworldclock.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/plasma-runner-marble.desktop
diff --git a/marble/.footprint.x86_64 b/marble/.footprint.x86_64
index 8593f839c..6eea49afa 100644
--- a/marble/.footprint.x86_64
+++ b/marble/.footprint.x86_64
@@ -1,7 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/geodatatest
 -rwxr-xr-x	root/root	usr/bin/marble
+-rwxr-xr-x	root/root	usr/bin/marble-touch
 -rwxr-xr-x	root/root	usr/bin/routing-instructions
 -rwxr-xr-x	root/root	usr/bin/tilecreator
 drwxr-xr-x	root/root	usr/include/
@@ -13,10 +13,12 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/AlternativeRoutesModel.h
 -rw-r--r--	root/root	usr/include/marble/BookmarkManager.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/ElevationModel.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
@@ -51,12 +53,14 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/GeoGraphicsScene.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/Maneuver.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/MapWizard.h
@@ -82,7 +86,12 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/Route.h
+-rw-r--r--	root/root	usr/include/marble/RouteRequest.h
+-rw-r--r--	root/root	usr/include/marble/RouteSegment.h
 -rw-r--r--	root/root	usr/include/marble/RoutingManager.h
+-rw-r--r--	root/root	usr/include/marble/RoutingModel.h
+-rw-r--r--	root/root	usr/include/marble/RoutingProfile.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
@@ -94,7 +103,6 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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
@@ -102,18 +110,44 @@ drwxr-xr-x	root/root	usr/include/marble/
 -rw-r--r--	root/root	usr/include/marble/marble_export.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/kde4/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/MarbleSettings.qml
+-rwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qmldir
+drwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
+-rwxr-xr-x	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
+-rw-r--r--	root/root	usr/lib/kde4/imports/org/kde/edu/marble/qtcomponents/qmldir
 -rwxr-xr-x	root/root	usr/lib/kde4/libmarble_part.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_worldclock.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plasma_runner_marble.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/CachePlugin.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/EarthquakePlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/ElevationProfileFloatItem.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GosmorePlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpsInfo.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GpxPlugin.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/KmlPlugin.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/LocalOsmSearchPlugin.so
@@ -123,26 +157,26 @@ drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NominatimPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OpenDesktopPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OpenRouteServicePlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OsmPlugin.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/PlacemarkPositionProviderPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/PntPlugin.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/SatellitesPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Speedometer.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/StarsPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/SunPlugin.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
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.12
--rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.12.0
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.12 -> libmarblewidget.so.0.12.0
+lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.13
+-rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.13 -> libmarblewidget.so.0.13.0
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/applications/kde4/
@@ -191,6 +225,7 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/cursor_tr.xpm
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/default_location.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/earth_apollo.jpg
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/flag.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/folder.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/hand.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/lake.png
@@ -222,6 +257,16 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/poi/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/health_pharmacy.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/money_atm2.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/money_bank2.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_bahai3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_buddhist3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_christian3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_hindu3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_islamic3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_jain3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_jewish3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_shinto3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_sikh3.p.16.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/place_of_worship_unknown3.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/shopping_alcohol.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/shopping_hifi.p.16.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/poi/shopping_supermarket.p.16.png
@@ -799,6 +844,12 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm/3/000007/
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm/3/000007/000007_000015.jpg
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm/srtm-preview.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm/srtm.dgml
+drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm2/
+drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/
+drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/000000/
+-rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/000000/000000_000000.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm2/0/000000/000000_000001.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/srtm2/srtm2.dgml
 drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/temp-dec/
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/temp-dec/temp-dec-preview.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/maps/earth/temp-dec/temp-dec.dgml
@@ -937,3 +988,4 @@ drwxr-xr-x	root/root	usr/share/kde4/
 drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/marble_part.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-applet-kworldclock.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/plasma-runner-marble.desktop
diff --git a/marble/.md5sum.i686 b/marble/.md5sum.i686
index babeee8da..e2d801e75 100644
--- a/marble/.md5sum.i686
+++ b/marble/.md5sum.i686
@@ -1 +1 @@
-77d6be4dd6de1a81551c525ba93a409e  marble-4.7.4.tar.bz2
+95c546f33706d8fcbef8a04b4b18a17f  marble-4.8.0.tar.bz2
diff --git a/marble/.md5sum.x86_64 b/marble/.md5sum.x86_64
index babeee8da..e2d801e75 100644
--- a/marble/.md5sum.x86_64
+++ b/marble/.md5sum.x86_64
@@ -1 +1 @@
-77d6be4dd6de1a81551c525ba93a409e  marble-4.7.4.tar.bz2
+95c546f33706d8fcbef8a04b4b18a17f  marble-4.8.0.tar.bz2
diff --git a/marble/Pkgfile b/marble/Pkgfile
index 4f1f3df70..e9d4c2c07 100644
--- a/marble/Pkgfile
+++ b/marble/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: 
 
 name=marble
-version=4.7.4
+version=4.8.0
 release=1
 source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)