[SCM] qtcreator packaging branch, master, updated. debian/3.3.0+dfsg-1-13-gfcb22e1

Adam Majer adamm at moszumanska.debian.org
Fri Jun 26 03:17:14 UTC 2015


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

The following commit has been merged in the master branch:
commit d789de7dac27e6d5f1469e8892336a86870e765d
Merge: 5af113af703808bf75c5ac3fc0457b4bf81fb8af b6958d92ad75aec39195f56d6dcb2c21162a2dd0
Author: Adam Majer <adamm at zombino.com>
Date:   Wed Jun 24 22:59:14 2015 -0500

    Merge branch 'master' of git://anonscm.debian.org/pkg-kde/qt/qtcreator into debian
    
    Conflicts:
    	debian/changelog

 debian/changelog | 8 ++++++++
 debian/rules     | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 870d3f4,3568c53..3d7334c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,11 +1,26 @@@
+ qtcreator (3.3.0+dfsg-2) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Switch LDFLAGS to LFLAGS in debian/rules, as this should be the right flag
+     to use.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Feb 2015 18:29:14 -0300
+ 
 +qtcreator (3.4.0+dfsg~b1-1) experimental; urgency=medium
 +
 +  * New upstream release
 +    + Added support for autocompletion of Qt5 style connect
 +
 + -- Adam Majer <adamm at zombino.com>  Sat, 07 Mar 2015 16:06:47 -0600
 +
 +qtcreator (3.3.1+dfsg-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * Update lists of jquery files updated from original tarball in
 +    README.source
 +
 + -- Adam Majer <adamm at zombino.com>  Tue, 24 Feb 2015 14:31:52 -0600
 +
  qtcreator (3.3.0+dfsg-1) experimental; urgency=medium
  
    * New upstream release

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list