[SCM] qtlocation packaging branch, location-packages, updated. debian/5.3.2-2-10-g4a879f3
Dmitry Shachnev
mitya57-guest at moszumanska.debian.org
Mon Nov 24 12:29:07 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=4a879f3
The following commit has been merged in the location-packages branch:
commit 4a879f31e43a77b5e83995c0d8c085d359fa9c82
Merge: 148690f486337e54f26bbfc6ef1e3a81f2f47160 baaa832aa6740ce93b96e9cb92d515157694eaf1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Nov 24 15:28:03 2014 +0300
Merge branch 'master' into location-packages.
Needs some updating for 5.4 before being merged back into mainline.
debian/changelog | 79 +++++++++++++++++++-
debian/control | 61 +++++++--------
debian/copyright | 4 +-
debian/libqt5positioning5.symbols | 54 ++++++--------
debian/patches/disable_failing_tests.patch | 23 ++++++
.../disable_qgeocircle_extendShape_tests.patch | 41 +++++++++++
debian/patches/series | 3 +-
debian/patches/skip_failing_tests.patch | 86 ----------------------
debian/qtlocation5-examples.install | 1 +
debian/qtpositioning5-dev.install | 68 ++++++++---------
debian/rules | 12 +--
11 files changed, 233 insertions(+), 199 deletions(-)
diff --cc debian/changelog
index d45e545,f9971c8..819e9b7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,75 +1,84 @@@
- qtlocation-opensource-src (5.2.1-4) UNRELEASED; urgency=medium
++qtlocation-opensource-src (5.4.0~beta1-1) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Rename the -doc, -dbg and -examples packages to match the source
+ package name, for consistency with other Qt 5 modules.
+ * Build new packages for qtlocation module.
- * Pass ‘-screen 0 640x480x24’ to Xvfb server when running tests,
- needed for executing OpenGL/QML tests on the builders.
+
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 30 Apr 2014 16:19:31 +0400
++ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 24 Nov 2014 15:23:05 +0300
++
+ qtlocation-opensource-src (5.3.2-2) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Create disable_qgeocircle_extendShape_tests.patch to disable this tests
+ until QTBUG-41447 is solved.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 23 Sep 2014 00:26:51 -0300
+
+ qtlocation-opensource-src (5.3.2-1) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Drop dh_auto_build-arch override, no longer needed.
+ * Run tests with QT_QPA_PLATFORM=minimal, so that they could be
+ run without Xvfb.
+ * Update my e-mail address.
+ * Update Vcs-Browser field to point to cgit interface.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * New upstream release.
+ * Bump Qt build dependencies.
+ * Update symbols files with buildds' logs.
+ * Update install files.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Fri, 19 Sep 2014 00:55:17 -0300
+
+ qtlocation-opensource-src (5.3.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Qt build dependencies.
+ * Remove remove_qreal_check.patch, applied upstream.
+ * Fix install file with new files.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 01 Jul 2014 13:24:41 -0300
+
+ qtlocation-opensource-src (5.3.0-3) unstable; urgency=medium
+
+ * Add remove_qreal_check.patch to fix build failure on ARM.
+ * Add myself to Uploaders.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 08 Jun 2014 17:39:36 +0400
+
+ qtlocation-opensource-src (5.3.0-2) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Re-enable tests, using disable_failing_tests.patch to disable the tests
+ that are currently failing. Both of them seems to lack a source of
+ information to properly work.
+ * Add build dependencies needed for running the tests.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Sat, 07 Jun 2014 11:18:06 -0300
+
+ qtlocation-opensource-src (5.3.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump Qt build dependencies.
+ * Install headers in their new m-a path. Mark development package as
+ Multi-Arch: same.
+ * Remove transitional package qtdeclarative5-qtpositioning-plugin.
+ * Remove skip_failing_tests.patch. If the test are failing then they should
+ not be deactivated but solved, except we have a good reason to do it.
+ And sadly we have one, but seems a missing service for the test to run
+ properly. Disable tests *just* for this uppload.
+ * Remove qtdeclarative5-qtquick2-plugin from the build dependencies, it is
+ not really needed.
+ * Add dbus as build dependency and run dbus-launch for the tests.
+ * Add geoclue as build dependency, it is needed by the tests.
+ * Update symbols files with current build log.
+ * Update install files.
+ * Fix path for removing private headers.
+ * Update debian/copyright.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Thu, 29 May 2014 23:32:11 -0300
qtlocation-opensource-src (5.2.1-3) unstable; urgency=medium
diff --cc debian/control
index 8caa90c,3e9452f..9a0ab3c
--- a/debian/control
+++ b/debian/control
@@@ -20,19 -22,8 +22,19 @@@ Build-Depends-Indep: libqt5sql5-sqlite
Standards-Version: 3.9.5
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtlocation.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtlocation.git;a=summary
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtlocation.git
+Package: libqt5location5
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt Location module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains Qt Location module.
+
Package: libqt5positioning5
Architecture: any
Multi-Arch: same
@@@ -70,29 -48,6 +72,19 @@@ Description: Qt Positioning module - po
.
This package contains Qt Positioning plugins.
- Package: qtdeclarative5-qtlocation-plugin
++Package: qml-module-qtlocation
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
- Depends: libqt5location5-plugins,
++Depends: libqt5location5-plugins (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
- Description: Qt Location module - QML plugin
++Description: Qt Location QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
- This package contains the Qt Location QML plugin for Qt Declarative.
-
- Package: qtdeclarative5-qtpositioning-plugin
- Architecture: all
- Section: oldlibs
- Depends: qml-module-qtpositioning, ${misc:Depends}
- Description: transitional dummy package for Qt Positioning QML module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This is a transitional dummy package which can be safely removed.
++ This package contains the Qt Location QML module for Qt Declarative.
+
Package: qml-module-qtpositioning
Architecture: any
Multi-Arch: same
@@@ -108,23 -63,9 +100,24 @@@ Description: Qt Positioning QML modul
.
This package contains the Qt Positioning QML module for Qt Declarative.
+Package: qtlocation5-dev
+Architecture: any
+Section: libdevel
+Depends: libqt5location5 (= ${binary:Version}),
+ libqt5location5-plugins (= ${binary:Version}),
+ qtbase5-dev,
+ qtdeclarative5-dev,
+ ${misc:Depends}
+Description: Qt 5 Location development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the header development files used for building Qt 5
+ applications using Qt Location library.
+
Package: qtpositioning5-dev
Architecture: any
+ Multi-Arch: same
Section: libdevel
Depends: libqt5positioning5 (= ${binary:Version}),
libqt5positioning5-plugins (= ${binary:Version}),
@@@ -143,12 -84,9 +136,12 @@@ Architecture: an
Multi-Arch: same
Section: x11
Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5positioning5-plugins (= ${binary:Version}),
+Depends: libqt5location5-plugins (= ${binary:Version}),
+ libqt5positioning5-plugins (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
- Breaks: qtpositioning5-examples (<< 5.2.1-2~)
- Replaces: qtpositioning5-examples (<< 5.2.1-2~)
++Breaks: qtpositioning5-examples (<< 5.4.0~)
++Replaces: qtpositioning5-examples (<< 5.4.0~)
Description: Qt 5 Location and Positioning examples
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@@ -160,12 -98,8 +153,12 @@@ Priority: extr
Architecture: any
Multi-Arch: same
Section: debug
-Depends: libqt5positioning5 (= ${binary:Version}), ${misc:Depends}
+Depends: libqt5location5 (= ${binary:Version}),
+ libqt5positioning5 (= ${binary:Version}),
+ ${misc:Depends}
Recommends: qtbase5-dbg, qtdeclarative5-dbg
- Breaks: qtpositioning5-dbg (<< 5.2.1-2~)
- Replaces: qtpositioning5-dbg (<< 5.2.1-2~)
++Breaks: qtpositioning5-dbg (<< 5.4.0~)
++Replaces: qtpositioning5-dbg (<< 5.4.0~)
Description: Qt Location library debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@@ -178,8 -112,6 +171,8 @@@ Priority: extr
Architecture: all
Section: doc
Depends: ${misc:Depends}
- Breaks: qtpositioning5-doc (<< 5.2.1-2~)
- Replaces: qtpositioning5-doc (<< 5.2.1-2~)
++Breaks: qtpositioning5-doc (<< 5.4.0~)
++Replaces: qtpositioning5-doc (<< 5.4.0~)
Description: Qt 5 Positioning documentation
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@@ -192,8 -124,6 +185,8 @@@ Priority: extr
Architecture: all
Section: doc
Depends: ${misc:Depends}
- Breaks: qtpositioning5-doc-html (<< 5.2.1-2~)
- Replaces: qtpositioning5-doc-html (<< 5.2.1-2~)
++Breaks: qtpositioning5-doc-html (<< 5.4.0~)
++Replaces: qtpositioning5-doc-html (<< 5.4.0~)
Description: Qt 5 Positioning HTML documentation
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
diff --cc debian/qtlocation5-examples.install
index 659c9f9,355a6b2..5a22a6d
--- a/debian/qtlocation5-examples.install
+++ b/debian/qtlocation5-examples.install
@@@ -1,2 -1,2 +1,3 @@@
+usr/lib/*/qt5/examples/location/
usr/lib/*/qt5/examples/positioning/
+ usr/lib/*/qt5/examples/qtpositioning/satelliteinfo/satelliteinfo
--
qtlocation packaging
More information about the pkg-kde-commits
mailing list