[neon/kde/marble/Neon/release-lts] debian: update .install

Jonathan Riddell null at kde.org
Thu Apr 22 15:11:10 BST 2021


Git commit 4a6ad0810fa73aefc7898df4f885b767ad348479 by Jonathan Riddell.
Committed on 22/04/2021 at 14:11.
Pushed by jriddell into branch 'Neon/release-lts'.

update .install

M  +6    -6    debian/control
M  +0    -3    debian/libmarble-dev.install
M  +1    -2    debian/plasma-marble.install

https://invent.kde.org/neon/kde/marble/commit/4a6ad0810fa73aefc7898df4f885b767ad348479

diff --git a/debian/control b/debian/control
index af9fc5b..eb1ff81 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Depends: cmake (>= 3.5~),
                qttools5-dev (>= 5.4),
                qtwebengine5-dev,
                shared-mime-info,
-               zlib1g-dev,
+               zlib1g-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://marble.kde.org/
@@ -87,7 +87,7 @@ Depends: libastro-dev (= ${binary:Version}),
          qtdeclarative5-dev (>= 5.7.0~),
          ${misc:Depends},
          ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: development files for the Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
@@ -105,7 +105,7 @@ Section: libs
 Multi-Arch: same
 Depends: marble-qt-data (>= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Recommends: marble-plugins (= ${binary:Version})
 Description: Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE
@@ -123,7 +123,7 @@ Section: misc
 Depends: marble-data (>= ${source:Version}),
          marble-plugins (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Suggests: gosmore, monav-routing-daemon, routino
 Replaces: marble-data (<< 4:17.08.1)
 Breaks: marble-data (<< 4:17.08.1)
@@ -165,7 +165,7 @@ Depends: marble-data (>= ${source:Version}),
          qml-module-qtquick-dialogs,
          qml-module-qtquick-window2,
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Suggests: gosmore, monav-routing-daemon, routino
 Description: globe and map widget for mobile form factors
  Marble is a generic geographical map widget and framework for KDE
@@ -213,7 +213,7 @@ Depends: marble-data (>= ${source:Version}),
          qml-module-qtquick-layouts,
          qml-module-qtquick2,
          ${misc:Depends},
-         ${shlibs: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
diff --git a/debian/libmarble-dev.install b/debian/libmarble-dev.install
index 1ec28b9..aca869a 100644
--- a/debian/libmarble-dev.install
+++ b/debian/libmarble-dev.install
@@ -1,9 +1,6 @@
 usr/include/marble/
 usr/lib/*/cmake/Marble/
 usr/lib/*/libmarblewidget-qt5.so
-usr/lib/*/plugins/designer/LatLonEditPlugin.so
-usr/lib/*/plugins/designer/MarbleNavigatorPlugin.so
-usr/lib/*/plugins/designer/MarbleWidgetPlugin.so
 usr/lib/*/qt5/mkspecs/modules/qt_Marble.pri
 usr/lib/*/qt5/plugins/designer/libLatLonEditPlugin.so
 usr/lib/*/qt5/plugins/designer/libMarbleNavigatorPlugin.so
diff --git a/debian/plasma-marble.install b/debian/plasma-marble.install
index 9ed05d3..061283e 100644
--- a/debian/plasma-marble.install
+++ b/debian/plasma-marble.install
@@ -1,8 +1,7 @@
-usr/lib/*/qt5/plugins/plasma_runner_marble.so
+usr/lib/*/qt5/plugins/kf5/krunner/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.worldmap.desktop
 usr/share/metainfo/org.kde.plasma.worldclock.appdata.xml
 usr/share/metainfo/org.kde.plasma.worldmap.appdata.xml


More information about the Neon-commits mailing list