[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-5-g2f38feb

Timo Jyrinki timo at alioth.debian.org
Fri Jan 25 06:39:08 UTC 2013


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

The following commit has been merged in the qt5 branch:
commit 2f38feb2f877fa26d484f2a49f6946b5754f2b9b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Jan 25 06:38:13 2013 +0000

    Depend on system jpeg/png for decoding instead of QImageDecoder usage.
---
 debian/changelog |    1 +
 debian/control   |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67cbdb3..ec6f3fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit-opensource-src (5.0.0-1) UNRELEASED; urgency=low
   * debian/control:
     - Add missing Pre-Depends for xz compression
     - Rename packages by appending the major version
+    - Depend on system png/jpeg libraries
   * debian/*.install:
     - Adjust to the new version and library renames
   * debian/rules:
diff --git a/debian/control b/debian/control
index c78df34..ba3def5 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,8 @@ Build-Depends: debhelper (>= 9.0.0),
                pkg-config,
                pkg-kde-tools (>= 0.6.4),
                chrpath,
+               libpng12-dev,
+               libjpeg-dev,
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list