marble, 1.1-2

3 files changed, 70 insertions, 12 deletions

diff --git a/kde/marble/.footprint.i686 b/kde/marble/.footprint.i686
index 5991dea57..a24d1ec37 100644
--- a/kde/marble/.footprint.i686
+++ b/kde/marble/.footprint.i686
@@ -13,6 +13,7 @@ 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/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
@@ -62,13 +63,13 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/MarbleRunnerManager.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
@@ -152,6 +153,8 @@ drwxr-xr-x	root/root	usr/share/apps/cmake/modules/
 drwxr-xr-x	root/root	usr/share/apps/marble/
 drwxr-xr-x	root/root	usr/share/apps/marble/data/
 -rw-r--r--	root/root	usr/share/apps/marble/data/LICENSE.txt
+drwxr-xr-x	root/root	usr/share/apps/marble/data/audio/
+-rw-r--r--	root/root	usr/share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
 drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/airport.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/annotation.png
@@ -776,7 +779,6 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/placemarks/
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/baseplacemarks.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/boundaryplacemarks.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/cityplacemarks.cache
--rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/cityplacemarks_large_population.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/elevplacemarks.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/moonlandingsites.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/moonterrain.cache
@@ -831,11 +833,38 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/weather/
 -rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-storm.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/weather/wind-arrows.svgz
 -rw-r--r--	root/root	usr/share/apps/marble/marble.knsrc
+-rw-r--r--	root/root	usr/share/apps/marble/marble_part.rc
 -rw-r--r--	root/root	usr/share/apps/marble/marbleui.rc
-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/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/marble.kcfg
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/kde/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/
+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/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
diff --git a/kde/marble/.footprint.x86_64 b/kde/marble/.footprint.x86_64
index 5991dea57..a24d1ec37 100644
--- a/kde/marble/.footprint.x86_64
+++ b/kde/marble/.footprint.x86_64
@@ -13,6 +13,7 @@ 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/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
@@ -62,13 +63,13 @@ drwxr-xr-x	root/root	usr/include/marble/
 -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/MarbleRunnerManager.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
@@ -152,6 +153,8 @@ drwxr-xr-x	root/root	usr/share/apps/cmake/modules/
 drwxr-xr-x	root/root	usr/share/apps/marble/
 drwxr-xr-x	root/root	usr/share/apps/marble/data/
 -rw-r--r--	root/root	usr/share/apps/marble/data/LICENSE.txt
+drwxr-xr-x	root/root	usr/share/apps/marble/data/audio/
+-rw-r--r--	root/root	usr/share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
 drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/airport.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/annotation.png
@@ -776,7 +779,6 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/placemarks/
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/baseplacemarks.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/boundaryplacemarks.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/cityplacemarks.cache
--rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/cityplacemarks_large_population.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/elevplacemarks.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/moonlandingsites.cache
 -rw-r--r--	root/root	usr/share/apps/marble/data/placemarks/moonterrain.cache
@@ -831,11 +833,38 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/weather/
 -rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-storm.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/weather/wind-arrows.svgz
 -rw-r--r--	root/root	usr/share/apps/marble/marble.knsrc
+-rw-r--r--	root/root	usr/share/apps/marble/marble_part.rc
 -rw-r--r--	root/root	usr/share/apps/marble/marbleui.rc
-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/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/marble.kcfg
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/kde/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/
+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/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
diff --git a/kde/marble/Pkgfile b/kde/marble/Pkgfile
index 08ac6a301..e28eb039e 100644
--- a/kde/marble/Pkgfile
+++ b/kde/marble/Pkgfile
@@ -2,15 +2,15 @@
 # URL: http://edu.kde.org/marble/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: subversion, kdelibs, gpsd, qt, cmake
+# Depends on: subversion, kdelibs, gpsd, qt, cmake, docbook-xsl
 # Run on: kdelibs,gpsd,qt
 
 name=marble
-version=1.0.0
-release=1
+version=1.1
+release=2
 
 build() {
-	svn co svn://anonsvn.kde.org/home/kde/branches/KDE/4.6/kdeedu/marble
+	git clone git://anongit.kde.org/marble
         cd $name
         cmake ../$name -DCMAKE_INSTALL_PREFIX=/usr
         make