[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-45-gdc11a87
Fathi Boudra
fabo at alioth.debian.org
Thu Dec 29 09:27:55 UTC 2011
The following commit has been merged in the experimental branch:
commit f4ed65236c2a5cd31effcc546d685e1d9762a8b0
Author: Fathi Boudra <fabo at debian.org>
Date: Thu Dec 29 11:21:10 2011 +0200
Replace LDFLAGS by DEB_LDFLAGS_MAINT_APPEND usage.
---
debian/changelog | 1 +
debian/rules | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5528669..8729404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
- remove -qt-gif configure option - removed upstream.
- use ts-all target. The ts target has been removed.
- call mv-qt4-bin-dbg.sh to move the binaries in qt4-bin-dbg package.
+ - replace LDFLAGS by DEB_LDFLAGS_MAINT_APPEND usage.
* Update debian/*.install files:
- update paths for multiarch.
- headers, translations, qmlplugindump.
diff --git a/debian/rules b/debian/rules
index 2754164..fd762f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
-export LDFLAGS := -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
# workaround to use lrelease.
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
# workaround to use qhelpgenerator.
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list