[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 782f17066a164621c52d89ad5ba1cf124cb6a661
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Aug 28 00:11:26 2014 -0300

    No-op wrap-and-sort.
---
 debian/control                             |  6 +++---
 debian/copyright                           | 24 ++++++++++++------------
 debian/libqtwebkit-dev.install             |  2 +-
 debian/libqtwebkit-qmlwebkitplugin.install |  2 +-
 debian/libqtwebkit4.install                |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 7fe0ab9..0bbd241 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: bison,
+               debhelper (>= 9),
                flex,
-               bison,
                gperf,
-               libjpeg-dev,
                libfontconfig-dev,
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
                libicu-dev,
+               libjpeg-dev,
                libqt4-dev (>= 4:4.8.1),
                libqt4-opengl-dev (>= 4:4.8.1),
                libsqlite3-dev,
diff --git a/debian/copyright b/debian/copyright
index 386410c..c575cd3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12401,21 +12401,21 @@ License: Mixed MIT + BSD
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  .
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
  are met:
  .
-    Redistributions of source code must retain the above copyright 
+    Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
     Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in 
+    notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the distribution.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
@@ -12580,7 +12580,7 @@ License: LGPL-2+
 Files: Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeArithmeticNEON.h
 Copyright: 2011 University of Szeged
            2011 Felician Marton
-License: BSD-2-clause 
+License: BSD-2-clause
 
 Files: Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
  Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.h
@@ -12768,7 +12768,7 @@ Copyright: 2004-2010 Leonard Richardson
 License: BSD-3-clause
 
 Files: Source/WebKit/gtk/webkit/webkitapplicationcache.cpp Source/WebKit/gtk/webkit/webkitapplicationcache.h Source/WebKit/gtk/tests/testapplicationcache.c
-Copyright: 2009 Jan Michael Alonzo 
+Copyright: 2009 Jan Michael Alonzo
            2011 Lukasz Slachciak
 License: LGPL-2+
 
@@ -12805,7 +12805,7 @@ Files: Tools/DumpRenderTree/chromium/DRTTestRunner.cpp
  Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
  Tools/DumpRenderTree/chromium/TestRunner/src/CppBoundClass.h
  Tools/DumpRenderTree/chromium/TestRunner/src/CppBoundClass.cpp
-Copyright: 2010 Google Inc. 
+Copyright: 2010 Google Inc.
            2009-2010 Pawel Hajdan
            2012 Apple Inc.
 License: BSD-3-clause
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
index cf40e20..3a733d4 100644
--- a/debian/libqtwebkit-dev.install
+++ b/debian/libqtwebkit-dev.install
@@ -43,4 +43,4 @@ usr/include/qt4/QtWebKit/qwebview.h
 usr/lib/*/libQtWebKit.prl
 usr/lib/*/libQtWebKit.so
 usr/lib/*/pkgconfig/QtWebKit.pc
-usr/share/qt4/mkspecs/modules/qt_webkit.pri
\ No newline at end of file
+usr/share/qt4/mkspecs/modules/qt_webkit.pri
diff --git a/debian/libqtwebkit-qmlwebkitplugin.install b/debian/libqtwebkit-qmlwebkitplugin.install
index 0bb1955..bbc8855 100644
--- a/debian/libqtwebkit-qmlwebkitplugin.install
+++ b/debian/libqtwebkit-qmlwebkitplugin.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt4/imports/QtWebKit/qmldir
 usr/lib/*/qt4/imports/QtWebKit/libqmlwebkitplugin.so
+usr/lib/*/qt4/imports/QtWebKit/qmldir
diff --git a/debian/libqtwebkit4.install b/debian/libqtwebkit4.install
index 0d95f13..552361c 100644
--- a/debian/libqtwebkit4.install
+++ b/debian/libqtwebkit4.install
@@ -1,3 +1,3 @@
 usr/lib/*/libQtWebKit.so.4
 usr/lib/*/libQtWebKit.so.4.10
-usr/lib/*/libQtWebKit.so.4.10.2
\ No newline at end of file
+usr/lib/*/libQtWebKit.so.4.10.2

-- 
QtWebKit packaging