[SCM] qt5webkit packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-4ubuntu1-8-gcd6c2cf

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Dec 23 10:13:09 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 3ab960300c143c9e70218b6c2f361ab2c046df99
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 25 15:31:13 2016 +0300

    Fix a Lintian warning about space in license name.
    
    (cherry picked from commit d8af942c60490db7bd3d58df378aa3638383b413)
---
 debian/changelog | 1 +
 debian/copyright | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b366040..4c06c64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit-opensource-src (5.6.1+dfsg-5ubuntu1) UNRELEASED; urgency=medium
   * Re-enable WebP, it is in main since Trusty (LP: #1652166).
   * Drop debian/patches/fix_pthread_linking.diff, it was applied upstream
     in 5.6.1 and wrongly rebased in 5.6.1+dfsg-1 upload.
+  * Fix a Lintian warning about space in license name.
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Fri, 23 Dec 2016 13:00:54 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 9cf52d8..f692827 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12353,7 +12353,7 @@ License: BSD-2-clause
 Files: Source/ThirdParty/qunit/qunit/qunit.js
 Copyright: 2008 Ariel Flesler
            2011 John Resig, Jörn Zaefferer
-License: Mixed MIT + BSD
+License: mixed-MIT-BSD
  Copyright 2013 jQuery Foundation and other contributors
  http://jquery.com/
  .

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list