[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-63-g69b7824

Modestas Vainius modax at alioth.debian.org
Thu Feb 11 19:19:14 UTC 2010


The following commit has been merged in the master branch:
commit 69b7824e5c04b4640760eecdb66cc2945becdee7
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Feb 11 21:19:02 2010 +0200

    Build depend on libjpeg-dev rather than libjpeg62-dev.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 012430a..b3bf885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qt4-x11 (4:4.6.1-1) UNRELEASED; urgency=low
     version and upgraded to 4:4.6.1 on amd64/i386.
   * Bump build dependency of pkg-kde-tools to version 0.6 as it is needed to
     handle symbol files.
+  * Build depend on libjpeg-dev rather than libjpeg62-dev.
 
   [ Fathi Boudra ]
   * Add debian/patches/95_sparc_platform_definition.diff patch to fix build for
diff --git a/debian/control b/debian/control
index 5d3127c..e55806d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7.2), quilt, pkg-kde-tools (>= 0.6), flex, sharutil
  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,
+ libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg-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,

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list