[SCM] marble packaging branch, kubuntu_unstable, updated. debian/15.08.3-1-76-gfc5ade8
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Sun Mar 6 01:00:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=fc5ade8
The following commit has been merged in the kubuntu_unstable branch:
commit fc5ade82d4765edf8a142de805fef7b95b528bf3
Merge: 9cf363f0b5000c52930b8c4499357a7a18fa65bc e1d169f8464b4c4eed92ad3d2d87f82d037d8ed7
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Sat Mar 5 17:00:13 2016 -0800
* Merged with Debian * New upstream release * Updating symbols and removing MISSING * Fixing error in copyright file
-- Clive Johnston <clivejo at aol.com> Wed, 17 Feb 2016 15:28:41 +0000 * 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 * Non-maintainer upload. * Update libquazip build dependency to libquazip5-dev. Closes: #800785, #811203
-- Mattia Rizzolo <mattia at debian.org> Wed, 27 Jan 2016 19:11:50 +0000 * 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 * 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
* Merged with Debian
* New upstream release
* Updating symbols and removing MISSING
* Fixing error in copyright file
-- Clive Johnston <clivejo at aol.com> Wed, 17 Feb 2016 15:28:41 +0000
* 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
* Non-maintainer upload.
* Update libquazip build dependency to libquazip5-dev.
Closes: #800785, #811203
-- Mattia Rizzolo <mattia at debian.org> Wed, 27 Jan 2016 19:11:50 +0000
* 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
* 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
debian/changelog | 131 +-
debian/control | 59 +-
debian/copyright | 2095 ++++++++++++++++++++++++-
debian/libastro-dev.acc.in | 21 +
debian/libmarble-dev.acc.in | 21 +
debian/libmarblewidget-qt5-23.symbols | 1553 +++++++++---------
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, 2956 insertions(+), 990 deletions(-)
diff --cc debian/changelog
index ece0261,8ce048f..9fed1af
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,18 -4,60 +4,67 @@@ marble (4:15.12.1-1ubuntu1) UNRELEASED
* 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
+ * Updating symbols and removing MISSING
+ * Fixing error in copyright file
+
+ -- 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
++<<<<<<< HEAD
+ [ Bhushan Shah ]
+ * Depend on libquazip5-dev or libquazip-qt5-dev, fixes on xenial
+
+ -- 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
++>>>>>>> kubuntu_stable
marble (4:15.08.2-0ubuntu2) xenial; urgency=medium
--
marble packaging
More information about the pkg-kde-commits
mailing list