[SCM] Qt 4 Debian packaging. branch, master, updated. debian/4.5.2-2-9-ga27a7c7

Fathi Boudra fabo at alioth.debian.org
Fri Oct 2 13:46:25 UTC 2009


The following commit has been merged in the master branch:
commit 5adf73ad011a363df24c174e21fec565a7eaa0dd
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Oct 2 15:41:59 2009 +0200

    Switch from iodbc to unixodbc. (Closes: #548976)
---
 debian/changelog |    2 ++
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a897c8..07a7515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low
     - 0286-fix-error-string - Merged upstream.
     - 0287-attempt-to-fix-header-installation-for-phonon - Merged upstream.
     - 06_CVE-2009-1725 - Merged upstream.
+  * Update debian/control:
+    - Switch from iodbc to unixodbc. (Closes: #548976)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Sep 2009 15:27:39 +0200
 
diff --git a/debian/control b/debian/control
index b866ccc..57e95d8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-kde-tools (>= 0.4), flex, shar
  firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc],
  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, libiodbc2-dev, libjpeg62-dev, libmng-dev,
+ libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg62-dev, libmng-dev,
  libmysqlclient-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev,
  libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev,
  libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev,
@@ -362,7 +362,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, libiodbc2-dev, firebird2.0-dev
+Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.0-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