[neon/kde/marble/Neon/unstable] debian: installs

Carlos De Maine null at kde.org
Wed Oct 2 05:21:32 BST 2024


Git commit b594e06f4b0a942ddc440d96f83018107726a4bd by Carlos De Maine.
Committed on 02/10/2024 at 04:21.
Pushed by carlosdem into branch 'Neon/unstable'.

installs

M  +2    -2    debian/control
M  +0    -1    debian/libastro-dev.install
A  +2    -0    debian/libmarblewidget-qt6-28.install
D  +0    -2    debian/libmarblewidget-qt6-29.install
M  +7    -7    debian/marble-data.install

https://invent.kde.org/neon/kde/marble/-/commit/b594e06f4b0a942ddc440d96f83018107726a4bd

diff --git a/debian/control b/debian/control
index 1332359..2d8b4dc 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,7 @@ Package: libmarble-dev
 Architecture: any
 Section: libdevel
 Depends: libastro-dev (= ${binary:Version}),
-         libmarblewidget-qt6-29 (= ${binary:Version}),
+         libmarblewidget-qt6-28 (= ${binary:Version}),
          qt6-svg-dev,
          qt6-declarative-dev,
          qt6-webengine-dev,
@@ -95,7 +95,7 @@ Description: development files for the Marble globe widget library
  .
  This package is part of the KDE education module.
 
-Package: libmarblewidget-qt-29
+Package: libmarblewidget-qt6-28
 Architecture: any
 Section: libs
 Multi-Arch: same
diff --git a/debian/libastro-dev.install b/debian/libastro-dev.install
index a9e19e7..5ee8c78 100644
--- a/debian/libastro-dev.install
+++ b/debian/libastro-dev.install
@@ -1,3 +1,2 @@
 usr/include/astro/
-usr/lib/*/cmake/Astro/
 usr/lib/*/libastro.so
diff --git a/debian/libmarblewidget-qt6-28.install b/debian/libmarblewidget-qt6-28.install
new file mode 100644
index 0000000..93b5741
--- /dev/null
+++ b/debian/libmarblewidget-qt6-28.install
@@ -0,0 +1,2 @@
+usr/lib/*/libmarblewidget-qt6.so.2*.*.*
+usr/lib/*/libmarblewidget-qt6.so.28
diff --git a/debian/libmarblewidget-qt6-29.install b/debian/libmarblewidget-qt6-29.install
deleted file mode 100644
index 18a0167..0000000
--- a/debian/libmarblewidget-qt6-29.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libmarblewidget-qt5.so.2*.*.*
-usr/lib/*/libmarblewidget-qt5.so.28
diff --git a/debian/marble-data.install b/debian/marble-data.install
index 1b0e2e8..888addd 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,12 +1,12 @@
 usr/share/applications/marble_geojson.desktop
 usr/share/config.kcfg/marble.kcfg
 usr/share/doc/HTML/*/marble/
-usr/share/kservices6/marble_thumbnail_geojson.desktop
-usr/share/kservices6/marble_thumbnail_gpx.desktop
-usr/share/kservices6/marble_thumbnail_kml.desktop
-usr/share/kservices6/marble_thumbnail_osm.desktop
-usr/share/kservices6/marble_thumbnail_shp.desktop
-usr/share/kxmlgui6/marble/marble_part.rc
-usr/share/kxmlgui6/marble/marbleui.rc
+usr/share/applications/marble_thumbnail_geojson.desktop
+usr/share/applications/marble_thumbnail_gpx.desktop
+usr/share/applications/marble_thumbnail_kml.desktop
+usr/share/applications/marble_thumbnail_osm.desktop
+usr/share/applications/marble_thumbnail_shp.desktop
+usr/share/kxmlgui5/marble/marble_part.rc
+usr/share/kxmlgui5/marble/marbleui.rc
 usr/share/locale/*/LC_MESSAGES/
 usr/share/mime/packages/geo.xml


More information about the Neon-commits mailing list