[SCM] qtlocation packaging branch, ubuntu, updated. ubuntu/5.7.1-1ubuntu1

Timo Jyrinki timo at moszumanska.debian.org
Tue Jan 10 07:58:24 UTC 2017


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

The following commit has been merged in the ubuntu branch:
commit bbf7edcea2539412725b7a477a7a5ef440b37594
Merge: 980f097602ae043874b67dc45eff842d6d265ace 804272dbbe8d7d5aeb9edc472735b91f6e9b501f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jan 3 12:14:29 2017 +0000

    Merge branch 'master' into ubuntu+1

 debian/changelog               | 13 ++++++++++-
 debian/control                 | 10 ++++----
 debian/copyright               | 52 +++++++++++++++++++++++++++++++++++++++++-
 debian/libqt5location5.symbols | 50 +++++++++++++++++++++++++++++++++++-----
 debian/rules                   |  2 +-
 5 files changed, 113 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index b25b827,e6f034c..4110a22
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
- qtlocation-opensource-src (5.7.1~20161021-3ubuntu1) UNRELEASED; urgency=medium
++qtlocation-opensource-src (5.7.1-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 18 Nov 2016 08:50:04 +0000
 +
+ qtlocation-opensource-src (5.7.1-1) unstable; urgency=medium
+ 
+   * New upstream stable release.
+   * Ignore the tests results rather than completely disable them.
+   * Bump qtbase build-dependencies to 5.7.1 final.
+   * Update debian/copyright.
+   * Update libqt5location5.symbols from the current amd64 build log.
+   * Replace 5.7.1~20161021 with 5.7.1 in libqt5location5.symbols.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 16 Dec 2016 21:07:41 +0300
+ 
  qtlocation-opensource-src (5.7.1~20161021-3) unstable; urgency=medium
  
    * Disable tests during the transition. We have a couple of flaky tests
diff --cc debian/control
index 61c6c74,9d78908..cdbb104
--- a/debian/control
+++ b/debian/control
@@@ -8,15 -7,12 +8,15 @@@ Uploaders: Timo Jyrinki <timo at debian.or
             Dmitry Shachnev <mitya57 at debian.org>
  Build-Depends: dbus,
                 debhelper (>= 9.20160114~),
-                libqt5opengl5-dev (>= 5.7.1~20161021+dfsg~),
+                libqt5opengl5-dev (>= 5.7.1+dfsg~),
                 pkg-kde-tools,
 +               qml-module-qtquick2 (>= 5.6.1~),
-                qtbase5-private-dev (>= 5.7.1~20161021+dfsg~),
-                qtdeclarative5-private-dev (>= 5.7.1~20161021~),
+                qtbase5-private-dev (>= 5.7.1+dfsg~),
+                qtdeclarative5-private-dev (>= 5.7.1~20161021~)
 +               xauth,
 +               xvfb
- Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1~20161021+dfsg~),
-                      qtbase5-doc-html (>= 5.7.1~20161021+dfsg~),
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1+dfsg~),
+                      qtbase5-doc-html (>= 5.7.1+dfsg~),
                       qttools5-dev-tools (>= 5.7.1~20161021~)
  Standards-Version: 3.9.8
  Homepage: http://qt-project.org/
diff --cc debian/libqt5location5.symbols
index 3f47a8f,c081b15..f49016b
--- a/debian/libqt5location5.symbols
+++ b/debian/libqt5location5.symbols
@@@ -1,5 -1,5 +1,5 @@@
- # SymbolsHelper-Confirmed: 5.7.1~20161021 amd64
+ # SymbolsHelper-Confirmed: 5.7.1 amd64
 -libQt5Location.so.5 libqt5location5 #MINVER#
 +libQt5Location.so.5 libqt5location5 #MINVER# | libqt5location5-gles #MINVER#
   Qt_5.0 at Qt_5.0 5.6.0
   Qt_5.1 at Qt_5.1 5.6.0
   Qt_5.2 at Qt_5.2 5.6.0

-- 
qtlocation packaging



More information about the pkg-kde-commits mailing list