Commit 616318d7 authored by Axel Beckert's avatar Axel Beckert

Update patches for new upstream release

* Drop parallel.patch, fixed upstream.
* Refresh remaining patches where necessary.
parent aa31b3c7
lynx (2.8.9dev16-4) UNRELEASED; urgency=medium
lynx (2.8.9dev17-1) UNRELEASED; urgency=medium
* Update FTP-based URL in watch file and switch to it for now as it
seems more uptodate.
* Import upstream version 2.8.9dev17.
+ Drop parallel.patch, fixed upstream.
+ Refresh remaining patches where necessary.
-- Axel Beckert <abe@debian.org> Thu, 22 Mar 2018 02:12:34 +0100
-- Axel Beckert <abe@debian.org> Thu, 22 Mar 2018 02:14:41 +0100
lynx (2.8.9dev16-3) unstable; urgency=medium
......
......@@ -6,7 +6,7 @@ Last-Update: 2015-05-08
--- a/configure
+++ b/configure
@@ -3470,7 +3470,7 @@
@@ -3475,7 +3475,7 @@
test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
;;
(*)
......
......@@ -135,7 +135,7 @@ Last-Update: 2017-10-30
.h1 Internal Behavior
@@ -2123,13 +2126,13 @@
@@ -2119,13 +2122,13 @@
#
# Unix:
# ====
......@@ -151,7 +151,7 @@ Last-Update: 2017-10-30
# VMS (sought in user's sys$login directory):
#PERSONAL_EXTENSION_MAP:mime.types
@@ -2264,6 +2267,8 @@
@@ -2260,6 +2263,8 @@
#SUFFIX:.dms:application/x-dms
#SUFFIX:.html:text/html
#SUFFIX:.txt:text/plain
......@@ -160,7 +160,7 @@ Last-Update: 2017-10-30
.h2 XLOADIMAGE_COMMAND
# VMS:
@@ -2367,13 +2372,13 @@
@@ -2363,13 +2368,13 @@
#
# Unix:
# ====
......@@ -176,7 +176,7 @@ Last-Update: 2017-10-30
.h2 PREFERRED_MEDIA_TYPES
# When doing a GET, lynx lists the MIME types which it knows how to present
@@ -3579,7 +3584,7 @@
@@ -3583,7 +3588,7 @@
# should accept, in case the $SSL_CERT_FILE environment variable is not set,
# e.g.,
#
......@@ -185,7 +185,7 @@ Last-Update: 2017-10-30
#SSL_CERT_FILE:NULL
.h2 SSL_CLIENT_CERT_FILE
@@ -3619,7 +3624,7 @@
@@ -3623,7 +3628,7 @@
.h2 SYSLOG_REQUESTED_URLS
# Log the requested URLs using the syslog interface.
......@@ -194,7 +194,7 @@ Last-Update: 2017-10-30
.h2 SYSLOG_TEXT
# Add the given text to calls made to syslog, to distinguish Lynx from other
@@ -3793,3 +3798,19 @@
@@ -3797,3 +3802,19 @@
# several other features of HTTP/1.1. You may encounter a server which does
# not support HTTP/1.0 which can be used by switching to the later protocol.
#HTTP_PROTOCOL:1.0
......
......@@ -4,7 +4,7 @@ Bug-Debian: https://bugs.debian.org/387555
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3028,7 +3028,7 @@
@@ -3033,7 +3033,7 @@
# It is enabled by default when the COLOR_STYLE configuration is used,
# and false otherwise.
#
......
Description: po/makefile.inn: Use unique names for temporary files
Fixes parallel build FTBFS.
Author: Adrian Bunk <bunk@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@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 $@"
......@@ -2,4 +2,3 @@ lynxcfg.patch
aboutlynx.patch
21_do_not_strip_-g.diff
nested_tables.patch
parallel.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment