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

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


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

The following commit has been merged in the master branch:
commit b6958d92ad75aec39195f56d6dcb2c21162a2dd0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 2 18:30:50 2015 -0300

    Switch LDFLAGS to LFLAGS in debian/rules.
---
 debian/changelog | 3 +++
 debian/rules     | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1538dd..3568c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 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
 
diff --git a/debian/rules b/debian/rules
index b4bf708..b5329f0 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 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export LFLAGS := $(shell dpkg-buildflags --get LFLAGS) -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 := $(LDFLAGS)
-export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
+export QMAKE_LFLAGS_RELEASE := $(LFLAGS)
+export QMAKE_LFLAGS_DEBUG := $(LFLAGS)
 export QT_SELECT := qt5
 
 # Upstream changelog

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list