[w-scan] 08/08: Fix LDFLAGS usage in automake files

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository w-scan.

commit 3eb5ab25e9160e58cdc473029bd8050183742728
Author: etobi <git at e-tobi.net>
Date:   Mon Oct 27 21:26:23 2014 +0100

    Fix LDFLAGS usage in automake files
---
 debian/patches/fix_ldflags.patch | 87 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 88 insertions(+)

diff --git a/debian/patches/fix_ldflags.patch b/debian/patches/fix_ldflags.patch
new file mode 100644
index 0000000..12d49bb
--- /dev/null
+++ b/debian/patches/fix_ldflags.patch
@@ -0,0 +1,87 @@
+Index: w-scan/Makefile.am
+===================================================================
+--- w-scan.orig/Makefile.am	2014-10-27 21:30:10.978819304 +0100
++++ w-scan/Makefile.am	2014-10-27 21:34:33.473686259 +0100
+@@ -23,6 +23,6 @@
+ bin_SCRIPTS	= 
+ dist_man_MANS	= doc/w_scan.1
+ EXTRA_DIST	= doc
+-LDFLAGS =  -lrt
++AM_LDFLAGS =  -lrt
+ 
+ AM_CFLAGS = -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter
+Index: w-scan/Makefile.in
+===================================================================
+--- w-scan.orig/Makefile.in	2014-10-27 21:33:58.365837626 +0100
++++ w-scan/Makefile.in	2014-10-27 21:34:33.477686243 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -178,7 +178,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -lrt
++LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -255,6 +255,7 @@
+ bin_SCRIPTS = 
+ dist_man_MANS = doc/w_scan.1
+ EXTRA_DIST = doc
++AM_LDFLAGS = -lrt
+ AM_CFLAGS = -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+@@ -636,7 +637,7 @@
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+-	chmod -R a-w $(distdir); chmod a+w $(distdir)
++	chmod -R a-w $(distdir); chmod u+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+ 	chmod a-w $(distdir)
+Index: w-scan/aclocal.m4
+===================================================================
+--- w-scan.orig/aclocal.m4	2014-10-27 21:33:58.365837626 +0100
++++ w-scan/aclocal.m4	2014-10-27 21:34:33.477686243 +0100
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+@@ -14,8 +14,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+-[m4_warning([this file was generated for autoconf 2.68.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
++[m4_warning([this file was generated for autoconf 2.69.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -38,7 +38,7 @@
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.11.5], [],
++m4_if([$1], [1.11.6], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -54,7 +54,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.5])dnl
++[AM_AUTOMAKE_VERSION([1.11.6])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1b287b5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_ldflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/w-scan.git