rev 15626 - in trunk/packages: akonadi/debian qt-x11-free/debian qt4-x11/debian

Modestas Vainius modax-guest at alioth.debian.org
Tue Aug 11 10:01:17 UTC 2009


Author: modax-guest
Date: 2009-08-11 10:01:17 +0000 (Tue, 11 Aug 2009)
New Revision: 15626

Modified:
   trunk/packages/akonadi/debian/changelog
   trunk/packages/akonadi/debian/control
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
Log:
Build depend on libmysqlclient-dev rather than libmysqlclient15-dev.
Backports friendly as libmysqlclient-dev is a virtual package in lenny.


Modified: trunk/packages/akonadi/debian/changelog
===================================================================
--- trunk/packages/akonadi/debian/changelog	2009-08-11 09:45:26 UTC (rev 15625)
+++ trunk/packages/akonadi/debian/changelog	2009-08-11 10:01:17 UTC (rev 15626)
@@ -1,3 +1,13 @@
+akonadi (1.2.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Build depend on libmysqlclient-dev rather than libmysqlclient15-dev.
+    Backports friendly as libmysqlclient-dev is a virtual package in lenny.
+    (Closes: #541024).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 11 Aug 2009 12:58:10 +0300
+
 akonadi (1.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/akonadi/debian/control
===================================================================
--- trunk/packages/akonadi/debian/control	2009-08-11 09:45:26 UTC (rev 15625)
+++ trunk/packages/akonadi/debian/control	2009-08-11 10:01:17 UTC (rev 15626)
@@ -5,7 +5,7 @@
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modestas at vainius.eu>,
  Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.4),
- libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient15-dev,
+ libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient-dev,
  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
 Standards-Version: 3.8.2
 Homepage: http://pim.kde.org/akonadi

Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2009-08-11 09:45:26 UTC (rev 15625)
+++ trunk/packages/qt-x11-free/debian/changelog	2009-08-11 10:01:17 UTC (rev 15626)
@@ -1,3 +1,9 @@
+qt-x11-free (3:3.3.8b-7) UNRELEASED; urgency=low
+
+  * Build depend on libmysqlclient-dev only. It is virtual package in lenny.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Tue, 11 Aug 2009 12:50:18 +0300
+
 qt-x11-free (3:3.3.8b-6) unstable; urgency=low
 
   * Build with -O1 on sparc as something is broken here. (Closes: #490999)

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2009-08-11 09:45:26 UTC (rev 15625)
+++ trunk/packages/qt-x11-free/debian/control	2009-08-11 10:01:17 UTC (rev 15626)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: debhelper (>= 5.0.31), quilt, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+Build-Depends: debhelper (>= 5.0.31), quilt, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.3

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-08-11 09:45:26 UTC (rev 15625)
+++ trunk/packages/qt4-x11/debian/changelog	2009-08-11 10:01:17 UTC (rev 15626)
@@ -23,8 +23,12 @@
   * Loosen requirements of the phonon metapackage in the libphonon4 symbols
     file. Too tight dependency causes unnecessary complications installing
     build dependencies on arches which lag behind on Qt4 builds.
+  * Build depend on libmysqlclient-dev rather than libmysqlclient15-dev.
+    Backports friendly as libmysqlclient-dev is a virtual package in lenny.
+  * Likewise, make libqt4-dev suggest libmysqlclient-dev rather than
+    libmysqlclient15-dev.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 21 Jul 2009 22:35:31 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 11 Aug 2009 12:57:45 +0300
 
 qt4-x11 (4:4.5.2-1) unstable; urgency=low
 

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2009-08-11 09:45:26 UTC (rev 15625)
+++ trunk/packages/qt4-x11/debian/control	2009-08-11 10:01:17 UTC (rev 15626)
@@ -8,7 +8,7 @@
  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,
- libmysqlclient15-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev,
+ libmysqlclient-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev,
  libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev,
  libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev,
  libxmu-dev, libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev,
@@ -362,7 +362,7 @@
 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, libmysqlclient15-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, libiodbc2-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.




More information about the pkg-kde-commits mailing list