[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-30-gf685fa6

Fathi Boudra fabo at alioth.debian.org
Sat Jan 30 17:42:54 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit f685fa60ce954aab8c4cdd8016c2c984dc5606ee
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jan 30 18:42:28 2010 +0100

    Don't build-depends on libasound2-dev for GNU/kFreeBSD and GNU/Hurd
    architectures. Thanks to Pino.
---
 debian/changelog |    4 ++++
 debian/control   |    3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cc3f9f..672be65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,10 @@ qt4-x11 (4:4.6.1-1) UNRELEASED; urgency=low
     The only official method for including Phonon headers is <phonon/ClassName>
     or <phonon/classname.h>.
 
+  [ Pino Toscano ]
+  * Update debian/control: Don't build-depends on libasound2-dev for
+    GNU/kFreeBSD and GNU/Hurd architectures.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
 
 qt4-x11 (4:4.6.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 6dee7a1..efe1873 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modax at debian.org>, Sune Vuorela <debian at pusling.com>,
 Build-Depends: debhelper (>= 7.2), quilt, pkg-kde-tools (>= 0.4), flex, sharutils,
  firebird2.1-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc],
- libasound2-dev, libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
+ libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
+ libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
  libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg62-dev, libmng-dev,
  libmysqlclient-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev,

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list