[pkg-lynx-commits] [lynx-cur] 04/04: Refresh patches lynxcfg.patch and 21_do_not_strip_-g.diff

[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 5933ee0e8961028b765f619417dd8ef27882cbdd
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Apr 29 19:18:34 2017 +0200

    Refresh patches lynxcfg.patch and 21_do_not_strip_-g.diff
---
 debian/changelog                       |  1 +
 debian/patches/21_do_not_strip_-g.diff |  6 +++---
 debian/patches/lynxcfg.patch           | 22 +++++++---------------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f6356a..dc60b1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lynx (2.8.9dev13-1) UNRELEASED; urgency=medium
       editable text-fields (Closes: #841155)
     + Improve manual page discussion of environment variables, especially
       http_proxy (c.f. #791452)
+    + Refresh patches lynxcfg.patch and 21_do_not_strip_-g.diff.
 
  -- Axel Beckert <abe at debian.org>  Sat, 29 Apr 2017 18:56:57 +0200
 
diff --git a/debian/patches/21_do_not_strip_-g.diff b/debian/patches/21_do_not_strip_-g.diff
index 5ba14a5..43edff7 100644
--- a/debian/patches/21_do_not_strip_-g.diff
+++ b/debian/patches/21_do_not_strip_-g.diff
@@ -4,9 +4,9 @@ Author: Andreas Metzler <ametzler at debian.org>,
 Origin: vendor
 Last-Update: 2015-05-08
 
---- lynx-cur-2.8.9dev3.orig/configure
-+++ lynx-cur-2.8.9dev3/configure
-@@ -3395,7 +3395,7 @@ else
+--- a/configure
++++ b/configure
+@@ -3438,7 +3438,7 @@
  		test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
  		;;
  	(*)
diff --git a/debian/patches/lynxcfg.patch b/debian/patches/lynxcfg.patch
index 826e993..c5af442 100644
--- a/debian/patches/lynxcfg.patch
+++ b/debian/patches/lynxcfg.patch
@@ -1,10 +1,10 @@
 Description: Modify the lynx.cfg to Debian system
 Author: Atsuhito Kohda <kohda at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-Dec-07
+Last-Update: 2017-Apr-29
 
---- ./lynx.cfg.orig	2010-06-26 12:06:05.000000000 +0900
-+++ ./lynx.cfg	2010-06-26 14:13:18.000000000 +0900
+--- a/lynx.cfg
++++ b/lynx.cfg
 @@ -90,7 +90,7 @@
  #
  # Normally we expect you will connect to a remote site, e.g., the Lynx starting
@@ -162,13 +162,13 @@ Last-Update: 2015-Dec-07
  # ===
  #GLOBAL_MAILCAP:Lynx_Dir:mailcap
  #
- # 	Sought in user's home (Unix) or sys$login (VMS) directory.
+ #	Sought in user's home (Unix) or sys$login (VMS) directory.
 -#PERSONAL_MAILCAP:.mailcap
 +PERSONAL_MAILCAP:.mailcap
  
  .h2 PREFERRED_MEDIA_TYPES
  # When doing a GET, lynx lists the MIME types which it knows how to present
-@@ -3555,7 +3559,7 @@
+@@ -3554,7 +3558,7 @@
  # should accept, in case the $SSL_CERT_FILE environment variable is not set,
  # e.g.,
  #
@@ -177,7 +177,7 @@ Last-Update: 2015-Dec-07
  #SSL_CERT_FILE:NULL
  
  .h2 SSL_CLIENT_CERT_FILE
-@@ -3595,7 +3599,7 @@
+@@ -3594,7 +3598,7 @@
  
  .h2 SYSLOG_REQUESTED_URLS
  # Log the requested URLs using the syslog interface.
@@ -186,15 +186,7 @@ Last-Update: 2015-Dec-07
  
  .h2 SYSLOG_TEXT
  # Add the given text to calls made to syslog, to distinguish Lynx from other
-@@ -3761,11 +3765,27 @@
- .h2 WITH_BACKSPACES
- # Emit backspaces in output if -dump'ing or -crawl'ing (like 'man' does).
- #WITH_BACKSPACES:FALSE
- 
- .h1 Internal Behavior
- .h2 HTTP_PROTOCOL
- # Normally Lynx negotiates HTTP/1.0, because it does not support chunked
- # transfer (a requirement for all HTTP/1.1 clients), although it supports
+@@ -3768,3 +3772,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

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