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

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 5162add935af2d92c853645e1bd358f6855aaf27
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Jun 25 12:29:46 2015 -0500

    Revert "Switch LDFLAGS to LFLAGS in debian/rules."
    
    LFLAGS don't exist in Debian
    
    This reverts commit b6958d92ad75aec39195f56d6dcb2c21162a2dd0.
---
 debian/changelog | 3 ---
 debian/rules     | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64b4f4a..71ac8d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 qtcreator (3.4.1+dfsg-1) 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.
 
   [ Adam Majer ]
   * New upstream release
diff --git a/debian/rules b/debian/rules
index b5329f0..b4bf708 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,13 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-export LFLAGS := $(shell dpkg-buildflags --get LFLAGS) -Wl,--as-needed
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QMAKE_CFLAGS_RELEASE := $(CFLAGS)
 export QMAKE_CFLAGS_DEBUG := $(CFLAGS)
 export QMAKE_CXXFLAGS_RELEASE := $(CXXFLAGS)
 export QMAKE_CXXFLAGS_DEBUG := $(CXXFLAGS)
-export QMAKE_LFLAGS_RELEASE := $(LFLAGS)
-export QMAKE_LFLAGS_DEBUG := $(LFLAGS)
+export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
+export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt5
 
 # Upstream changelog

-- 
qtcreator packaging