[SCM] marble packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-72-gb69e5d7
Clive Johnston
clivejo-guest at moszumanska.debian.org
Wed Feb 17 15:32:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=b69e5d7
The following commit has been merged in the kubuntu_xenial_archive branch:
commit b69e5d74d9bee4ef700170f266d706e933406ddd
Merge: cadacb7551052aa9e4792b65e858992c4a63f10b d33337290a1aa0996b760549c549e41047d78051
Author: Clive Johnston <clivejo at aol.com>
Date: Wed Feb 17 15:31:57 2016 +0000
Merged with Debian and New upstream release
debian/changelog | 127 +-
debian/control | 59 +-
debian/copyright | 2097 ++++++++++++++++++++++++-
debian/libastro-dev.acc.in | 21 +
debian/libmarble-dev.acc.in | 21 +
debian/libmarblewidget-qt5-23.symbols | 1613 +++++++++----------
debian/marble-maps.install | 1 +
debian/marble-plugins.install | 2 +-
debian/marble-plugins.lintian-overrides | 1 +
debian/patches/do_not_install_private_headers | 8 +-
debian/patches/series | 1 -
debian/rules | 37 +-
debian/tests/acc | 15 +
debian/watch | 1 -
14 files changed, 3011 insertions(+), 993 deletions(-)
diff --cc debian/changelog
index 030d188,4e9d02c..b5eeeae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,76 +1,123 @@@
- marble (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++marble (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Build with MARBLE_INSTALL_ANDROID_APPS
+
+ [ Scarlett Clark ]
- * Refresh fix_qmake_fallback.diff patch.
++ * Refresh fix_qmake_fallback.diff patch.
+
+ [ Philip Muškovac ]
- * New upstream release
++ * New upstream release
+
+ [ Clive Johnston ]
- * Updating symbols
++ * Merged with Debian
++ * New upstream release
++
++ -- Clive Johnston <clivejo at aol.com> Wed, 17 Feb 2016 15:28:41 +0000
++
+ marble (4:15.12.1-1) experimental; urgency=medium
+
+ * New upstream release (15.12.0).
+ * Change libquazip-qt5-dev build dep to libquazip5-dev. (Closes:
+ #811203) Thanks to Sebastiaan Couwenberg.
+ * Drop patch: fix_qmake_fallback.diff
+ * Update symbols files.
+ * New upstream release (15.12.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 01 Feb 2016 10:23:56 +0100
+
+ marble (4:15.08.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Bas Couwenberg ]
+ * Update libquazip build dependency to libquazip5-dev.
+ Closes: #800785, #811203
+
+ -- Mattia Rizzolo <mattia at debian.org> Wed, 27 Jan 2016 19:11:50 +0000
+
+ marble (4:15.08.3-1) unstable; urgency=medium
+
+ * New upstream release (15.08.3).
+ * Drop upstream patch: upstream_clarify_license_of_the_dgml_files.dif
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 02 Dec 2015 12:39:40 +0100
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 14 Sep 2015 13:20:57 +0100
+ marble (4:15.08.2-1) unstable; urgency=medium
+
+ * New upstream release (15.08.2).
+ * New upstream patch: upstream_clarify_license_of_the_dgml_files.diff
+ * Drop patch: debian-avoid_installing_pruned_files.patch
+ * Remove the excluded files rule. (Closes: #799382) Thanks to Torsten
+ Rahn
+ * Refresh patches.
+ * Update install files.
+ * Update symbols files from buildds logs (4:15.08.1+dfsg-2).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 16 Oct 2015 08:07:24 +0200
+marble (4:15.08.2-0ubuntu2) xenial; urgency=medium
+
+ * Fix autopackagetests by adding allow-stderr to the requirements.
+
+ -- Philip Muškovac <yofel at kubuntu.org> Tue, 03 Nov 2015 15:34:54 +0100
+
+marble (4:15.08.2-0ubuntu1) wily; urgency=medium
+
+ * Vivid backport
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Wed, 14 Oct 2015 13:01:02 +0100
+
+ marble (4:15.08.1+dfsg-2) unstable; urgency=medium
+
+ * Remove qtlocations build dep, it's not in sid yet.
+ * Update symbols files.
+ * Add missing dev dependency (thanks to acc headers check)
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 20 Sep 2015 00:40:08 +0200
+
+ marble (4:15.08.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release (15.08.1+dfsg).
+ * Drop upstream patch: upstream_fix-vtable-linking.diff
+ * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 19 Sep 2015 02:45:01 +0200
+
+marble (4:15.08.1-0ubuntu1) wily; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Add missing marble-qt.install file
+ * Add upstream_find-quazip.diff to fix finding library
+
+ [ Clive Johnston ]
+ * New upstream release (15.08.1)
+
+ -- Clive Johnston <clivejo at aol.com> Tue, 22 Sep 2015 17:43:28 +0100
+
+ marble (4:15.08.0+dfsg-1) experimental; urgency=medium
+
+ * New upstream release (15.04.0).
+ * New upstream release (15.04.1).
+ * New upstream release (15.04.2).
+ * Update copyright information.
+ * Prune CC-BY-SA-2.0 licensed files, (not dfsg compatible license).
+ * Refresh patches
+ * New patch: debian-avoid_installing_pruned_files.patch
+ * Update library soversion to 21.
+ * New upstream release (15.04.3+dfsg).
+ * New upstream release (15.08.0+dfsg).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 11 Sep 2015 12:27:42 +0200
+
+marble (4:15.08.0-0ubuntu5) wily; urgency=medium
+
+ * Add libqt5extserialport-dev build-depends
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 04 Sep 2015 12:17:52 +0100
+
marble (4:15.08.0-0ubuntu4) wily; urgency=medium
* Renable patches previously disabled in kf5 port
diff --cc debian/libmarblewidget-qt5-23.symbols
index 3615079,654ef3f..d7ab09f
--- a/debian/libmarblewidget-qt5-23.symbols
+++ b/debian/libmarblewidget-qt5-23.symbols
@@@ -1,10 -1,11 +1,11 @@@
-# SymbolsHelper-Confirmed: 4:15.12.0 amd64
+# SymbolsHelper-Confirmed: 4:15.12.0 amd64 i386
libmarblewidget-qt5.so.23 libmarblewidget-qt5-23 #MINVER#
- (optional=templinst)_Z17qRegisterMetaTypeIN13QNetworkReply12NetworkErrorEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.3
+ (optional=templinst)_Z17qRegisterMetaTypeIN13QNetworkReply12NetworkErrorEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.12.0
(optional=templinst)_Z17qRegisterMetaTypeIN6Marble13DownloadUsageEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
+ (optional=templinst|arch=mips mipsel)_Z17qRegisterMetaTypeIN6Marble16OsmPlacemarkDataEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.1+dfsg
(optional=templinst)_Z17qRegisterMetaTypeIN6Marble18GeoDataCoordinatesEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
- (optional=templinst|arch=!ppc64el)_Z17qRegisterMetaTypeIPN6Marble13GeoDataFolderEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS5_Xaasr12QMetaTypeId2IS5_E7DefinedntsrSA_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
- (optional=templinst|arch=!ppc64el)_Z17qRegisterMetaTypeIPN6Marble13GeoDataObjectEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS5_Xaasr12QMetaTypeId2IS5_E7DefinedntsrSA_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
+ (optional=templinst)_Z17qRegisterMetaTypeIPN6Marble13GeoDataFolderEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS5_Xaasr12QMetaTypeId2IS5_E7DefinedntsrSA_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
+ (optional=templinst)_Z17qRegisterMetaTypeIPN6Marble13GeoDataObjectEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS5_Xaasr12QMetaTypeId2IS5_E7DefinedntsrSA_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
(optional=templinst)_Z17qRegisterMetaTypeIPN6Marble15GeoDataDocumentEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS5_Xaasr12QMetaTypeId2IS5_E7DefinedntsrSA_9IsBuiltInEE11DefinedTypeE at Base 4:15.08.0
_Z21qInitResources_marblev at Base 4:15.08.0
_Z24qCleanupResources_marblev at Base 4:15.08.0
--
marble packaging
More information about the pkg-kde-commits
mailing list