[pkg-lynx-commits] [Git][lynx-team/lynx][master] 2 commits: po/makefile.inn: Use unique names for temporary files

[Axel Beckert]

Axel Beckert pushed to branch master at Debian Lynx Packaging Team / lynx


Commits:
5cafedc6 by Adrian Bunk at 2018-02-19T19:26:51+01:00
po/makefile.inn: Use unique names for temporary files

Fixes parallel build FTBFS.

- - - - -
558fa96c by Axel Beckert at 2018-02-19T19:29:21+01:00
Add changelog item for previous commit

Gbp-Dch: Ignore

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/parallel.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 lynx (2.8.9dev16-3) UNRELEASED; urgency=medium
 
+  [ Axel Beckert ]
   * Declare compliance with Debian Policy 4.1.3. (No changes needed.)
   * Add hint to debian/compat why Lynx FTBFS with dh compat level 11.
   * Update Vcs-* headers for move to salsa.debian.org.
 
+  [ Adrian Bunk ]
+  * Patch po/makefile.inn to use unique names for temporary files. Fixes
+    parallel build FTBFS. (Closes: #890811)
+
  -- Axel Beckert <abe at debian.org>  Sun, 03 Dec 2017 03:07:25 +0100
 
 lynx (2.8.9dev16-2) unstable; urgency=low


=====================================
debian/patches/parallel.patch
=====================================
--- /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 $@"


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/lynx-team/lynx/compare/4c14c133d734a4c11c8a0254cf72d7d087dc056c...558fa96c562e51ca0eaf33f046f36e576097d38c

---
View it on GitLab: https://salsa.debian.org/lynx-team/lynx/compare/4c14c133d734a4c11c8a0254cf72d7d087dc056c...558fa96c562e51ca0eaf33f046f36e576097d38c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-lynx-commits/attachments/20180219/457e1f8a/attachment-0001.html>