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

Fathi Boudra fabo at alioth.debian.org
Mon Jan 11 13:21:48 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit 1707a9433c3426e58e358c3a53ae1ea1b0f369d8
Author: Fathi Boudra <fabo at kde.org>
Date:   Mon Jan 11 14:21:36 2010 +0100

    - build-depend on firebird2.1-dev instead of firebird2.0-dev.
      (Closes: #564683)
    - extend architecture list for firebird2.1-dev.
---
 debian/changelog |    4 ++++
 debian/control   |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7024b9a..599a8ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
   * Add 96_powerpc_no_gc_sections.diff: Don't pass -Wl,--gc-sections on powerpc
     when building libQtWebKit.so; works around a binutils bug that results in a
     segfault. Thanks to Steve Langasek.
+  * Update debian/control:
+    - build-depend on firebird2.1-dev instead of firebird2.0-dev.
+      (Closes: #564683)
+    - extend architecture list for firebird2.1-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
 
diff --git a/debian/control b/debian/control
index bf02638..3ed8118 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc],
+ 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,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
  libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg62-dev, libmng-dev,
@@ -383,7 +383,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
 Recommends: libqt4-opengl-dev (= ${binary:Version})
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
 Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)
-Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.0-dev
+Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.1-dev
 Description: Qt 4 development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list