[Pkg-sdl-commits] [sdl-stretch] 06/07: Fix for error in the autoreconf phase

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to annotated tag debian/0.3.1-5
in repository sdl-stretch.

commit d8131c5a966fc9805688fe619dd678e626f58200
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Thu Jun 22 00:21:43 2017 +0200

    Fix for error in the autoreconf phase
    
    Actual error:
    =================================================================================
    src/Makefile.am:9: error: 'pkglibdir' is not a legitimate directory for 'PROGRAMS'
    src/Makefile.am: installing 'use/depcomp'
    src/Makefile.am:18: error: 'pkglibdir' is not a legitimate directory for 'HEADERS'
    src/Makefile.am:20: warning: variable 'check1_LDADD' is defined but no program or
    src/Makefile.am:20: library has 'check1' as canonical name (possible typo)
    src/Makefile.am:21: warning: variable 'parallax2_LDADD' is defined but no program or
    src/Makefile.am:21: library has 'parallax2' as canonical name (possible typo)
    autoreconf: automake failed with exit status: 1
    dh_autoreconf: autoreconf -f -i returned exit code 1
    debian/rules:10: recipe for target 'build' failed
    make: *** [build] Error 2
    dpkg-buildpackage: error: debian/rules build gave error exit status 2
    =================================================================================
---
 debian/changelog                                  |  5 ++++-
 debian/patches/fix-ftbfs-automake-pkglibdir.patch | 20 ++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7fac427..513a50d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ sdl-stretch (0.3.1-5) unstable; urgency=medium
   * Minor updates to d/copyright
     - quell lintian about GPL and LGPL names
     - update maintainer address to @debian.org
+  * d/patches:
+    - fix-ftbfs-automake-pkglibdir.patch: Fix for error in autoreconf phase
+      (using "pkglibdir" in src/Makefile.am, recent automake forbids it)
 
- -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Thu, 22 Jun 2017 00:11:28 +0200
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Thu, 22 Jun 2017 00:49:24 +0200
 
 sdl-stretch (0.3.1-4) unstable; urgency=medium
 
diff --git a/debian/patches/fix-ftbfs-automake-pkglibdir.patch b/debian/patches/fix-ftbfs-automake-pkglibdir.patch
new file mode 100644
index 0000000..f168c62
--- /dev/null
+++ b/debian/patches/fix-ftbfs-automake-pkglibdir.patch
@@ -0,0 +1,20 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ lib_LTLIBRARIES = libSDL_stretch.la 
+ pkglib_LTLIBRARIES = libSDL_stretch_test.la
+-pkglib_PROGRAMS = check1 parallax2
++noinst_PROGRAMS = check1 parallax2
+ 
+ libSDL_stretch_la_SOURCES = sdlstretch.c sdlstretch23.c sdlstretchcode.c
+ libSDL_stretch_la_LDFLAGS = $(RELEASE_INFO) $(VERSION_INFO)
+@@ -15,7 +15,7 @@
+ libSDL_stretch_test_la_SOURCES = sdlscreen.c 
+ libSDL_stretch_test_la_LDFLAGS = $(RELEASE_INFO) $(VERSION_INFO)
+ libSDL_stretch_test_la_LIBADD = libSDL_stretch.la
+-pkglib_HEADERS = SDL_stretchtest.hh
++noinst_HEADERS = SDL_stretchtest.hh
+ 
+ check1_LDADD = libSDL_stretch.la
+ parallax2_LDADD = libSDL_stretch.la
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0d2bd2d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-ftbfs-automake-pkglibdir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/sdl-stretch.git