[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-12-g6b365ae

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Feb 2 21:24:30 UTC 2015


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

The following commit has been merged in the experimental branch:
commit 6b365ae1da782e02b364502dd45e9830d0c81eb8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 2 18:24:12 2015 -0300

    Change LDFLAGS for LFLAGS in debian/rules
    
    Thanks Sune for the pointer.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e413af5..022f1fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ 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.
 
   [ Dmitry Shachnev ]
   * Drop private marks from QCollator and QOpenGLWidget symbols.
diff --git a/debian/rules b/debian/rules
index 74edea8..84f4dc8 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 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export LFLAGS := $(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



More information about the pkg-kde-commits mailing list