[med-svn] [kmc] 01/02: incorporate patch from Ubuntu

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch master
in repository kmc.

commit fbcfdbc63265dd5055f919422fd2cae7f3b62a72
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Mar 29 20:31:23 2016 +0000

    incorporate patch from Ubuntu
---
 debian/changelog                                             |  7 +++++++
 .../0007-Use-standard-compiler-environment-variables.patch   | 12 +++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d31562..d7c1a9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kmc (2.3+dfsg-4) unstable; urgency=low
+
+  * Move LDFLAGS to end of linker call.
+    Thanks to Steve Langasek for the patch (from Ubuntu).
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Tue, 29 Mar 2016 20:28:59 +0000
+
 kmc (2.3+dfsg-3) unstable; urgency=medium
 
   * Switch to asciidoctor for reproducible man page building.
diff --git a/debian/patches/0007-Use-standard-compiler-environment-variables.patch b/debian/patches/0007-Use-standard-compiler-environment-variables.patch
index 740cf8a..927079f 100644
--- a/debian/patches/0007-Use-standard-compiler-environment-variables.patch
+++ b/debian/patches/0007-Use-standard-compiler-environment-variables.patch
@@ -7,8 +7,10 @@ From: Kevin Murray <spam at kdmurray.id.au>
  makefile | 22 ++++++++--------------
  1 file changed, 8 insertions(+), 14 deletions(-)
 
---- a/makefile
-+++ b/makefile
+Index: kmc-2.3+dfsg/makefile
+===================================================================
+--- kmc-2.3+dfsg.orig/makefile
++++ kmc-2.3+dfsg/makefile
 @@ -6,14 +6,11 @@
  KMC_DUMP_DIR = kmc_dump
  KMC_TOOLS_DIR = kmc_tools
@@ -50,17 +52,17 @@ From: Kevin Murray <spam at kdmurray.id.au>
  kmc: $(KMC_OBJS)
  	-mkdir -p $(KMC_BIN_DIR)
 -	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
-+	$(CXX) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
++	$(CXX) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
 +
  kmc_dump: $(KMC_DUMP_OBJS) $(KMC_API_OBJS)
  	-mkdir -p $(KMC_BIN_DIR)
 -	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
-+	$(CXX) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
++	$(CXX) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
  
  kmc_tools: $(KMC_TOOLS_OBJS) $(KMC_API_OBJS)
  	-mkdir -p $(KMC_BIN_DIR)
 -	$(CC) $(LDFLAGS) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^
-+	$(CXX) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
++	$(CXX) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
  
  libkmc.a: $(KMC_API_OBJS)
  	ar rcs $@ $^

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/kmc.git