[SCM] Qt 4 packaging branch, master, updated. debian/4.7.0-rc1-1-70-g1027d3b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit da2c69cbca708adea070a472a6afe0248ce882be
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 00:20:05 2010 +0200

    Also drop 09_qmake_lflags_as-needed.diff and export LDFLAGS in rules.
    
    configure script supports LDFLAGS nowadays. Drop the patch and export
    appropriate LDFLAGS in debian/rules instead.
---
 debian/changelog                              |    3 +++
 debian/patches/09_qmake_lflags_as-needed.diff |   16 ----------------
 debian/patches/series                         |    1 -
 debian/rules                                  |    1 +
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aeb26c8..6d42186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,9 @@ qt4-x11 (4:4.7.1-0r1) UNRELEASED; urgency=low
       names already;
     - 0209-prevent-qt-mixing.diff - should be dropped;
     - 0216-allow-isystem-for-headers.diff - mac only skip it;
+    - 09_qmake_lflags_as-needed.diff - configure script supports LDFLAGS
+      nowadays. Drop the patch and export appropriate LDFLAGS in debian/rules
+      instead.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
diff --git a/debian/patches/09_qmake_lflags_as-needed.diff b/debian/patches/09_qmake_lflags_as-needed.diff
deleted file mode 100644
index 901a848..0000000
--- a/debian/patches/09_qmake_lflags_as-needed.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-author: Fathi Boudra <fabo at debian.org>
-
-workaround as LDFLAGS isn't honored by configure script.
-Bug reported to Trolltech.
-
---- a/configure
-+++ b/configure
-@@ -650,6 +650,8 @@ mkdir -p "$outpath/config.tests"
- rm -f "$outpath/config.tests/.qmake.cache"
- cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
- 
-+QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
-+
- QMakeVar add styles "cde mac motif plastique cleanlooks windows"
- QMakeVar add decorations "default windows styled"
- QMakeVar add mouse-drivers "pc"
diff --git a/debian/patches/series b/debian/patches/series
index 1c2bfbc..7ca2fb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 01_debian_append_qt4_suffix.diff
 07_trust_dpkg-arch_over_uname-m.diff
 08_configure_quilt_compat.diff
-09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
 11_build_translations.diff
 12_add_nostrip_for_debug_packages.diff
diff --git a/debian/rules b/debian/rules
index 2665acd..284f67c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
+export LDFLAGS := -Wl,--as-needed
 # workaround to use lrelease.
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 # workaround to use qhelpgenerator.

-- 
Qt 4 packaging