[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-2-8-gc973aa9

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


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

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

diff --git a/debian/changelog b/debian/changelog
index 5b8ddcb..7c83511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ qt4-x11 (4:4.7.3-3) UNRELEASED; urgency=low
     - Take_Xft.hintstyle_by_default_to_match_the_behavior_of_GTK+.patch
     - Fix_fontconfig_usage_in_X11_font_database.patch
 
+  [ Pino Toscano ]
+  * Use wildcard architectures:
+    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 20 Jun 2011 15:29:58 +0300
 
 qt4-x11 (4:4.7.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8c70428..c0de13b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.4.13),
                freetds-dev,
                g++ (>= 4:4.5) [s390],
                g++-4.6 (>= 4.6.0-7~) [armel],
-               libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
+               libasound2-dev [linux-any],
                libaudio-dev,
                libcups2-dev,
                libdbus-1-dev,

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list