[SCM] marble packaging branch, kde4.11, updated. debian/4.10.5-1-5-gb891f78

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git;a=commitdiff;h=0d73ee3

The following commit has been merged in the kde4.11 branch:
commit 0d73ee323ba9be830fcab56278fa979b13be44ba
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Sep 27 19:01:04 2013 +0200

    Update install files.
---
 debian/changelog                    |    1 +
 debian/marble-data.install          |   16 ++++++++--
 debian/marble-plugins.install       |   57 ++---------------------------------
 debian/marble-plugins.install.linux |    1 -
 4 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2eaa1be..8a318dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ marble (4:4.11.1-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump libmarblewidget package soname.
+  * Update install files.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:26:46 +0200
 
diff --git a/debian/marble-data.install b/debian/marble-data.install
index d0b5372..2663021 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,11 +1,23 @@
-usr/share/doc/kde/HTML/en/marble/
+usr/share/doc/kde/HTML/*/marble/
 usr/share/icons/hicolor/128x128/apps/marble.png
 usr/share/icons/hicolor/16x16/apps/marble.png
 usr/share/icons/hicolor/22x22/apps/marble.png
 usr/share/icons/hicolor/32x32/apps/marble.png
 usr/share/icons/hicolor/48x48/apps/marble.png
 usr/share/icons/hicolor/64x64/apps/marble.png
-usr/share/kde4/apps/marble/data/*
+usr/share/kde4/apps/marble/data/audio/
+usr/share/kde4/apps/marble/data/bitmaps/
+usr/share/kde4/apps/marble/data/flags/
+usr/share/kde4/apps/marble/data/maps/
+usr/share/kde4/apps/marble/data/mwdbii/
+usr/share/kde4/apps/marble/data/naturalearth/
+usr/share/kde4/apps/marble/data/placemarks/
+usr/share/kde4/apps/marble/data/stars/
+usr/share/kde4/apps/marble/data/svg/
+usr/share/kde4/apps/marble/data/weather/
+usr/share/kde4/apps/marble/data/*.html
+usr/share/kde4/apps/marble/data/*.css
+usr/share/kde4/apps/marble/data/*.leg
 usr/share/kde4/apps/marble/marble.knsrc
 usr/share/kde4/apps/marble/marbleui.rc
 usr/share/kde4/apps/marble/marble_part.rc
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 4c61375..c362816 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,57 +1,4 @@
-usr/lib/*/qt4/imports/org/kde/edu/marble/MarbleSettings.qml
 usr/lib/*/qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+usr/lib/*/qt4/imports/org/kde/edu/marble/MarbleSettings.qml
 usr/lib/*/qt4/imports/org/kde/edu/marble/qmldir
-usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents
-usr/lib/kde4/plugins/marble/15/AprsPlugin.so
-usr/lib/kde4/plugins/marble/15/AtmospherePlugin.so
-usr/lib/kde4/plugins/marble/15/CachePlugin.so
-usr/lib/kde4/plugins/marble/15/CompassFloatItem.so
-usr/lib/kde4/plugins/marble/15/CrosshairsPlugin.so
-usr/lib/kde4/plugins/marble/15/EarthquakePlugin.so
-usr/lib/kde4/plugins/marble/15/ElevationProfileFloatItem.so
-usr/lib/kde4/plugins/marble/15/ElevationProfileMarker.so
-usr/lib/kde4/plugins/marble/15/FlightGearPositionProviderPlugin.so
-usr/lib/kde4/plugins/marble/15/FoursquarePlugin.so
-usr/lib/kde4/plugins/marble/15/GosmoreReverseGeocodingPlugin.so
-usr/lib/kde4/plugins/marble/15/GosmoreRoutingPlugin.so
-usr/lib/kde4/plugins/marble/15/GpsInfo.so
-usr/lib/kde4/plugins/marble/15/GpsdPositionProviderPlugin.so
-usr/lib/kde4/plugins/marble/15/GpxPlugin.so
-usr/lib/kde4/plugins/marble/15/GraticulePlugin.so
-usr/lib/kde4/plugins/marble/15/HostipPlugin.so
-usr/lib/kde4/plugins/marble/15/JsonPlugin.so
-usr/lib/kde4/plugins/marble/15/KmlPlugin.so
-usr/lib/kde4/plugins/marble/15/LatLonPlugin.so
-usr/lib/kde4/plugins/marble/15/LocalDatabasePlugin.so
-usr/lib/kde4/plugins/marble/15/LocalOsmSearchPlugin.so
-usr/lib/kde4/plugins/marble/15/LogPlugin.so
-usr/lib/kde4/plugins/marble/15/MapQuestPlugin.so
-usr/lib/kde4/plugins/marble/15/MapScaleFloatItem.so
-usr/lib/kde4/plugins/marble/15/MeasureTool.so
-usr/lib/kde4/plugins/marble/15/MonavPlugin.so
-usr/lib/kde4/plugins/marble/15/NavigationFloatItem.so
-usr/lib/kde4/plugins/marble/15/NominatimReverseGeocodingPlugin.so
-usr/lib/kde4/plugins/marble/15/NominatimSearchPlugin.so
-usr/lib/kde4/plugins/marble/15/OSRMPlugin.so
-usr/lib/kde4/plugins/marble/15/OpenDesktopPlugin.so
-usr/lib/kde4/plugins/marble/15/OpenRouteServicePlugin.so
-usr/lib/kde4/plugins/marble/15/OsmPlugin.so
-usr/lib/kde4/plugins/marble/15/OverviewMap.so
-usr/lib/kde4/plugins/marble/15/Photo.so
-usr/lib/kde4/plugins/marble/15/PlacemarkPositionProviderPlugin.so
-usr/lib/kde4/plugins/marble/15/PntPlugin.so
-usr/lib/kde4/plugins/marble/15/PositionMarker.so
-usr/lib/kde4/plugins/marble/15/PostalCode.so
-usr/lib/kde4/plugins/marble/15/ProgressFloatItem.so
-usr/lib/kde4/plugins/marble/15/QNamNetworkPlugin.so
-usr/lib/kde4/plugins/marble/15/RouteSimulationPositionProviderPlugin.so
-usr/lib/kde4/plugins/marble/15/RoutingPlugin.so
-usr/lib/kde4/plugins/marble/15/RoutinoPlugin.so
-usr/lib/kde4/plugins/marble/15/SatellitesPlugin.so
-usr/lib/kde4/plugins/marble/15/ShpPlugin.so
-usr/lib/kde4/plugins/marble/15/Speedometer.so
-usr/lib/kde4/plugins/marble/15/StarsPlugin.so
-usr/lib/kde4/plugins/marble/15/SunPlugin.so
-usr/lib/kde4/plugins/marble/15/Weather.so
-usr/lib/kde4/plugins/marble/15/Wikipedia.so
-usr/lib/kde4/plugins/marble/15/YoursPlugin.so
+usr/lib/kde4/plugins/marble/
diff --git a/debian/marble-plugins.install.linux b/debian/marble-plugins.install.linux
deleted file mode 100644
index b7b9b04..0000000
--- a/debian/marble-plugins.install.linux
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/kde4/plugins/marble/15/QtMobilityPositionProviderPlugin.so

-- 
marble packaging