[pkg-lynx-commits] [lynx-cur] 01/02: po/makefile.inn: Use unique names for temporary files

[Axel Beckert]

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

abe pushed a commit to branch master
in repository lynx-cur.

commit 5cafedc69e002a153d671fe0a5f02f14c429bd51
Author: Adrian Bunk <bunk at debian.org>
Date:   Mon Feb 19 19:39:46 2018 +0200

    po/makefile.inn: Use unique names for temporary files
    
    Fixes parallel build FTBFS.
---
 debian/patches/parallel.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/parallel.patch b/debian/patches/parallel.patch
new file mode 100644
index 0000000..28126fa
--- /dev/null
+++ b/debian/patches/parallel.patch
@@ -0,0 +1,37 @@
+Description: po/makefile.inn: Use unique names for temporary files
+ Fixes parallel build FTBFS.
+Author: Adrian Bunk <bunk at debian.org>
+Bug-Debian: https://bugs.debian.org/890811
+
+--- lynx-2.8.9dev16.orig/po/makefile.inn
++++ lynx-2.8.9dev16/po/makefile.inn
+@@ -89,23 +89,23 @@ INSTOBJ		= $(NLS_TEXTDOMAIN)$(INSTOBJEXT
+ 	@echo "translating $< to $@"
+ 	@$(SHELL) -c 'LC_ALL=C \
+ 	sed	-e s,http://lynx.browser.org/,@HOMEPAGE_URL@,g \
+-		-e s,http://lynx.isc.org/,@HOMEPAGE_URL@,g $< >pass1.tmp;\
+-	if cmp -s $< pass1.tmp; \
++		-e s,http://lynx.isc.org/,@HOMEPAGE_URL@,g $< >pass1.$@.tmp;\
++	if cmp -s $< pass1.$@.tmp; \
+ 	then \
+ 		echo ...no change made to homepage URL; \
+ 	else \
+ 		echo ...updated homepage URL;\
+ 	fi; \
+-	if $(MSGMERGE) -w 132 pass1.tmp $(srcdir)/$(PACKAGE).pot -o pass2.tmp; \
++	if $(MSGMERGE) -w 132 pass1.$@.tmp $(srcdir)/$(PACKAGE).pot -o pass2.$@.tmp; \
+ 	then \
+ 		echo "...merged against $(srcdir)/$(PACKAGE).pot";\
+ 	else \
+ 		echo "...workaround without merging against $(srcdir)/$(PACKAGE).pot";\
+-		cat  $< >pass2.tmp; \
++		cat  $< >pass2.$@.tmp; \
+ 	fi '
+ 	@ECHO_CC at file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+-	  && rm -f $$file && $(GMSGFMT) -o $$file pass2.tmp
+-	@-rm -f pass*.tmp
++	  && rm -f $$file && $(GMSGFMT) -o $$file pass2.$@.tmp
++	@-rm -f pass*.$@.tmp
+ 
+ .po.cat:
+ 	@echo "translating $< to $@"
diff --git a/debian/patches/series b/debian/patches/series
index 7317b0e..4eb3f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ lynxcfg.patch
 aboutlynx.patch
 21_do_not_strip_-g.diff
 nested_tables.patch
+parallel.patch

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