[SCM] marble packaging branch, master, updated. ubuntu/15.08.0-0ubuntu4-36-g97d384f
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Sep 11 11:31:52 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=5226bc7
The following commit has been merged in the master branch:
commit 5226bc72dc4adc6ba7c447db56a1da95fd8519b7
Merge: 9804f1f4fdd3dd9a855ef44595f59d5f114dfd49 573b5add04485f2daa2b7e0ed485854324481b27
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Sep 10 15:49:07 2015 +0200
Merge remote-tracking branch 'origin/kubuntu_wily_archive'
debian/changelog | 57 +
debian/control | 44 +-
debian/libastro1.install | 2 +-
debian/libastro1.symbols | 107 +-
debian/libmarble-dev.install | 10 +-
debian/libmarblewidget-qt5-22.install | 2 +
debian/libmarblewidget-qt5-22.symbols | 13810 +++++++++++++++++++
debian/libmarblewidget21.install | 2 -
debian/libmarblewidget21.symbols | 6468 ---------
debian/marble-data.install | 46 +-
debian/marble-mobile.install | 2 +-
debian/marble-plugins.install | 8 +-
debian/marble-qt.install | 2 -
debian/marble-touch.install | 2 +-
debian/marble.install | 37 +-
debian/patches/do_not_install_private_headers | 10 +-
...> kubuntu_disable-MarbleRunnerManagerTest.diff} | 13 +-
debian/patches/series | 4 +-
debian/patches/upstream_fix-vtable-linking.diff | 45 +
debian/rules | 14 +-
debian/watch | 4 +-
21 files changed, 14111 insertions(+), 6578 deletions(-)
diff --cc debian/changelog
index add8805,9a84e3c..82d10dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,60 +1,81 @@@
+marble (4:15.08.0+dfsg-1~) UNRELEASED; 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> Thu, 10 Sep 2015 15:22:36 +0200
+
+ marble (4:15.08.0-0ubuntu4) wily; urgency=medium
+
+ * Renable patches previously disabled in kf5 port
+ + fix_qmake_fallback.diff
+ + do_not_install_private_headers
+ + kubuntu_disable-MarbleRunnerManagerTest.diff
+
+ -- Harald Sitter <sitter at kde.org> Mon, 31 Aug 2015 14:33:06 +0200
+
+ marble (4:15.08.0-0ubuntu3) wily; urgency=medium
+
+ * Update symbols
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 21 Aug 2015 14:23:43 +0100
+
+ marble (4:15.08.0-0ubuntu2) wily; urgency=medium
+
+ * Fix .install file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 21 Aug 2015 13:28:56 +0100
+
+ marble (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+ [ José Manuel Santamaría Lema ]
+ * Update symbols: mark as optional symbols gone after building with
+ GCC 5
+
+ [ Jonathan Riddell ]
+ * New upstream release
+ * Port to frameworks 5
+ * new upstream beta release
+
+ [ Philip Muškovac ]
+ * Add upstream_fix-vtable-linking.diff to fix vtable linking
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 13 Aug 2015 11:44:25 +0100
+
+ marble (4:15.04.2-0ubuntu2) wily; urgency=medium
+
+ * Update symbol file for armhf
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 22 Jun 2015 15:21:44 +0200
+
+ marble (4:15.04.2-0ubuntu1) wily; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Make kubuntu_disable-MarbleRunnerManagerTest.diff apply with policy
+
+ [ Scarlett Clark ]
+ * New upstream release
+ * wrap-and-sort
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 09 Jun 2015 22:33:11 +0200
+
+marble (4:14.12.3-1) experimental; urgency=medium
+
+ * New upstream release (14.12.3).
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 29 Mar 2015 15:13:13 +0200
+
marble (4:14.12.3-0ubuntu2) vivid; urgency=medium
* Disable running the MarbleRunnerManagerTest test. Upstream says
diff --cc debian/control
index 0a07fa3,b8faea0..9750140
--- a/debian/control
+++ b/debian/control
@@@ -3,31 -3,35 +3,45 @@@ 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,
+Build-Depends: cmake (>= 2.8.12~),
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev,
+ extra-cmake-modules,
+ kdoctools-dev,
+ kio-dev,
- libgps-dev,
+ libgps-dev (>= 2.90),
- libphonon-dev,
++ libkf5config-dev,
++ libkf5coreaddons-dev,
++ libkf5i18n-dev,
+ libkf5newstuff-dev,
+ libkf5parts-dev,
+ libkf5runner-dev,
++ libkf5service-dev,
+ libkf5wallet-dev,
++ libopencv-core-dev,
++ libopencv-highgui-dev,
++ libopencv-imgproc-dev,
+ libphonon4qt5-dev,
++ libprotobuf-dev,
+ libqextserialport-dev,
+ libqt5opengl5-dev,
- libqt5svg5-dev,
- libqt5webkit5-dev,
+ libqt5svg5-dev (>= 5.4),
+ libqt5webkit5-dev (>= 5.4),
- libqtwebkit-dev,
- libquazip-dev,
+ libquazip-qt5-dev,
libshp-dev,
- libwlocate-dev,
-- libx11-dev,
++ python-dev,
pkg-config,
pkg-kde-tools (>= 0.12),
- qtbase5-dev,
- qtdeclarative5-dev,
- qttools5-dev,
- shared-mime-info
+ qtbase5-dev (>= 5.4),
+ qtdeclarative5-dev (>= 5.4),
- qtmobility-dev [linux-any],
+ qtscript5-dev (>= 5.4),
+ qttools5-dev (>= 5.4),
- shared-mime-info
++ shared-mime-info,
++ sip-dev,
++ zlib1g-dev
Standards-Version: 3.9.6
-XS-Testsuite: autopkgtest
Homepage: http://edu.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/marble.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/marble.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/marble.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/marble.git
Package: marble
Architecture: any
@@@ -114,9 -118,7 +128,7 @@@ Description: data files for Marbl
Package: marble-plugins
Architecture: any
Section: misc
-Depends: libwlocate0, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
- Replaces: libmarble4
- Breaks: libmarble4
Description: plugins for Marble
Marble is a generic geographical map widget and framework for KDE
applications. The Marble widget shows the earth as a sphere but does not
--
marble packaging
More information about the pkg-kde-commits
mailing list