[gap-guava] 01/01: Imported Debian patch 3.13+ds-2: FTBFS #849661 fix

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository gap-guava.

commit c29858a695ef774d17060def376e15dd6bf2fe00
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Dec 31 01:53:31 2016 +0000

    Imported Debian patch 3.13+ds-2: FTBFS #849661 fix
---
 debian/changelog                                     | 16 ++++++++++++++++
 debian/control                                       |  2 +-
 debian/patches/series                                |  1 +
 .../patches/upstream-doc-bibdata-sanitization.patch  |  2 +-
 ...rc-make_machinery-disambiguation-bug_849661.patch | 20 ++++++++++++++++++++
 debian/tests/makecheck.tst                           |  2 +-
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 265a68f..61c10b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+gap-guava (3.13+ds-2) unstable; urgency=medium
+
+  * FTBFS fix release (Closes: #849661), discard inert but now causing failure
+    (and certainly forgotten) command in the target `all' in src/Makefile.
+  * Debianization:
+    - debian/control:
+      - Standards Version, bump to 3.9.8;
+    - debian/patches/*:
+      - d/p/upstream-fix-src-make_machinery-disambiguation-bug_849661.patch,
+        introduce;
+      - Origin fields, correct;
+    - debian/tests/*:
+      - d/t/makecheck.tst, typo.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 31 Dec 2016 01:50:14 +0000
+
 gap-guava (3.13+ds-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 485826a..d749774 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 9), autoconf, automake,
  gap (>=4r8p3), gap-dev (>=4r8p3), gap-gapdoc (>=1.5.1-2),
  texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: http://www.gap-system.org/Packages/guava.html
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gap-guava.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gap-guava.git
diff --git a/debian/patches/series b/debian/patches/series
index 1192a92..bc56cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream-fix-src-make_machinery-disambiguation-bug_849661.patch
 upstream-doc-bibdata-sanitization.patch
 debianization.patch
diff --git a/debian/patches/upstream-doc-bibdata-sanitization.patch b/debian/patches/upstream-doc-bibdata-sanitization.patch
index 78afaee..393ef4e 100644
--- a/debian/patches/upstream-doc-bibdata-sanitization.patch
+++ b/debian/patches/upstream-doc-bibdata-sanitization.patch
@@ -4,7 +4,7 @@ Description: upstream documentation: BibTeX data: sanitization
  composed documentation is comparable to the one composed for GAP itself;
  some metadata has been updated; meant to be submitted to the upstream
  maintainer.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: https://github.com/osj1961/guava/pull/19
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2016-04-21
diff --git a/debian/patches/upstream-fix-src-make_machinery-disambiguation-bug_849661.patch b/debian/patches/upstream-fix-src-make_machinery-disambiguation-bug_849661.patch
new file mode 100644
index 0000000..ebe3a10
--- /dev/null
+++ b/debian/patches/upstream-fix-src-make_machinery-disambiguation-bug_849661.patch
@@ -0,0 +1,20 @@
+Description: upstream: fix: src/: make machinery: disambiguation
+ Discard inert (and certainly forgotten) command in src/Makefile that causes
+ failure with shells whose `cd' command admits at most one path as argument
+ (e.g., bash >= 4.4.5); meant to be submitted to the upstream maintainer.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849661
+Origin: vendor, Debian
+Forwarded: https://github.com/osj1961/guava/pull/26
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-12-31
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -11,7 +11,6 @@
+ .PHONY: all $(SUBDIRS)
+ 
+ all :	$(FILES)
+-	cd leon make
+ 
+ leonconv: leonconv.c
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o leonconv leonconv.c
diff --git a/debian/tests/makecheck.tst b/debian/tests/makecheck.tst
index 63e3a3e..679adef 100644
--- a/debian/tests/makecheck.tst
+++ b/debian/tests/makecheck.tst
@@ -10,7 +10,7 @@ gap> AdHocAvailabilityTest :=
 >   if ForAny( ["desauto", "leonconv", "wtdist"],
 >       f -> Filename( path, f ) = fail
 >       ) then
->     Print( "#I  Cannot found at least one of the C code programs.\n" );
+>     Print( "#I  Cannot find at least one of the C code programs.\n" );
 >     answer := false;
 >   fi;
 >   return answer;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-guava.git