diff options
author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-04-07 09:30:33 -0300 |
---|---|---|
committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-04-07 09:30:33 -0300 |
commit | b3c4e7ef60797a21508d0ea98ff30cf64c15e65a (patch) | |
tree | 27f7255a0f16821d952a9c0d622c105cc5dfdc71 | |
parent | ce4a75910ea2a4c48f7ab6dbb762e405ca5e91a1 (diff) | |
download | qt5webkit-b3c4e7ef60797a21508d0ea98ff30cf64c15e65a.tar.gz |
No-op wrap-and-sort.
-rw-r--r-- | debian/control | 50 | ||||
-rw-r--r-- | debian/copyright | 24 |
2 files changed, 36 insertions, 38 deletions
diff --git a/debian/control b/debian/control index 06983d9..9f5335c 100644 --- a/debian/control +++ b/debian/control @@ -4,40 +4,39 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Fathi Boudra <fabo@debian.org>, Timo Jyrinki <timo@debian.org>, Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> -Build-Depends: debhelper (>= 9.0.0), +Build-Depends: bison, + chrpath, + debhelper (>= 9.0.0), flex, - bison, gperf, - python-minimal, - python2.7, - ruby, - libgstreamer0.10-dev, - libgstreamer-plugins-base0.10-dev, - libicu-dev, - libsqlite3-dev, - libxml2-dev, - mesa-common-dev, + libfontconfig1-dev, libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf], libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf], libglib2.0-dev, libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf], + libgstreamer-plugins-base0.10-dev, + libgstreamer0.10-dev, + libicu-dev, + libjpeg-dev, + libpng-dev, + libqt5opengl5-dev (>= 5.2.1+dfsg~), + libqt5xmlpatterns5-private-dev (>= 5.2.1~), + libsqlite3-dev, + libwebp-dev, + libxcomposite-dev, + libxml2-dev, libxrender-dev, libxslt1-dev, - libqt5xmlpatterns5-private-dev (>= 5.2.1~), - qtbase5-private-dev (>= 5.2.1+dfsg~), - libqt5opengl5-dev (>= 5.2.1+dfsg~), - qtscript5-private-dev (>= 5.2.1~), - qtdeclarative5-private-dev (>= 5.2.1~), + mesa-common-dev, pkg-config, pkg-kde-tools (>= 0.6.4), - chrpath, - libpng-dev, - libjpeg-dev, - libfontconfig1-dev, - libwebp-dev, - libxcomposite-dev -Build-Depends-Indep: libqt5sql5-sqlite, - qttools5-dev-tools (>= 5.2.1~) + python-minimal, + python2.7, + qtbase5-private-dev (>= 5.2.1+dfsg~), + qtdeclarative5-private-dev (>= 5.2.1~), + qtscript5-private-dev (>= 5.2.1~), + ruby +Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~) Standards-Version: 3.9.5 Section: libs Homepage: http://trac.webkit.org/wiki/QtWebKit @@ -73,7 +72,7 @@ Description: Web content engine library for Qt Package: libqt5webkit5-qmlwebkitplugin Architecture: all Section: oldlibs -Depends: ${misc:Depends}, qml-module-qtwebkit +Depends: qml-module-qtwebkit, ${misc:Depends} Description: transitional dummy package for Qt WebKit QML module QtWebKit provides a Web browser engine that makes it easy to embed content from the World Wide Web into your Qt application. @@ -93,7 +92,6 @@ Description: Qt WebKit QML module . This package contains the WebKit QML module for QtDeclarative. - Package: libqt5webkit5-dbg Priority: extra Architecture: amd64 i386 powerpc s390x diff --git a/debian/copyright b/debian/copyright index 601c316..f2c7d84 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12403,21 +12403,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 @@ -12582,7 +12582,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 @@ -12770,7 +12770,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+ @@ -12807,7 +12807,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 |