[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-25-g199b71b

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit d2ba20529583b3c9d45f09d217df064d8b2c8960
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 9 15:12:57 2015 -0300

    Revert "Change LDFLAGS for LFLAGS in debian/rules"
    
    This reverts commit 6b365ae1da782e02b364502dd45e9830d0c81eb8.
    
    I don't know what qmake is doing, but we need LDFLAGS.
---
 debian/changelog | 2 --
 debian/rules     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5442d91..f4d5425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,6 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add a note for packagers in qtbase5-dev and qt5-default's long
     descriptions.
-  * Change LDFLAGS for LFLAGS in debian/rules. Thanks Sune Vuorela for the
-    pointer.
   * Remove libopenvg1-mesa-dev as a build dependency because mesa does not
     builds it anymore (Closes: #777341).
     Thanks Andreas Beckmann for the report.
diff --git a/debian/rules b/debian/rules
index 84f4dc8..74edea8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 export PATH := $(PATH):$(shell pwd)/bin
 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 LDFLAGS) -Wl,--as-needed
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 # Library package list for override_dh_makeshlibs, excludes -dev -dbg
 pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))

-- 
qtbase packaging