[hamradio-commits] [gsmc] 01/02: New revision; Merged fix-ld-as-needed.patch from Ubuntu

[Iain R. Learmonth]

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

irl pushed a commit to branch master
in repository gsmc.

commit d7ebf49918e385f3fd0364329bac2e584b31fa8b
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sat Aug 15 16:39:56 2015 +0100

    New revision; Merged fix-ld-as-needed.patch from Ubuntu
---
 debian/changelog                                              |  7 +++++++
 .../{add-lm-to-ldflags.patch => fix-ld-as-needed.patch}       | 11 ++++-------
 debian/patches/series                                         |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e923e1..a1f5ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gsmc (1.1-3) UNRELEASED; urgency=medium
+
+  * Replaced add-lm-to-ldflags.patch with fix-ld-as-needed.diff from
+    Ubuntu (Closes: #795426)
+
+ -- Iain R. Learmonth <irl at debian.org>  Sat, 15 Aug 2015 16:34:04 +0100
+
 gsmc (1.1-2) unstable; urgency=medium
 
   * Acknowledge NMUs
diff --git a/debian/patches/add-lm-to-ldflags.patch b/debian/patches/fix-ld-as-needed.patch
similarity index 65%
rename from debian/patches/add-lm-to-ldflags.patch
rename to debian/patches/fix-ld-as-needed.patch
index 52be162..c0888a2 100644
--- a/debian/patches/add-lm-to-ldflags.patch
+++ b/debian/patches/fix-ld-as-needed.patch
@@ -1,14 +1,11 @@
-Description: Add -lm to the LDFLAGS
-Author: Iain R. Learmonth <irl at fsfe.org>
-Last-Update: 2015-08-11
-
 --- gsmc.orig/Makefile.am
 +++ gsmc/Makefile.am
-@@ -4,6 +4,7 @@
+@@ -3,7 +3,7 @@
+ bin_PROGRAMS=gsmc
  gsmc_SOURCES= autotune.c calc.c dataconv.c draw.c main.c print.c widget.c autotune.h calc.h dataconv.h draw.h main.h print.h widget.h
  INCLUDES=@PACKAGE_CFLAGS@
- LIBS=@PACKAGE_LIBS@
-+LDFLAGS=@LDFLAGS@ -lm
+-LIBS=@PACKAGE_LIBS@
++LIBS=@PACKAGE_LIBS@ -lm
  
  EXTRA_DIST=gsmc.1.in gtkrc TODO
 -man_MANS=gsmc.1
diff --git a/debian/patches/series b/debian/patches/series
index 050973b..cbe5fdb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
+fix-ld-as-needed.patch
 allow-pkg_lib-macro.patch
-add-lm-to-ldflags.patch
 fix-spelling-errors.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gsmc.git