[SCM] qtlocation packaging branch, experimental, updated. debian/5.4.2-2-12-g70119d8

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Aug 24 08:58:36 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=70119d8

The following commit has been merged in the experimental branch:
commit 70119d8ff687aef40e33e94b1ef9098ea0f68db9
Merge: 25809177dfbeff5e3601e18642766750af2af152 4a879f31e43a77b5e83995c0d8c085d359fa9c82
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 24 11:57:32 2015 +0300

    Merge branch 'location-packages' into experimental.
    
    * 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.
    * Drop disable_qtlocation.patch.

 debian/changelog                                   |    5 +
 debian/control                                     |   79 +-
 debian/libqt5location5.symbols                     | 1282 ++++++++++++++++++++
 debian/patches/disable_qtlocation.patch            |   30 -
 debian/patches/series                              |    1 -
 debian/qtlocation5-dev.install                     |   92 ++
 ...c-html.install => qtlocation5-doc-html.install} |    1 +
 ...ioning5-doc.install => qtlocation5-doc.install} |    1 +
 ...amples.install => qtlocation5-examples.install} |    1 +
 debian/qtlocation5-examples.lintian-overrides      |    1 +
 debian/qtpositioning5-examples.lintian-overrides   |    1 -
 debian/rules                                       |    2 +-
 12 files changed, 1455 insertions(+), 41 deletions(-)

diff --cc debian/changelog
index 54d0609,819e9b7..0193448
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,11 +1,50 @@@
 -qtlocation-opensource-src (5.4.0~beta1-1) UNRELEASED; urgency=medium
 +qtlocation-opensource-src (5.5.0-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.
 +  * New upstream release.
++  * 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.
++  * Drop disable_qtlocation.patch.
  
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Nov 2014 15:23:05 +0300
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 11:51:52 +0300
 +
 +qtlocation-opensource-src (5.4.2-2) unstable; urgency=medium
 +
 +  * Upload to unstable.
 +  * Update symbols files with buildds' logs.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 24 Jun 2015 16:02:32 -0300
 +
 +qtlocation-opensource-src (5.4.2-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +    - Bump Qt build dependencies.
 +  * Expose HTML documentation (Closes: #751179).
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 03 Jun 2015 16:20:36 -0300
 +
 +qtlocation-opensource-src (5.4.1-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Bump Qt build-dependencies to 5.4.1.
 +  * Update watch and copyright to use https://download.qt.io/.
 +  * Mark three destructors symbols missing with GCC 5 as optional
 +    (closes: #778090).
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 05 Mar 2015 10:08:42 +0300
 +
 +qtlocation-opensource-src (5.4.0-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Bump Qt build-dependencies to 5.4.0.
 +  * Drop disable_qgeocircle_extendShape_tests.patch, no longer needed.
 +  * Disable building qtlocation module for now.
 +  * Build-depend on qtbase5-doc-html, for docs linking.
 +  * Update debian/copyright.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 27 Dec 2014 16:33:21 +0300
  
  qtlocation-opensource-src (5.3.2-2) unstable; urgency=medium
  
diff --cc debian/control
index f51352f,9a0ab3c..35a0ab0
--- a/debian/control
+++ b/debian/control
@@@ -85,9 -136,12 +137,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.4.0~)
 -Replaces: qtpositioning5-examples (<< 5.4.0~)
++Breaks: qtpositioning5-examples (<< 5.5.0~)
++Replaces: qtpositioning5-examples (<< 5.5.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.
@@@ -99,8 -153,12 +154,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.4.0~)
 -Replaces: qtpositioning5-dbg (<< 5.4.0~)
++Breaks: qtpositioning5-dbg (<< 5.5.0~)
++Replaces: qtpositioning5-dbg (<< 5.5.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.
@@@ -113,6 -171,8 +172,8 @@@ Priority: extr
  Architecture: all
  Section: doc
  Depends: ${misc:Depends}
 -Breaks: qtpositioning5-doc (<< 5.4.0~)
 -Replaces: qtpositioning5-doc (<< 5.4.0~)
++Breaks: qtpositioning5-doc (<< 5.5.0~)
++Replaces: qtpositioning5-doc (<< 5.5.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.
@@@ -125,6 -185,8 +186,8 @@@ Priority: extr
  Architecture: all
  Section: doc
  Depends: ${misc:Depends}
 -Breaks: qtpositioning5-doc-html (<< 5.4.0~)
 -Replaces: qtpositioning5-doc-html (<< 5.4.0~)
++Breaks: qtpositioning5-doc-html (<< 5.5.0~)
++Replaces: qtpositioning5-doc-html (<< 5.5.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/patches/series
index fd4ecc3,cf8feec..726d5ba
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,1 @@@
 -disable_qgeocircle_extendShape_tests.patch
  disable_failing_tests.patch
- disable_qtlocation.patch

-- 
qtlocation packaging



More information about the pkg-kde-commits mailing list