rev 19450 - kde-extras/digikam/trunk/debian

[Pino Toscano]

Author: pino
Date: 2013-04-07 13:45:47 +0000 (Sun, 07 Apr 2013)
New Revision: 19450

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/rules
Log:
append our LDFLAGS using dpkg-buildflags' facilities


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-07 12:57:24 UTC (rev 19449)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-07 13:45:47 UTC (rev 19450)
@@ -41,6 +41,7 @@
     conflicts according to it.
   * Recommend ffmpegthumbs before mplayerthumbs in digikam (just like what
     kdemultimedia does). (Closes: #629481)
+  * Append our LDFLAGS using dpkg-buildflags' facilities.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 07 Apr 2013 01:21:20 +0200
 

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-07 12:57:24 UTC (rev 19449)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-07 13:45:47 UTC (rev 19450)
@@ -2,6 +2,7 @@
 
 USE_PRIVATE_KDEGRAPHICS := y
 PRIVATE_LIBDIR := /usr/lib/digikam
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 ifeq ($(USE_PRIVATE_KDEGRAPHICS),y)
   EXTRA_CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=ON
@@ -16,7 +17,7 @@
 # : Force to use local libkipi, libkexiv2, and libkdcraw implementation
 
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde \
+	dh_auto_configure --buildsystem=kde \
                 -- -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on $(EXTRA_CMAKE_ARGS)
 
 override_dh_auto_install: