[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-31-gc6d25e1

[José Manuel Santamar?==?UTF-8?Q?ía Lema]

The following commit has been merged in the master branch:
commit 4b668ce4f6aea207ac2b1527f5ed85c91235bad6
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue May 29 15:41:50 2012 +0200

    Amend LDFLAGS handling.

diff --git a/debian/changelog b/debian/changelog
index e783216..094b7b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,12 @@ virtuoso-opensource (6.1.5+dfsg2-0r0) UNRELEASED; urgency=low
     - add ignore-netstat-failure.patch, to avoid FTBFS on various
       architectures, thanks to Steven Chamberlain (Closes: #663010).
   * Bump debhelper compatibility level to 9.
+  * Build also with LDFLAGS provided by dpkg-buildflags Doing this with the
+    debhelper compatibility level set to 9 should enable all the default
+    hardening flags.
   * Bump Standards-Version to 3.9.3:
     - moved virtuoso-opensource, virtuoso-server and virtuoso-minimal to the
       new "metapackages" section.
-  * Use DEB_LDFLAGS_MAINT_APPEND to add custom flags instead of passing them
-    directly to the configure script. Doing this with the debhelper
-    compatibility level set to 9 should enable the default hardening flags.
   * Fix a bug in the init script, now uses start-stop-daemon with "--user",
     this makes the script work when you are running it under Plasma (the KDE
     workspace) with Nepomuk, which may already execute a /usr/bin/virtuoso-t
diff --git a/debian/rules b/debian/rules
index 26edaa4..978e127 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ ifeq ($(DEB_BUILD_ARCH),alpha)
 		EXTRA_LDFLAGS += -Wl,--no-relax
 endif
 
+EXTRA_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+
 DEB_CONFIGURE_SCRIPT_ENV += \
 		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)" \
 		MONO_DISABLE_SHM=1 \

-- 
Git repository for pkg-virtuoso