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

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

The following commit has been merged in the master branch:
commit 12d8b2963f64f5ce5f7f310fc22914d0ffc4f826
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue May 29 00:54:33 2012 +0200

    Use DEB_LDFLAGS_MAINT_APPEND.

diff --git a/debian/changelog b/debian/changelog
index dd04fb9..e5097a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ virtuoso-opensource (6.1.5+dfsg2-1) UNRELEASED; urgency=low
     - update repack-zlib.patch.
     - refresh other patches in order to make them apply without any offset.
     - add ignore-netstat-failure.patch, to avoid FTBFS on various
-      architectures, including kfreebsd-*, thanks to Steven Chamberlain.
+      architectures, thanks to Steven Chamberlain (Closes: #663010).
   * Bump debhelper compatibility level to 9.
+  * 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..a1f9190 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,9 @@ ifeq ($(DEB_BUILD_ARCH),alpha)
 		EXTRA_LDFLAGS += -Wl,--no-relax
 endif
 
+DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)"
+
 DEB_CONFIGURE_SCRIPT_ENV += \
-		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)" \
 		MONO_DISABLE_SHM=1 \
         DEBIANPKG=virtuoso-opensource-6.1
 

-- 
Git repository for pkg-virtuoso