[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.0+dfsg1-1-18-g21884f9
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Thu Feb 20 23:41:35 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=ffa5738
The following commit has been merged in the experimental branch:
commit ffa5738eea3aa48864614751c10dcb1868d9def6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Thu Feb 20 20:38:06 2014 -0300
Revert "No-op wrap-and-sort."
This reverts commit e00820ee8ac9d6ffc8e042283efe0c6a9c98da7b.
---
debian/control | 51 +++++++++++++++++++++++++++------------------------
debian/copyright | 24 ++++++++++++------------
2 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index 9dd1fb1..5c9a981 100644
--- a/debian/control
+++ b/debian/control
@@ -4,39 +4,40 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>,
Timo Jyrinki <timo at debian.org>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Build-Depends: bison,
- chrpath,
- debhelper (>= 9.0.0),
+Build-Depends: debhelper (>= 9.0.0),
flex,
+ bison,
gperf,
- 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],
+ python-minimal,
+ python2.7,
+ ruby,
+ libgstreamer0.10-dev,
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,
+ mesa-common-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],
libxrender-dev,
libxslt1-dev,
- mesa-common-dev,
- pkg-config,
- pkg-kde-tools (>= 0.6.4),
- python-minimal,
- python2.7,
+ libqt5xmlpatterns5-private-dev (>= 5.2.1~),
qtbase5-private-dev (>= 5.2.1+dfsg~),
- qtdeclarative5-private-dev (>= 5.2.1~),
+ libqt5opengl5-dev (>= 5.2.1+dfsg~),
qtscript5-private-dev (>= 5.2.1~),
- ruby
-Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~)
+ qtdeclarative5-private-dev (>= 5.2.1~),
+ 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~)
Standards-Version: 3.9.5
Section: libs
Homepage: http://trac.webkit.org/wiki/QtWebKit
@@ -47,7 +48,9 @@ Package: libqt5webkit5-dev
Section: libdevel
Architecture: any
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libqt5webkit5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
+Depends: qtbase5-dev,
+ libqt5webkit5 (= ${binary:Version}),
+ ${misc:Depends},
Description: Web content engine library for Qt - development files
QtWebKit provides a Web browser engine that makes it easy to embed content
from the World Wide Web into your Qt application.
diff --git a/debian/copyright b/debian/copyright
index f2c7d84..601c316 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
--
qt5webkit packaging
More information about the pkg-kde-commits
mailing list