[SCM] qtcreator packaging branch, experimental, updated. debian/3.2.1+dfsg-2-3-g5135955

[Adam Majer]

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

The following commit has been merged in the experimental branch:
commit 51359552f9c8b74eccd89df6b52e81a8acc901a2
Merge: 0daea849595a868a09c5c68910711a84c6a1a81b 91366a6b294e42ceded027579d39be685c318651
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Sep 23 11:37:13 2014 -0500

    Merge branch 'experimental' of ssh://git.debian.org/~/qt-creator into experimantal
    
    Conflicts:
    	debian/changelog

 debian/README.source |  3 +++
 debian/changelog     | 10 ++++++++++
 debian/control       | 10 +++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index f5b445d,713306c..60d7c43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
 -qtcreator (3.2.1+dfsg-2) UNRELEASED; urgency=medium
++qtcreator (3.2.1+dfsg-3) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Add +dfsg to the versioned build dependencies that require them. This
+     helps backporting packages.
+   * Add a note on Readme.source noting that the JQuery minified libraries
+     where replaced with Debian's unminified ones.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Sep 2014 00:16:05 -0300
+ 
 +qtcreator (3.2.1+dfsg-2) experimental; urgency=medium
 +
 +  * Add missing build dependency on libxext-dev (QTBUG-41454)
 +
 + -- Adam Majer <adamm at zombino.com>  Sat, 20 Sep 2014 19:05:56 -0500
 +
  qtcreator (3.2.1+dfsg-1) experimental; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 7269085,7b82c3c..6483b0c
--- a/debian/control
+++ b/debian/control
@@@ -10,16 -10,15 +10,16 @@@ Build-Depends: debhelper (>= 9)
                 libbotan1.10-dev,
                 libicu-dev,
                 libjs-jquery,
-                libqt5opengl5-dev (>= 5.3.2~),
-                libqt5sql5-sqlite (>= 5.3.2~),
-                libqt5webkit5-dev (>= 5.3.2~),
+                libqt5opengl5-dev (>= 5.3.2+dfsg~),
+                libqt5sql5-sqlite (>= 5.3.2+dfsg~),
+                libqt5webkit5-dev (>= 5.3.2+dfsg~),
                 libqt5x11extras5-dev (>= 5.3.2~),
                 libx11-dev,
 +               libxext-dev,
                 pkg-config,
                 qml-module-qtquick2 (>= 5.3.2~),
-                qtbase5-dev (>= 5.3.2~),
-                qtbase5-private-dev (>= 5.3.2~),
+                qtbase5-dev (>= 5.3.2+dfsg~),
+                qtbase5-private-dev (>= 5.3.2+dfsg~),
                 qtdeclarative5-dev (>= 5.3.2~),
                 qtdeclarative5-private-dev (>= 5.3.2~),
                 qtquick1-5-dev (>= 5.3.2~),

-- 
qtcreator packaging