[SCM] marble packaging branch, master, updated. debian/16.04.1-3-19-g38ac766

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 10 16:58:24 UTC 2016


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

The following commit has been merged in the master branch:
commit f2ca8def14ca7afe24ebbdbca2a8b7ca135ad41f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Aug 31 11:04:23 2016 +0200

    Follow upstream libmarblewidget soversion bump
---
 debian/control                                                      | 6 +++---
 debian/libastro-dev.install                                         | 1 +
 debian/libmarble-dev.install                                        | 2 +-
 ...ibmarblewidget-qt5-24.install => libmarblewidget-qt5-25.install} | 2 +-
 ...ibmarblewidget-qt5-24.symbols => libmarblewidget-qt5-25.symbols} | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index fb470a7..fc615a4 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,7 @@ Description: plugins for Marble
  .
  This package is part of the KDE education module.
 
-Package: libmarblewidget-qt5-24
+Package: libmarblewidget-qt5-25
 Architecture: any
 Section: libs
 Depends: marble-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -161,11 +161,11 @@ Package: libmarble-dev
 Architecture: any
 Section: libdevel
 Depends: libastro-dev (= ${binary:Version}),
-         libmarblewidget-qt5-24 (= ${binary:Version}),
+         libmarblewidget-qt5-25 (= ${binary:Version}),
          libqt5webkit5-dev (>= 5.4),
          qtdeclarative5-dev (>= 5.4),
          ${misc:Depends},
-         ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-24},
+         ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-25},
          ${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/libastro-dev.install b/debian/libastro-dev.install
index dad2bf5..0aedf72 100644
--- a/debian/libastro-dev.install
+++ b/debian/libastro-dev.install
@@ -6,3 +6,4 @@ usr/include/astro/eclsolar.h
 usr/include/astro/planetarySats.h
 usr/include/astro/solarsystem.h
 usr/lib/*/libastro.so
+usr/lib/*/cmake/Astro/
diff --git a/debian/libmarble-dev.install b/debian/libmarble-dev.install
index d74d112..72b75fa 100644
--- a/debian/libmarble-dev.install
+++ b/debian/libmarble-dev.install
@@ -3,4 +3,4 @@ usr/lib/*/libmarblewidget-qt5.so
 usr/lib/*/plugins/designer/libLatLonEditPlugin.so
 usr/lib/*/plugins/designer/libMarbleNavigatorPlugin.so
 usr/lib/*/plugins/designer/libMarbleWidgetPlugin.so
-usr/share/marble/cmake/FindMarble.cmake
+usr/lib/*/cmake/Marble/
diff --git a/debian/libmarblewidget-qt5-24.install b/debian/libmarblewidget-qt5-25.install
similarity index 50%
rename from debian/libmarblewidget-qt5-24.install
rename to debian/libmarblewidget-qt5-25.install
index 3edf9fe..21b37f3 100644
--- a/debian/libmarblewidget-qt5-24.install
+++ b/debian/libmarblewidget-qt5-25.install
@@ -1,2 +1,2 @@
 usr/lib/*/libmarblewidget-qt5.so.0.*
-usr/lib/*/libmarblewidget-qt5.so.24
+usr/lib/*/libmarblewidget-qt5.so.25
diff --git a/debian/libmarblewidget-qt5-24.symbols b/debian/libmarblewidget-qt5-25.symbols
similarity index 99%
rename from debian/libmarblewidget-qt5-24.symbols
rename to debian/libmarblewidget-qt5-25.symbols
index 9481b3d..d88fd1d 100644
--- a/debian/libmarblewidget-qt5-24.symbols
+++ b/debian/libmarblewidget-qt5-25.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:16.04.3 amd64 armhf i386
-libmarblewidget-qt5.so.24 libmarblewidget-qt5-24 #MINVER#
+libmarblewidget-qt5.so.25 libmarblewidget-qt5-25 #MINVER#
  (optional=templinst|arch=hurd-i386 kfreebsd-amd64 kfreebsd-i386 x32)_Z17qRegisterMetaTypeIN13QNetworkReply12NetworkErrorEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.3
  (optional=templinst)_Z17qRegisterMetaTypeIN6Marble13DownloadUsageEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
  (optional=templinst)_Z17qRegisterMetaTypeIN6Marble18GeoDataCoordinatesEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0

-- 
marble packaging



More information about the pkg-kde-commits mailing list