ncurses (6.1+20191019-1)debian/6.1+20191019-1debian

5 files changed, 133 insertions, 0 deletions

diff --git a/debian/patches/01-debian-no-ada-doc.diff b/debian/patches/01-debian-no-ada-doc.diff
new file mode 100644
index 0000000..79f7576
--- /dev/null
+++ b/debian/patches/01-debian-no-ada-doc.diff
@@ -0,0 +1,27 @@
+Description: link to Ada binding doc in separate package
+ The Ada binding is packaged separately, there is no need to duplicate
+ the documentation in ncurses-doc. Replace the internal link with a
+ hyperlink.
+Author: Nicolas Boulenguez <nicolas@debian.org>
+Bug-Debian: https://bugs.debian.org/757991
+Forwarded: not-needed
+Last-Update: 2017-07-02
+
+---
+ doc/html/index.html |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/doc/html/index.html
++++ b/doc/html/index.html
+@@ -55,8 +55,9 @@
+     <li>A <a href="hackguide.html">hackers guide</a> to
+     ncurses.</li>
+ 
+-    <li>A description of the <a href="Ada95.html">Ada95
+-    binding</a>, by J&uuml;rgen Pfeifer.</li>
++    <li>A description of the <a href="../../libncursesada-doc/Ada95.html">Ada95
++    binding</a>, by J&uuml;rgen Pfeifer (only available if you have installed
++    the libncursesada-doc Debian package).</li>
+ 
+     <li>A <a href="NCURSES-Programming-HOWTO.html">A short
+     tutorial</a>, by Pradeep Padala.</li>
diff --git a/debian/patches/02-debian-backspace.diff b/debian/patches/02-debian-backspace.diff
new file mode 100644
index 0000000..b419f70
--- /dev/null
+++ b/debian/patches/02-debian-backspace.diff
@@ -0,0 +1,32 @@
+Author: Daniel Jacobowitz <dan@debian.org>
+Author: Sven Joachim <svenjoac@gmx.de>
+Description: Fix backspace key description in some terminfo entries
+Bug-Debian: https://bugs.debian.org/237997
+Bug-Debian: https://bugs.debian.org/602300
+Forwarded: not-needed
+Last-Update: 2019-07-17
+
+---
+ misc/terminfo.src |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -6190,7 +6190,7 @@ Eterm|Eterm-color|Eterm with xterm-style
+ 	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
+ 	is1=\E[?47l\E>\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
+-	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
++	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^?,
+ 	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
+ 	mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
+@@ -7255,7 +7255,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
++	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?, kcbt=\E[Z,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+ 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
diff --git a/debian/patches/02-debian-drop-rin-from-screen-256color.diff b/debian/patches/02-debian-drop-rin-from-screen-256color.diff
new file mode 100644
index 0000000..168e0b1
--- /dev/null
+++ b/debian/patches/02-debian-drop-rin-from-screen-256color.diff
@@ -0,0 +1,23 @@
+Author: Sven Joachim <svenjoac@gmx.de>
+Description: Remove "rin" from screen-256color
+ Some (many?) tmux users have set their TERM environment variable to
+ screen-256color, and tmux before version 3.0 does not deal with "rin"
+ correctly.  So drop "rin" from screen-256color, at least until tmux
+ 3.0 is released.
+Bug-Debian: https://bugs.debian.org/933572
+Last-Update: 2019-08-07
+
+---
+ misc/terminfo.src |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -7302,6 +7302,7 @@ screen-16color-bce-s|GNU Screen with 16
+ 
+ screen-256color|GNU Screen with 256 colors,
+ 	use=xterm+256setaf, use=screen4,
++	rin@,
+ 
+ screen-256color-s|GNU Screen with 256 colors and status line,
+ 	use=xterm+256setaf, use=screen-s,
diff --git a/debian/patches/03-debian-ncursesconfig-omit-L.diff b/debian/patches/03-debian-ncursesconfig-omit-L.diff
new file mode 100644
index 0000000..258d3b6
--- /dev/null
+++ b/debian/patches/03-debian-ncursesconfig-omit-L.diff
@@ -0,0 +1,47 @@
+Author: Sven Joachim <svenjoac@gmx.de>
+Description: Omit -L part from ncurses6{w,}-config output
+ "ncurses6-config --libs" includes a "-L" part which is not needed
+ since the library is installed in a directory in the default linker
+ search path.
+ .
+ Upstream omits the -L part if $libdir is in a standard directory,
+ however the list of standard directories is determined at build time
+ and architecture dependent, breaking multiarch co-installability.
+ Until there is a way to obtain the multiarch path without running
+ dpkg-architecture our patch is not upstreamable.
+Bug-Debian: https://bugs.debian.org/638281
+Bug-Debian: https://bugs.debian.org/745479
+Forwarded: not-needed
+Last-Update: 2019-10-21
+
+---
+ misc/ncurses-config.in |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/misc/ncurses-config.in
++++ b/misc/ncurses-config.in
+@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
+ includedir="@includedir@"
+-libdir="@libdir@"
+ datarootdir="@datarootdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+@@ -109,7 +108,7 @@ do
+ 	-L*)
+ 		[ -d ${opt##-L} ] || continue
+ 		case ${opt##-L} in
+-		@LD_SEARCHPATH@) # skip standard libdir
++		*) # skip standard libdir
+ 			continue
+ 			;;
+ 		*)
+@@ -231,7 +230,6 @@ ENDECHO
+ 		echo $INCS
+ 		;;
+ 	--libdir)
+-		echo "${libdir}"
+ 		;;
+ 	--mandir)
+ 		echo "${mandir}"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7796701
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-debian-no-ada-doc.diff
+02-debian-backspace.diff
+02-debian-drop-rin-from-screen-256color.diff
+03-debian-ncursesconfig-omit-L.diff