[SCM] marble packaging branch, master, updated. debian/4%17.08.3-2-5-g931fbc9

Pino Toscano pino at moszumanska.debian.org
Tue Jan 2 19:00:50 UTC 2018 

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

The following commit has been merged in the master branch:
commit d1f4414bf4606df5a30252d374edc432baa02afa
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jan 2 19:54:45 2018 +0100

    reshuffle packaging (#884027)
---
 debian/changelog              |  7 ++++++
 debian/control                | 50 ++++++++++++++++++++++++++++++++++++++-----
 debian/marble-data.install    | 35 ++++--------------------------
 debian/marble-qt-data.install | 15 +++++++++++++
 debian/marble.install         |  4 ----
 debian/plasma-marble.install  |  9 ++++++++
 6 files changed, 80 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 229c86b..13374f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,13 @@ marble (4:17.08.3-3) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Unregister /etc/xdg/marble.knsrc as marble-data conffile (it is a conffile
     of marble now). (Closes: #885067)
+  * Reshuffle the packages, also to improve the dependencies for each
+    component:
+    - new marble-qt-data: split from marble-data, contains the data needed for
+      libmarblewidget, and marble-qt; make libmarblewidget, and marble-data
+      depend on it
+    - new plasma-marble: contains all the Plasma-related bits; move the Plasma
+      dependencies for it from marble-data (Closes: #884027)
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 02 Jan 2018 18:12:11 +0100
 
diff --git a/debian/control b/debian/control
index 90a5a2b..eb98391 100644
--- a/debian/control
+++ b/debian/control
@@ -92,7 +92,7 @@ Description: development files for the Marble globe widget library
 Package: libmarblewidget-qt5-28
 Architecture: any
 Section: libs
-Depends: marble-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: marble-qt-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Recommends: marble-plugins (= ${binary:Version})
 Description: Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE
@@ -125,10 +125,7 @@ Description: globe and map widget
 Package: marble-data
 Architecture: all
 Section: misc
-Depends: plasma-framework,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
+Depends: marble-qt-data (= ${source:Version}),
          ${misc:Depends},
 Breaks: marble (<= 4:15.08.0+dfsg-1), ${kde-l10n:all}
 Replaces: marble (<= 4:15.08.0+dfsg-1), ${kde-l10n:all}
@@ -190,3 +187,46 @@ Description: globe and map widget (no KDE dependencies)
  included, so it can be used without an internet connection.
  .
  This package is part of the KDE education module.
+
+Package: marble-qt-data
+Architecture: all
+Section: misc
+Depends: ${misc:Depends},
+Breaks: marble-data (<< 4:17.08.3-3~), ${kde-l10n:all}
+Replaces: marble-data (<< 4:17.08.3-3~), ${kde-l10n:all}
+Description: Qt-only data files for Marble
+ Marble is a generic geographical map widget and framework for KDE
+ applications. The Marble widget shows the earth as a sphere but does not
+ require hardware acceleration.  A minimal set of geographical data is
+ included, so it can be used without an internet connection.
+ .
+ This package contains the architecture-independent data files for the Marble
+ desktop globe.
+ .
+ This package is part of the KDE education module.
+
+Package: plasma-marble
+Architecture: any
+Section: misc
+Depends: marble-data (>= ${source:Version}),
+         marble-plugins (= ${binary:Version}),
+         plasma-framework,
+         qml-module-qtquick-controls,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick2,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: marble (<< 4:17.08.3-3~), marble-data (<< 4:17.08.3-3~)
+Replaces: marble (<< 4:17.08.3-3~), marble-data (<< 4:17.08.3-3~)
+Description: Plasma integration for Marble
+ Marble is a generic geographical map widget and framework for KDE
+ applications. The Marble widget shows the earth as a sphere but does not
+ require hardware acceleration.  A minimal set of geographical data is
+ included, so it can be used without an internet connection.
+ .
+ This package contains the Marble integration with Plasma:
+  * the Plasma runner
+  * the World Clock widget
+  * the Plasma wallpaper
+ .
+ This package is part of the KDE education module.
diff --git a/debian/marble-data.install b/debian/marble-data.install
index cfe556e..e702bd9 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,42 +1,15 @@
 usr/share/applications/marble_geojson.desktop
 usr/share/config.kcfg/marble.kcfg
 usr/share/doc/HTML/*/marble/
-usr/share/icons/hicolor/*/apps/marble.png
 usr/share/kservices5/marble_thumbnail_geojson.desktop
 usr/share/kservices5/marble_thumbnail_gpx.desktop
 usr/share/kservices5/marble_thumbnail_kml.desktop
 usr/share/kservices5/marble_thumbnail_osm.desktop
 usr/share/kservices5/marble_thumbnail_shp.desktop
-usr/share/kservices5/plasma-applet-org.kde.plasma.worldclock.desktop
-usr/share/kservices5/plasma-wallpaper-org.kde.plasma.wallpaper.worldmap.desktop
 usr/share/kxmlgui5/marble/marble_part.rc
 usr/share/kxmlgui5/marble/marbleui.rc
-usr/share/locale/
-usr/share/marble/data/*.css
-usr/share/marble/data/*.html
-usr/share/marble/data/*.leg
-usr/share/marble/data/audio/
-usr/share/marble/data/bitmaps/
-usr/share/marble/data/flags/
-usr/share/marble/data/maps/
-usr/share/marble/data/mwdbii/
-usr/share/marble/data/naturalearth/
-usr/share/marble/data/placemarks/
-usr/share/marble/data/stars/
-usr/share/marble/data/svg/
-usr/share/marble/data/weather/
-usr/share/metainfo/org.kde.plasma.wallpaper.worldmap.appdata.xml
-usr/share/metainfo/org.kde.plasma.worldclock.appdata.xml
+usr/share/locale/*/LC_MESSAGES/marble.mo
+usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
+usr/share/locale/*/LC_MESSAGES/plasma_runner_marble.mo
+usr/share/locale/*/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 usr/share/mime/packages/geo.xml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/config/config.qml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/config/main.xml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/configMapDisplay.qml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/configTimeZones.qml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/main.qml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.desktop
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.json
-usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/contents/config/main.xml
-usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/contents/ui/config.qml
-usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/contents/ui/main.qml
-usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.desktop
-usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.json
diff --git a/debian/marble-qt-data.install b/debian/marble-qt-data.install
new file mode 100644
index 0000000..6f9f241
--- /dev/null
+++ b/debian/marble-qt-data.install
@@ -0,0 +1,15 @@
+usr/share/icons/hicolor/*/apps/marble.png
+usr/share/locale/*/LC_MESSAGES/marble_qt.qm
+usr/share/marble/data/*.css
+usr/share/marble/data/*.html
+usr/share/marble/data/*.leg
+usr/share/marble/data/audio/
+usr/share/marble/data/bitmaps/
+usr/share/marble/data/flags/
+usr/share/marble/data/maps/
+usr/share/marble/data/mwdbii/
+usr/share/marble/data/naturalearth/
+usr/share/marble/data/placemarks/
+usr/share/marble/data/stars/
+usr/share/marble/data/svg/
+usr/share/marble/data/weather/
diff --git a/debian/marble.install b/debian/marble.install
index 06a9ef2..99c3ce2 100644
--- a/debian/marble.install
+++ b/debian/marble.install
@@ -2,9 +2,6 @@ etc/xdg/marble.knsrc
 usr/bin/marble
 usr/lib/*/qt5/plugins/libmarble_part.so
 usr/lib/*/qt5/plugins/libmarblethumbnail.so
-usr/lib/*/qt5/plugins/plasma_runner_marble.so
-usr/lib/*/qt5/qml/org/kde/marble/private/plasma/libmarblequick.so
-usr/lib/*/qt5/qml/org/kde/marble/private/plasma/qmldir
 usr/share/*/org.kde.marble.appdata.xml
 usr/share/applications/marble_geo.desktop
 usr/share/applications/marble_gpx.desktop
@@ -15,4 +12,3 @@ usr/share/applications/marble_worldwind.desktop
 usr/share/applications/org.kde.marble.desktop
 usr/share/kservices5/marble_part.desktop
 usr/share/kservices5/marble_thumbnail_kmz.desktop
-usr/share/kservices5/plasma-runner-marble.desktop
diff --git a/debian/plasma-marble.install b/debian/plasma-marble.install
new file mode 100644
index 0000000..67d5d30
--- /dev/null
+++ b/debian/plasma-marble.install
@@ -0,0 +1,9 @@
+usr/lib/*/qt5/plugins/plasma_runner_marble.so
+usr/lib/*/qt5/qml/org/kde/marble/private/plasma/libmarblequick.so
+usr/lib/*/qt5/qml/org/kde/marble/private/plasma/qmldir
+usr/share/kservices5/plasma-applet-org.kde.plasma.worldclock.desktop
+usr/share/kservices5/plasma-runner-marble.desktop
+usr/share/kservices5/plasma-wallpaper-org.kde.plasma.wallpaper.worldmap.desktop
+usr/share/metainfo/org.kde.plasma.wallpaper.worldmap.appdata.xml
+usr/share/metainfo/org.kde.plasma.worldclock.appdata.xml
+usr/share/plasma/

-- 
marble packaging

More information about the pkg-kde-commits mailing list