[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit abfcd263dad0e5bc9cf680f0051125078d4dff67
Author: Raymond Wooninck <tittiatcoke at gmail.com>
Date:   Tue Sep 13 14:56:24 2016 +0200

    Fix the build correctly
---
 debian/control                                        | 19 ++-----------------
 debian/libmarbledeclarative.install                   |  1 -
 debian/marble-plugins.install                         |  1 +
 ...ian-overrides => marble-plugins.lintian-overrides} |  1 +
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 3e135a9..1c0657b 100644
--- a/debian/control
+++ b/debian/control
@@ -130,21 +130,6 @@ Description: plugins for Marble
  .
  This package is part of the KDE education module.
 
-Package: libmarbledeclarative
-Architecture: any
-Section: libs
-Depends: marble-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: marble-plugins (= ${binary:Version})
-Description: Marble Declarative 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 declarative libraries for Marble.
- .
- This package is part of the KDE education module.
-
 Package: libmarblewidget-qt5-26
 Architecture: any
 Section: libs
@@ -178,11 +163,11 @@ Package: libmarble-dev
 Architecture: any
 Section: libdevel
 Depends: libastro-dev (= ${binary:Version}),
-         libmarblewidget-qt5-25 (= ${binary:Version}),
+         libmarblewidget-qt5-26 (= ${binary:Version}),
          libqt5webkit5-dev (>= 5.4),
          qtdeclarative5-dev (>= 5.4),
          ${misc:Depends},
-         ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-25},
+         ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-26},
          ${shlibs:Depends}
 Description: development files for the Marble globe widget library
  Marble is a generic geographical map widget and framework for KDE
diff --git a/debian/libmarbledeclarative.install b/debian/libmarbledeclarative.install
deleted file mode 100644
index 80626d6..0000000
--- a/debian/libmarbledeclarative.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmarbledeclarative.so
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 8617d88..06f1127 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1 +1,2 @@
+usr/lib/*/libmarbledeclarative.so
 usr/lib/*/marble/plugins/
diff --git a/debian/libmarbledeclarative.lintian-overrides b/debian/marble-plugins.lintian-overrides
similarity index 80%
rename from debian/libmarbledeclarative.lintian-overrides
rename to debian/marble-plugins.lintian-overrides
index 39c3276..d57bdae 100644
--- a/debian/libmarbledeclarative.lintian-overrides
+++ b/debian/marble-plugins.lintian-overrides
@@ -1,3 +1,4 @@
 marble-plugins: postinst-must-call-ldconfig usr/lib/*/libmarbledeclarative.so
 marble-plugins: package-must-activate-ldconfig-trigger usr/lib/*/libmarbledeclarative.so
 marble-plugins: shlib-without-versioned-soname usr/lib/x86_64-linux-gnu/libmarbledeclarative.so libmarbledeclarative.so
+marble-plugins: package-name-doesnt-match-sonames libmarbledeclarative

-- 
marble packaging