[SCM] qtbase packaging branch, experimental, updated. debian/5.3.1+dfsg-5-18-gbd93c74

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=bd93c74

The following commit has been merged in the experimental branch:
commit bd93c743e6389c6f308ed32716836c47b50e10a4
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Sep 16 13:36:06 2014 -0300

    Build conflict against libmariadbclient-dev.
    
    Until the fix for #759309 enters unstable.
---
 debian/changelog | 4 +++-
 debian/control   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9f91ae8..ed8a4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtbase-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.3.2+dfsg-1) experimental; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update my e-mail address.
@@ -18,6 +18,8 @@ qtbase-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium
     there is no usage of them by grepping the code.
   * Update install files.
   * Update symbols files with buildds' and current logs.
+  * Build conflict against libmariadbclient-dev until the fix for #759309
+    enters unstable.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 14:58:47 +0400
 
diff --git a/debian/control b/debian/control
index 2c218c4..8b98e28 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Build-Depends: debhelper (>= 9),
                pkg-kde-tools (>= 0.14.2),
                unixodbc-dev,
                zlib1g-dev
+Build-Conflicts: libmariadbclient-dev
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git

-- 
qtbase packaging