[SCM] qtwebkit-examples packaging branch, experimental, updated. debian/5.7.1+dfsg-1-6-g7b021de

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Jun 15 13:56:04 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=7b021de

The following commit has been merged in the experimental branch:
commit 7b021de6c45015453f9a35522b78af432592823b
Merge: 5188575a956c864e398faeaaf0f4b9475d9054d1 181a8f2aac97ffdc710c92afbdd5622ad0edde88
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jun 15 16:55:20 2017 +0300

    Merge remote-tracking branch 'origin/master' into experimental

 debian/changelog                    | 18 ++++++++++++++++++
 debian/control                      | 16 +---------------
 debian/copyright                    | 33 ++++++++++++++++++++++++---------
 debian/patches/packaged_jquery.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        | 16 ++++------------
 debian/watch                        |  2 +-
 7 files changed, 75 insertions(+), 37 deletions(-)

diff --cc debian/changelog
index 2a5f306,3a10f8e..74ba86e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,21 +1,28 @@@
 +qtwebkit-examples-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Update debian/watch to reflect the new upstream location of the tarball.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Mon, 12 Jun 2017 23:07:36 -0500
 +
+ qtwebkit-examples-opensource-src (5.7.1+dfsg-1) unstable; urgency=medium
+ 
+   * Repack the tarball to remove the non-DFSG file.
+   * Update the debian/watch file.
+   * Migrate to an automatic dbgsym package.
+   * Drop unused pkg-kde-tools build-dependency.
+   * Update debian/copyright.
+   * Use packaged jQuery properly (packaged_jquery.diff).
+   * Bump Qt build-dependencies to 5.7.1 final.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 04 Jan 2017 22:03:38 +0300
+ 
+ qtwebkit-examples-opensource-src (5.7.1~20161021-2) unstable; urgency=medium
+ 
+   * Release to unstable.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 01 Nov 2016 09:11:14 -0300
+ 
  qtwebkit-examples-opensource-src (5.7.1~20161021-1) experimental; urgency=medium
  
    * New upstream snapshot.
diff --cc debian/control
index da70502,9febf0e..65ae998
--- a/debian/control
+++ b/debian/control
@@@ -8,23 -8,22 +8,22 @@@ Uploaders: Sune Vuorela <debian at pusling
             Felix Geyer <fgeyer at debian.org>,
             Timo Jyrinki <timo at debian.org>,
             Dmitry Shachnev <mitya57 at debian.org>
- Build-Depends: debhelper (>= 9),
+ Build-Depends: debhelper (>= 9.20160114~),
                 libglib2.0-dev,
                 libicu-dev,
 -               libqt5opengl5-dev (>= 5.7.1+dfsg~),
 -               libqt5webkit5-dev (>= 5.7.1+dfsg~),
 -               libqt5xmlpatterns5-dev (>= 5.7.1~20161021~),
 +               libqt5opengl5-dev (>= 5.9.0+dfsg~),
 +               libqt5webkit5-dev (>= 5.9.0+dfsg~),
 +               libqt5xmlpatterns5-dev (>= 5.9.0~),
                 libsqlite3-dev,
                 libxslt1-dev,
-                pkg-kde-tools,
 -               qtbase5-dev (>= 5.7.1+dfsg~),
 -               qtdeclarative5-dev (>= 5.7.1~20161021~)
 -Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1+dfsg~),
 -                     qtbase5-doc-html (>= 5.7.1+dfsg~),
 -                     qtdeclarative5-doc-html (>= 5.7.1~20161021~),
 -                     qttools5-dev-tools (>= 5.7.1~20161021~),
 -                     qtwebkit5-doc-html (>= 5.7.1+dfsg~),
 -                     qtxmlpatterns5-doc-html (>= 5.7.1~20161021~)
 +               qtbase5-dev (>= 5.9.0+dfsg~),
 +               qtdeclarative5-dev (>= 5.9.0~)
 +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.0+dfsg~),
 +                     qtbase5-doc-html (>= 5.9.0+dfsg~),
 +                     qtdeclarative5-doc-html (>= 5.9.0~),
 +                     qttools5-dev-tools (>= 5.9.0~),
 +                     qtwebkit5-doc-html (>= 5.9.0+dfsg~),
 +                     qtxmlpatterns5-doc-html (>= 5.9.0~)
  Standards-Version: 3.9.8
  Homepage: http://qt-project.org/
  Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwebkit-examples.git
diff --cc debian/watch
index 0dc6250,16babc0..0f71ecc
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
  version=3
- opts=dversionmangle=s/\+dfsg// \
+ opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
 -https://download.qt.io/community_releases/([\d\.]*)/([\d\.]*)/qtwebkit-examples-opensource-src-([^-]*)\.tar\.xz
 +https://download.qt.io/community_releases/([\d\.]*)/([\d\.]*)-final/qtwebkit-examples-opensource-src-([^-]*)\.tar\.xz

-- 
qtwebkit-examples packaging



More information about the pkg-kde-commits mailing list