[SCM] smokekde packaging branch, kde4.7, updated. debian/4.7.1-1-7-g6120a78

Pino Toscano pino at alioth.debian.org
Mon Apr 2 17:21:25 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/smokekde.git;a=commitdiff;h=0021e75

The following commit has been merged in the kde4.7 branch:
commit 0021e75730db9185666dc41536229e8e5df30698
Author: Pino Toscano <pino at debian.org>
Date:   Mon Apr 2 19:16:46 2012 +0200

    use DEB_LDFLAGS_MAINT_APPEND to append out custom LDFLAGS
    
    instead of passing them directly to cmake
---
 debian/changelog |    2 ++
 debian/rules     |    6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc72764..6fbdaa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ smokekde (4:4.7.4-0r1) UNRELEASED; urgency=low
   * Bump debhelper build dependency to >= 9, and compat to 9.
   * Do not manually export CXXFLAGS and LDFLAGS now, since compat v9 does
     that already.
+  * Use DEB_LDFLAGS_MAINT_APPEND to append out custom LDFLAGS, instead of
+    passing them directly to cmake.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Apr 2012 19:08:58 +0200
 
diff --git a/debian/rules b/debian/rules
index 8fbd77a..f4d638a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,7 @@
 pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
 current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-	  -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
-	  -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
-	  -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 override_dh_install:
 	dh_install --list-missing

-- 
smokekde packaging



More information about the pkg-kde-commits mailing list