[neon/kde/marble/Neon/release-lts] debian: merge master

Jonathan Riddell null at kde.org
Tue Apr 20 11:05:37 BST 2021


Git commit 01b98e4c4cd386ef7c1ea9bb7f04bc95917f6289 by Jonathan Riddell.
Committed on 20/04/2021 at 10:05.
Pushed by jriddell into branch 'Neon/release-lts'.

merge master

M  +186  -219  debian/changelog
M  +140  -84   debian/control
M  +3    -0    debian/libmarble-dev.install
M  +0    -1    debian/marble-data.install
M  +0    -4    debian/tests/control

https://invent.kde.org/neon/kde/marble/commit/01b98e4c4cd386ef7c1ea9bb7f04bc95917f6289

diff --cc debian/changelog
index a257674,42e02f1..ab3c661
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,254 -1,183 +1,184 @@@
- marble (4:21.04.0-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Mon, 19 Apr 2021 10:27:44 +0000
- 
- marble (4:20.12.3-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 03 Mar 2021 13:05:07 +0000
- 
- marble (4:20.12.2-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 03 Feb 2021 11:16:13 +0000
- 
- marble (4:20.12.1-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021 12:21:21 +0000
- 
- marble (4:20.12.0-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 10 Dec 2020 13:39:09 +0000
- 
- marble (4:20.08.3-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Fri, 06 Nov 2020 07:13:38 +0000
- 
- marble (4:20.08.2-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Tue, 06 Oct 2020 10:33:31 +0000
- 
- marble (4:20.08.1-0neon) focal; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 02 Sep 2020 11:33:51 +0000
- 
- marble (4:20.08.0-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Fri, 14 Aug 2020 09:22:48 +0000
- 
- marble (4:20.04.3-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 09 Jul 2020 09:42:13 +0000
- 
- marble (4:20.04.2-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Sun, 17 May 2020 22:29:10 +0000
- 
- marble (4:20.04.0-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Tue, 21 Apr 2020 17:52:09 +0000
- 
- marble (4:19.12.3-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 04 Mar 2020 11:06:19 +0000
- 
- marble (4:19.12.2-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 05 Feb 2020 13:47:03 +0000
- 
- marble (4:19.12.1-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 08 Jan 2020 17:16:45 +0000
- 
- marble (4:19.12.0-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Tue, 10 Dec 2019 18:55:25 +0000
- 
- marble (4:19.08.3-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 06 Nov 2019 10:16:44 +0000
- 
- marble (4:19.08.2-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 09 Oct 2019 18:14:38 +0000
- 
- marble (4:19.08.1-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 05 Sep 2019 14:29:20 +0000
- 
- marble (4:19.08.0-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Tue, 13 Aug 2019 13:26:29 +0000
- 
- marble (4:19.04.3-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 10 Jul 2019 11:38:25 +0000
- 
- marble (4:19.04.2-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 06 Jun 2019 10:07:03 +0000
- 
- marble (4:19.04.1-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 09 May 2019 06:52:05 +0000
- 
- marble (4:19.04.0-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Mon, 15 Apr 2019 14:16:21 +0000
- 
- marble (4:18.12.3-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 06 Mar 2019 15:07:31 +0000
- 
- marble (4:18.12.2-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Fri, 08 Feb 2019 11:04:30 +0000
- 
- marble (4:18.12.1-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 09 Jan 2019 13:26:22 +0000
- 
- marble (4:18.12.0-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 13 Dec 2018 15:51:04 +0000
- 
- marble (4:18.08.3-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 07 Nov 2018 19:48:30 +0000
- 
- marble (4:18.08.2-0neon) bionic; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 10 Oct 2018 21:46:13 +0000
- 
- marble (4:18.08.1-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 05 Sep 2018 13:34:15 +0000
- 
- marble (4:18.08.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Fri, 17 Aug 2018 12:41:14 +0000
- 
- marble (4:18.04.3-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Tue, 17 Jul 2018 17:36:20 +0000
- 
- marble (4:18.04.2-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 06 Jun 2018 13:12:13 +0000
- 
- marble (4:18.04.1-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Wed, 09 May 2018 10:21:26 +0000
- 
- marble (4:18.04.0-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Thu, 19 Apr 2018 14:44:10 +0000
- 
- marble (4:17.12.3-0neon) xenial; urgency=medium
- 
-   * New release
- 
-  -- Neon CI <neon at kde.org>  Mon, 12 Mar 2018 14:36:24 +0000
- 
- marble (4:17.12.2-0neon) xenial; urgency=medium
- 
-   * New release
+ marble (4:20.08.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Bump the debhelper compatibility to 13:
+     - switch the debhelper-compat build dependency to 13
+   * Small changes to copyright.
+ 
+  -- Pino Toscano <pino at debian.org>  Fri, 14 Aug 2020 13:21:06 +0200
+ 
+ marble (4:20.04.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Switch from dhmk to the dh sequencer:
+     - invoke the dh sequencer using the kf5, and pkgkde_symbolshelper addons
+     - call the right debhelper command instead of $(overridden_command)
+     - manually force the generation of the substvars for the kde-l10n breaks,
+       and the strict shlibs handling
+     - manually run dh_sameversiondep
+   * Bump the debhelper compatibility to 12:
+     - switch the debhelper build dependency to debhelper-compat 12
+     - remove debian/compat
+   * Add Rules-Requires-Root: no.
+   * Update lintian overrides.
+   * Use /usr/share/dpkg/vendor.mk & dpkg_vendor_derives_from for check whether
+     the distro is Ubuntu or based on.
+ 
+  -- Pino Toscano <pino at debian.org>  Fri, 31 Jul 2020 11:24:09 +0200
+ 
+ marble (4:20.04.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update the patches:
+     - upstream_Fix-build-with-gpsd-3.20.patch: drop, backported from upstream
+   * Bump Standards-Version to 4.5.0, no changes required.
+   * Install marble-maps again; patch install-marble-maps.diff.
+   * Update symbols files.
  
-  -- Neon CI <neon at kde.org>  Wed, 07 Feb 2018 17:41:47 +0000
+  -- Pino Toscano <pino at debian.org>  Sun, 26 Apr 2020 14:05:55 +0200
+ 
+ marble (4:19.12.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update watch file to the new release-service location.
+   * Bump Standards-Version to 4.4.1, no changes required.
+   * Enable all the reprotest variations in the salsa CI.
+   * Explicitly add the gettext build dependency.
+   * Backport upstream commit 51e0d9122cf2871167d7466faf16fc33d660ae25 to fix
+     build with gpsd 3.20; patch upstream_Fix-build-with-gpsd-3.20.patch.
+   * Update lintian overrides.
+ 
+  -- Pino Toscano <pino at debian.org>  Wed, 08 Jan 2020 22:28:54 +0100
+ 
+ marble (4:19.08.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Force the right installation path of Qt plugins, so the Qt Designer plugins
+     are installed in the right place (Closes: #903745)
+     - adjust paths in libmarble-dev.install
+   * Pass -DBUILD_MARBLE_TESTS=FALSE to cmake to disable the build of tests,
+     as they are not run at build time anyway
+     - drop patch kubuntu_disable-MarbleRunnerManagerTest.diff, no more needed
+       now
+   * Add some Multi-Arch annotations.
+   * Remove the marble-data dependency from libastro1, as it does not need it.
+   * Drop the unused 'testsuite' autopkgtest.
+   * Bump the debhelper compatibility to 11:
+     - bump the debhelper build dependency to 11~
+     - bump compat to 11
+   * Add Build-Depends-Package in symbols files.
+   * Remove breaks/replaces for versions older than what is in oldstable.
+   * Drop the migration from marble-dbg, no more needed after two Debian stable
+     releases.
+ 
+  -- Pino Toscano <pino at debian.org>  Sun, 29 Sep 2019 08:22:29 +0200
+ 
+ marble (4:19.08.1-1) unstable; urgency=medium
+ 
+   [ Reiner Herrmann ]
+   * NMU 4:17.08.3-3.1 missing qml-module and qt 5.11
+ 
+   [ Niels Thykier ]
+   * NMU 4:17.08.3-3.2 FTBFS fix
  
- marble (4:17.12.1-0neon) xenial; urgency=medium
+   [ Maximiliano Curia ]
+   * New upstream release (19.08.1).
+   * Bump Standards-Version to 4.4.0.
+   * Add libqt5svg5-dev dep to the -dev package
+   * Update vcs fields
+   * Release to unstable
  
-   * New release
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 17 Sep 2019 15:42:02 +0200
  
-  -- Neon CI <neon at kde.org>  Wed, 10 Jan 2018 18:42:03 +0000
+ marble (4:18.08.0-0~exp0+nmu1) experimental; urgency=medium
  
- marble (4:17.12.0-0neon) xenial; urgency=medium
+   * Non-maintainer upload.
+   * New upstream release.
+   * Update symbols and install files.
+   * Allow SVG bookmark icons, see /usr/share/marble/data/svg/osmcarto/svg
+     for many of them available for your own use.
  
-   * New release
+  -- Ximin Luo <infinity0 at debian.org>  Mon, 03 Sep 2018 23:27:02 -0700
  
-  -- Neon CI <neon at kde.org>  Wed, 13 Dec 2017 14:36:54 +0000
+ marble (4:17.08.3-3.2) unstable; urgency=medium
  
- marble (4:17.08.3-0neon) bionic; urgency=medium
+   * Non-maintainer upload.
  
-   * New release
+   [ Frédéric Bonnard ]
+   * Add Comment fields to the .desktop files as they are now
+     required by the Appstream generator.  (Closes: #923592)
  
-  -- Neon CI <neon at kde.org>  Wed, 08 Nov 2017 11:02:19 +0000
+  -- Niels Thykier <niels at thykier.net>  Sat, 18 May 2019 07:16:42 +0000
  
- marble (4:17.08.2-0neon) xenial; urgency=medium
+ marble (4:17.08.3-3.1) unstable; urgency=low
  
-   * New release
+   * Non-maintainer upload.
+   * Add missing qml-module dependencies for marble-maps. (Closes: #879756)
+   * Add patch to build with Qt 5.11 by including missing headers.
+ 
+  -- Reiner Herrmann <reiner at reiner-h.de>  Sat, 27 Oct 2018 13:38:29 +0200
+ 
+ marble (4:17.08.3-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * 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)
+   * Remove in the dh_auto_install override all the files that must not be
+     installed, instead of ignoring them
+     - simplify a bit one install file
+     - drop not-installed, no more needed now
+   * Bump Standards-Version to 4.1.3, no changes required.
+ 
+  -- Pino Toscano <pino at debian.org>  Thu, 11 Jan 2018 14:31:18 +0100
+ 
+ marble (4:17.08.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable. (see #883624)
+   * Bump Standards-Version to 4.1.2, no changes required.
+   * Adjust l10npkgs_firstversion_ok to the version where kde-l10n will
+     drop translations.
+ 
+  -- Pino Toscano <pino at debian.org>  Sat, 09 Dec 2017 09:58:03 +0100
+ 
+ marble (4:17.08.3-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Merge changes from 4:16.08.3-2.
+   * Simplify watch file, and switch it to https.
+   * Remove unused debian/meta/cmake-ignore file.
+   * Remove unused build dependencies: libkf5config-dev, libkf5service-dev,
+     libopencv-core-dev, libopencv-highgui-dev, libopencv-imgproc-dev,
+     libprotobuf-dev, libquazip5-dev, python-dev, qtscript5-dev, and sip-dev
+     - explicitly add libkf5plasma-dev
+   * Update symbols file.
+ 
+  -- Pino Toscano <pino at debian.org>  Thu, 30 Nov 2017 21:32:54 +0100
+ 
+ marble (4:17.08.1-1) experimental; urgency=medium
+ 
+   * New upstream release (17.08.1)
+   * Bump Standards-Version to 4.1.0.
+   * Update upstream metadata
+   * Update build-deps and deps with the info from cmake
+   * Update symbols files
+   * Bump kde-l10n breaks/replaces versions
+   * Release to experimental
  
-  -- Neon CI <neon at kde.org>  Thu, 12 Oct 2017 12:18:00 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Sep 2017 15:06:41 +0200
++>>>>>>> master
  
  marble (4:17.08.1-0neon) xenial; urgency=medium
  
diff --cc debian/control
index 944e90e,b7080a1..2484d87
--- a/debian/control
+++ b/debian/control
@@@ -3,67 -3,87 +3,92 @@@ Section: kd
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
- Build-Depends: cmake (>= 2.8.12~),
-                debhelper (>= 9),
-                extra-cmake-modules,
-                kdoctools-dev,
-                kio-dev,
+ Build-Depends: cmake (>= 3.5~),
+                debhelper-compat (= 13),
+                extra-cmake-modules (>= 1.7.0~),
+                gettext,
                 libgps-dev (>= 2.90),
-                libkf5config-dev,
-                libkf5coreaddons-dev,
-                libkf5crash-dev,
-                libkf5i18n-dev,
-                libkf5newstuff-dev,
-                libkf5parts-dev,
-                libkf5runner-dev,
-                libkf5service-dev,
-                libkf5wallet-dev,
-                libopencv-core-dev,
-                libopencv-highgui-dev,
-                libopencv-imgproc-dev,
+                libkf5coreaddons-dev (>= 5.7.0~),
+                libkf5crash-dev (>= 5.7.0~),
+                libkf5doctools-dev (>= 5.7.0~),
+                libkf5i18n-dev (>= 5.7.0~),
+                libkf5kio-dev (>= 5.7.0~),
+                libkf5newstuff-dev (>= 5.7.0~),
+                libkf5parts-dev (>= 5.7.0~),
+                libkf5plasma-dev (>= 5.7.0~),
+                libkf5runner-dev (>= 5.7.0~),
+                libkf5wallet-dev (>= 5.7.0~),
                 libphonon4qt5-dev,
                 libphonon4qt5experimental-dev,
-                libprotobuf-dev,
                 libqt5opengl5-dev,
                 libqt5serialport5-dev,
-                libqt5svg5-dev (>= 5.4),
+                libqt5svg5-dev (>= 5.7.0~),
                 libqt5webkit5-dev (>= 5.4),
-                libquazip5-dev,
                 libshp-dev,
-                libwlocate-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
 -               qtbase5-dev (>= 5.7.0~),
 -               qtdeclarative5-dev (>= 5.7.0~),
 -               qtlocation5-dev (>= 5.3.0~),
 -               qtmultimedia5-dev (>= 5.7.0~),
 -               qtpositioning5-dev (>= 5.7.0~),
 -               qtquickcontrols2-5-dev (>= 5.7.0~),
 -               qttools5-dev (>= 5.7.0~),
 +               plasma-framework,
 +               plasma-workspace,
 +               protobuf-compiler,
 +               python-dev,
 +               qtbase5-dev (>= 5.4),
 +               qtdeclarative5-dev (>= 5.4),
 +               qtlocation5-dev,
 +               qtmultimedia5-dev,
 +               qtpositioning5-dev,
 +               qtscript5-dev (>= 5.4),
 +               qttools5-dev (>= 5.4),
 +               qtwebengine5-dev,
                 shared-mime-info,
-                sip-dev,
-                zlib1g-dev
- Standards-Version: 3.9.8
- Homepage: http://edu.kde.org/
- Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/marble.git
- Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/marble.git
+                zlib1g-dev,
+ Standards-Version: 4.5.0
+ Rules-Requires-Root: no
+ Homepage: https://marble.kde.org/
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/marble
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/marble.git
  
- Package: marble
+ Package: libastro-dev
  Architecture: any
- Section: misc
- Depends: marble-data (>= ${source:Version}),
-          marble-plugins (= ${binary:Version}),
+ Section: libdevel
+ Depends: libastro1 (= ${binary:Version}), ${misc:Depends}
+ Description: development files for the Marble astrononmy 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
+  require hardware acceleration.  A minimal set of geographical data is
+  included, so it can be used without an internet connection.
+  .
+  This package contains development files for building software that uses the
+  Marble astronomy library
+  .
+  This package is part of the KDE education module.
+ 
+ Package: libastro1
+ Architecture: any
+ Section: libs
+ Multi-Arch: same
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+ Description: Marble astronomy 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
+  require hardware acceleration.  A minimal set of geographical data is
+  included, so it can be used without an internet connection.
+  .
+  This package contains shared libraries for astronomy support in marble.
+  .
+  This package is part of the KDE education module.
+ 
+ Package: libmarble-dev
+ Architecture: any
+ Section: libdevel
+ Depends: libastro-dev (= ${binary:Version}),
+          libmarblewidget-qt5-28 (= ${binary:Version}),
+          libqt5svg5-dev (>= 5.7.0~),
+          libqt5webkit5-dev (>= 5.4),
+          qtdeclarative5-dev (>= 5.7.0~),
           ${misc:Depends},
-          ${shlibs:Depends}
- Suggests: gosmore, monav-routing-daemon, routino
- Replaces: marble-data (<< 4:17.08.1)
- Breaks: marble-data (<< 4:17.08.1)
- Description: globe and map widget
+          ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28},
+          ${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
   require hardware acceleration.  A minimal set of geographical data is
@@@ -165,21 -196,16 +201,30 @@@ Description: globe and map widget (no K
   require hardware acceleration.  A minimal set of geographical data is
   included, so it can be used without an internet connection.
   .
-  This package contains shared libraries for astronomy support in marble.
-  .
   This package is part of the KDE education module.
  
++<<<<<<< HEAD
 +Package: libmarble-dev
 +Architecture: any
 +Section: libdevel
 +Depends: libastro-dev (= ${binary:Version}),
 +         libmarblewidget-qt5-28 (= ${binary:Version}),
 +         qtdeclarative5-dev (>= 5.4),
 +         qtwebengine5-dev,
 +         ${misc:Depends},
 +         ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28},
 +         ${shlibs:Depends}
 +Description: development files for the Marble globe widget library
++=======
+ Package: marble-qt-data
+ Architecture: all
+ Section: misc
+ Multi-Arch: foreign
+ 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
++>>>>>>> master
   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
diff --cc debian/libmarble-dev.install
index 9e60361,aca869a..1ec28b9
--- a/debian/libmarble-dev.install
+++ b/debian/libmarble-dev.install
@@@ -1,7 -1,7 +1,10 @@@
  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
+ usr/lib/*/qt5/plugins/designer/libMarbleWidgetPlugin.so
diff --cc debian/tests/control
index 4de8e38,4d7b51f..459e5f3
--- a/debian/tests/control
+++ b/debian/tests/control
@@@ -1,7 -1,4 +1,3 @@@
- Tests: testsuite
- Depends: build-essential, dbus-x11, xauth, xserver-xephyr, xvfb, @, @builddeps@
- Restrictions: build-needed
- 
  Tests: acc
 -Depends: @,
 -         dh-acc, exuberant-ctags
 +Depends: dh-acc, exuberant-ctags, @
  Restrictions: allow-stderr


More information about the Neon-commits mailing list