[neon/kde/marble/Neon/stable] debian: lintians and installs

Carlos De Maine null at kde.org
Thu Nov 14 02:35:37 GMT 2024


Git commit 4a5dd97a8f6df7295cd7bacec9c1d4c802a763ba by Carlos De Maine.
Committed on 14/11/2024 at 02:35.
Pushed by carlosdem into branch 'Neon/stable'.

lintians and installs

M  +4    -1    debian/control
M  +1    -0    debian/libastro-dev.install
M  +1    -1    debian/libmarble-dev.install
A  +14   -0    debian/libmarble-dev.lintian-overrides
M  +5    -1    debian/marble-data.lintian-overrides
A  +1    -0    debian/marble-maps.lintian-overrides
M  +1    -0    debian/marble-qt-data.install

https://invent.kde.org/neon/kde/marble/-/commit/4a5dd97a8f6df7295cd7bacec9c1d4c802a763ba

diff --git a/debian/control b/debian/control
index f455abc..6da2d2a 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,7 @@ Architecture: any
 Section: libdevel
 Depends: libastro-dev (= ${binary:Version}),
          libmarblewidget-qt6-28 (= ${binary:Version}),
+         qt6-5compat-dev,
          qt6-declarative-dev,
          qt6-svg-dev,
          qt6-declarative-dev,
@@ -116,8 +117,10 @@ Description: Marble globe widget library
 Package: marble
 Architecture: any
 Section: misc
-Depends: marble-data (>= ${source:Version}),
+Depends: kf6-kirigami-addons,
+         marble-data (>= ${source:Version}),
          marble-plugins (= ${binary:Version}),
+         plasma5support,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: gosmore, monav-routing-daemon, routino
diff --git a/debian/libastro-dev.install b/debian/libastro-dev.install
index 5ee8c78..a9e19e7 100644
--- a/debian/libastro-dev.install
+++ b/debian/libastro-dev.install
@@ -1,2 +1,3 @@
 usr/include/astro/
+usr/lib/*/cmake/Astro/
 usr/lib/*/libastro.so
diff --git a/debian/libmarble-dev.install b/debian/libmarble-dev.install
index eca5be3..a21d91a 100644
--- a/debian/libmarble-dev.install
+++ b/debian/libmarble-dev.install
@@ -1,5 +1,5 @@
 usr/include/marble/
-usr/lib/*/cmake/
+usr/lib/*/cmake/Marble
 usr/lib/*/libmarblewidget-qt6.so
 usr/lib/*/plugins/designer/
 usr/lib/*/qt6/mkspecs/
diff --git a/debian/libmarble-dev.lintian-overrides b/debian/libmarble-dev.lintian-overrides
new file mode 100644
index 0000000..4940136
--- /dev/null
+++ b/debian/libmarble-dev.lintian-overrides
@@ -0,0 +1,14 @@
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/basic-routing/basic-routing]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/drawing-places/drawing-places]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/geopainter/geopainter]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/hello-marble/hello-marble]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/kml-inspector/kml-inspector]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/map-controls/map-controls]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/map-properties/map-properties]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/marble-game/marble-game]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/marbleQuick2/marbleQuick2]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/overlay-rendering/overlay-rendering]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/reverse-geocoding/reverse-geocoding]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/search/search]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/squad-interpolation/squad-interpolation]
+libmarble-dev: arch-dependent-file-in-usr-share [usr/share/apps/marble/examples/vehicletracking/vehicletracking]
diff --git a/debian/marble-data.lintian-overrides b/debian/marble-data.lintian-overrides
index 38115f0..98f90dd 100644
--- a/debian/marble-data.lintian-overrides
+++ b/debian/marble-data.lintian-overrides
@@ -1 +1,5 @@
-marble-data: desktop-command-not-in-package usr/share/applications/marble_geojson.desktop marble
+marble-data: desktop-command-not-in-package marble [usr/share/applications/marble_geojson.desktop]
+marble-data: desktop-entry-unknown-type Service [usr/share/applications/marble_thumbnail_kml.desktop]
+marble-data: desktop-entry-unknown-type Service [usr/share/applications/marble_thumbnail_kmz.desktop]
+marble-data: desktop-entry-unknown-type Service [usr/share/applications/marble_thumbnail_osm.desktop]
+marble-data: desktop-entry-unknown-type Service [usr/share/applications/marble_thumbnail_shp.desktop]
diff --git a/debian/marble-maps.lintian-overrides b/debian/marble-maps.lintian-overrides
new file mode 100644
index 0000000..3ae92c7
--- /dev/null
+++ b/debian/marble-maps.lintian-overrides
@@ -0,0 +1 @@
+marble-maps: desktop-command-not-in-package marble-Behaim [usr/share/applications/org.kde.marble.behaim.desktop]
diff --git a/debian/marble-qt-data.install b/debian/marble-qt-data.install
index e9cd780..caf7527 100644
--- a/debian/marble-qt-data.install
+++ b/debian/marble-qt-data.install
@@ -1,2 +1,3 @@
 usr/share/icons/hicolor/*/apps/marble.png
 usr/share/marble/
+usr/share/locale/*/LC_MESSAGES/marble_qt.qm


More information about the Neon-commits mailing list