[Pkg-wmaker-commits] [wmclockmon.git] 16/31: debian/patches/update_autotools.patch: Fixes to work with dh_autoreconf.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmclockmon.git.

commit 46c77dd403c28e920dbe482ad77a9f5c6fdc402a
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Wed Jan 27 23:50:57 2016 -0500

    debian/patches/update_autotools.patch: Fixes to work with dh_autoreconf.
    
    In particular, define the DATADIR macro, previously defined in Makefile.in
    and overwritten by dh_autoreconf, and specify wmcalcmon_cal_SOURCES instead
    of wmcalcmon_SOURCES.  Both caused FTBFS's.
---
 debian/patches/series                 |  1 +
 debian/patches/update_autotools.patch | 42 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 03e6f76..787d441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kfreebsd_build.patch
+update_autotools.patch
diff --git a/debian/patches/update_autotools.patch b/debian/patches/update_autotools.patch
new file mode 100644
index 0000000..ae723f4
--- /dev/null
+++ b/debian/patches/update_autotools.patch
@@ -0,0 +1,42 @@
+Description: Update autotools files to work with dh_autoreconf.
+ Prior to version 0.8.1-3, many of the patches were applied directly to
+ the various Makefile.in's.  Now with dh_autoreconf, these would be
+ overwritten.
+ .
+ In particular, we define the DATADIR macro and make sure that the auxiliary
+ programs wmclockmon-cal and wmclockmon-config are built properly.
+Author: Doug Torrance <dtorrance at piedmont.edu>
+Last-Update: 2016-01-28
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,6 +15,8 @@
+ 
+ CPPFLAGS = @CPPFLAGS@ @DFLAGS@
+ 
++AM_CPPFLAGS = -DDATADIR="\"$(pkgdatadir)\""
++
+ INCLUDES = @HEADER_SEARCH_PATH@
+ 
+ wmclockmon_LDADD = @LIBRARY_SEARCH_PATH@ @XLIBS@
+--- a/wmclockmon-cal/Makefile.am
++++ b/wmclockmon-cal/Makefile.am
+@@ -1,6 +1,6 @@
+ bin_PROGRAMS = wmclockmon-cal
+ 
+-wmclockmon_SOURCES =   \
++wmclockmon_cal_SOURCES =   \
+ 	defines.h \
+ 	main.c \
+ 	main.h \
+--- a/wmclockmon-config/Makefile.am
++++ b/wmclockmon-config/Makefile.am
+@@ -1,6 +1,6 @@
+-bin_PROGRAMS = wmclockmon
++bin_PROGRAMS = wmclockmon-config
+ 
+-wmclockmon_SOURCES =   \
++wmclockmon_config_SOURCES =   \
+ 	actions.c \
+ 	actions.h \
+ 	configfile.h \

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