[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-2-g4d4186f

Pino Toscano pino-guest at alioth.debian.org
Tue Jun 21 10:54:53 UTC 2011


The following commit has been merged in the master branch:
commit 4d4186fa0114e5a229ae19598a6512c9e4bce271
Author: Pino Toscano <pino at kde.org>
Date:   Tue Jun 21 12:54:35 2011 +0200

    use wildcard architectures
    
    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
    - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
---
 debian/changelog |    4 ++++
 debian/control   |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aaddee5..d43d441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit (2.1.0~2011week13-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Use wildcard architectures:
+    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
+    - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 21 Jun 2011 12:52:21 +0200
 
diff --git a/debian/control b/debian/control
index 1562bf9..23b1d4b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,14 @@ Uploaders: Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 7.4.15),
                gperf,
                libicu-dev,
-               libphonon-dev [kfreebsd-amd64 kfreebsd-i386 hurd-i386],
+               libphonon-dev [!linux-any],
                libqt4-dev (>= 4:4.7.0),
                libqt4-opengl-dev (>= 4:4.7.0),
                libsqlite3-dev,
                libxext-dev,
                libxrender-dev,
                pkg-kde-tools (>= 0.6.4),
-               qtmobility-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
+               qtmobility-dev [linux-any]
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list