Vendor import ncurses 6.6vendor/ncurses/6.6vendor/ncurses

11 files changed, 186 insertions, 163 deletions

diff --git a/package/debian/changelog b/package/debian/changelog
index 12ba6fbd93dd..992e9e0be915 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240427) unstable; urgency=low
+ncurses6td (6.6+20251230) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 30 Dec 2025 15:44:53 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/control b/package/debian/control
index 35921910f98d..3b99ac176b9c 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
@@ -6,8 +6,11 @@ Homepage: https://invisible-island.net/ncurses/
 Build-Depends: debhelper (>= 8.1.3)
 Standards-Version: 4.6.1.0
 
-Package: ncurses6
+Package: ncurses6td
 Architecture: any
+Conflicts: ncurses6 (>= 6.5)
+Provides: ncurses6 (= 6.5)
+Replaces: ncurses6 (>= 6.5)
 Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -15,8 +18,11 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ABI 6.
 
-Package: ncursest6
+Package: ncursest6td
 Architecture: any
+Conflicts: ncursest6 (>= 6.5)
+Provides: ncursest6 (= 6.5)
+Replaces: ncursest6 (>= 6.5)
 Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -24,9 +30,12 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ABI 6 with pthreads.
 
-Package: ncurses6-doc
+Package: ncurses6td-doc
 Section: doc
 Architecture: all
+Conflicts: ncurses6-doc
+Provides: ncurses6-doc
+Replaces: ncurses6-doc
 Depends: groff-base
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -34,9 +43,12 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ncurses6 document packaging.
 
-Package: ncurses6-doc-html
+Package: ncurses6td-doc-html
 Section: doc
 Architecture: all
+Conflicts: ncurses6-doc-html
+Provides: ncurses6-doc-html
+Replaces: ncurses6-doc-html
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
  updating character screens with reasonable optimization.
diff --git a/package/debian/copyright b/package/debian/copyright
index 32396640b07c..32fd35658d8b 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -1,100 +1,105 @@
-Upstream source https://invisible-island.net/ncurses/ncurses.html
-This package is used for testing builds of ncurses.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ncurses
+Upstream-Contact: Thomas E. Dickey <dickey@invisible-island.net>
+Source: https://invisible-island.net/ncurses/ncurses.html
 
-Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
-
--------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 by Thomas E. Dickey
-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
-License: X11
-
-Files: aclocal.m4 package
-Copyright: 1996-2023,2024 by Thomas E. Dickey
-License: X11
-
-Files: doc/html/NCURSES-Programming-HOWTO.html
+Copyright: 2017-2024,2025 by Thomas E. Dickey
+           1998-2016,2017 Free Software Foundation, Inc.
+License:   X11 License Distribution Modification Variant
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, distribute with modifications, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name(s) of the above copyright
+ holders shall not be used in advertising or otherwise to promote the
+ sale, use or other dealings in this Software without prior written
+ authorization.
+Comment:
+ https://invisible-island.net/ncurses/ncurses-license.html
+
+Files:     aclocal.m4 package
+Copyright: 1996-2024,2025 by Thomas E. Dickey
+License:   X11 License Distribution Modification Variant
+
+Files:     doc/html/NCURSES-Programming-HOWTO.html
 Copyright: 2001 by Pradeep Padala
-License: X11
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, distribute with modifications, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-    THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the name(s) of the above copyright
-    holders shall not be used in advertising or otherwise to promote the
-    sale, use or other dealings in this Software without prior written
-    authorization.
-
--------------------------------------------------------------------------------
-Files: install-sh
-Copyright:  1994 X Consortium
-License: X11
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the name of the X Consortium shall not
-    be used in advertising or otherwise to promote the sale, use or other deal-
-    ings in this Software without prior written authorization from the X Consor-
-    tium.
-
--------------------------------------------------------------------------------
-Files: progs/tset.c ncurses/tinfo/read_termcap.c
+License:   X11 License Distribution Modification Variant
+
+Files:     misc/ncu2openbsd
+           ncurses/wcwidth.h
+Copyright: 2002-2024 by Thomas E. Dickey
+License:   X11
+
+Files:     install-sh
+Copyright: 1994 X Consortium
+License:   X11
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name(s) of the above copyright
+ holders shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in this Software without prior written authorization.
+
+Files:     ncurses/tinfo/read_termcap.c
+           progs/tset.c
 Copyright: 1980,1991,1992,1993 The Regents of the University of California.
-License: BSD
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
--- vile: txtmode file-encoding=utf-8
+License:   BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+Files:     test/terminal.xbm
+Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
+License:   StandardML-NJ
+Comment: vile: txtmode file-encoding=utf-8
diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides
deleted file mode 100644
index 8bd49457f089..000000000000
--- a/package/debian/ncurses6.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is intentional.
-ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
-
-# This is intentional.
-ncurses6: binary-without-manpage
-ncurses6: non-dev-pkg-with-shlib-symlink
-ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.4]
-
-# vile: confmode
diff --git a/package/debian/ncurses6td.lintian-overrides b/package/debian/ncurses6td.lintian-overrides
new file mode 100644
index 000000000000..5e5b8c34ffae
--- /dev/null
+++ b/package/debian/ncurses6td.lintian-overrides
@@ -0,0 +1,11 @@
+# $Id: ncurses6td.lintian-overrides,v 1.3 2025/06/14 19:43:41 tom Exp $
+
+# This is intentional.
+ncurses6td: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+
+# This is intentional.
+ncurses6td: no-manual-page
+ncurses6td: non-dev-pkg-with-shlib-symlink
+ncurses6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
+
+# vile: confmode
diff --git a/package/debian/ncurses6.triggers b/package/debian/ncurses6td.triggers
index dd8660367847..dd8660367847 100644
--- a/package/debian/ncurses6.triggers
+++ b/package/debian/ncurses6td.triggers
diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides
deleted file mode 100644
index 5a1b83bd49b5..000000000000
--- a/package/debian/ncursest6.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is intentional.
-ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
-
-# This is intentional.
-ncursest6: binary-without-manpage
-ncursest6: non-dev-pkg-with-shlib-symlink
-ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.4]
-
-# vile: confmode
diff --git a/package/debian/ncursest6td.lintian-overrides b/package/debian/ncursest6td.lintian-overrides
new file mode 100644
index 000000000000..f3fcc32e7cf4
--- /dev/null
+++ b/package/debian/ncursest6td.lintian-overrides
@@ -0,0 +1,11 @@
+# $Id: ncursest6td.lintian-overrides,v 1.3 2025/06/14 19:43:41 tom Exp $
+
+# This is intentional.
+ncursest6td: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+
+# This is intentional.
+ncursest6td: no-manual-page
+ncursest6td: non-dev-pkg-with-shlib-symlink
+ncursest6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
+
+# vile: confmode
diff --git a/package/debian/ncursest6.triggers b/package/debian/ncursest6td.triggers
index dd8660367847..dd8660367847 100644
--- a/package/debian/ncursest6.triggers
+++ b/package/debian/ncursest6td.triggers
diff --git a/package/debian/rules b/package/debian/rules
index 648939b22fba..01d99b2bde7e 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,19 +1,18 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.53 2024/04/08 15:31:32 tom Exp $
+# $Id: rules,v 1.59 2025/11/23 19:09:18 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 SHELL = /bin/bash
 DPKG_EXPORT_BUILDFLAGS = 1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all
 
 include /usr/share/dpkg/buildflags.mk
 
 # packages
-PACKAGES.indep = ncurses6-doc ncurses6-doc-html
-PACKAGES.arch  = ncurses6 ncursest6
+PACKAGES.indep = ncurses6td-doc ncurses6td-doc-html
+PACKAGES.arch  = ncurses6td ncursest6td
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -71,6 +70,7 @@ configure = \
 		--disable-root-access \
 		--disable-root-environ \
 		--disable-termcap \
+		--enable-assertions \
 		--enable-check-size \
 		--enable-hard-tabs \
 		--enable-opaque-curses \
@@ -86,7 +86,8 @@ configure = \
 		--program-suffix=$(MY_ABI) \
 		--verbose \
 		--with-abi-version=$(MY_ABI) \
-		--with-config-suffix=dev \
+		--with-config-suffix=td \
+		--with-pc-suffix=td \
 		--with-cxx-shared \
 		--with-default-terminfo-dir=$(MYDATA) \
 		--with-develop \
@@ -104,8 +105,8 @@ configure = \
 		--with-manpage-symlinks \
 		--without-normal
 
-NCURSES6_DIR = $(CURDIR)/debian/ncurses6
-NCURSEST6_DIR = $(CURDIR)/debian/ncursest6
+NCURSES6_DIR = $(CURDIR)/debian/ncurses6td
+NCURSEST6_DIR = $(CURDIR)/debian/ncursest6td
 
 .PHONY: all config build install binary clean config-indep config-arch \
     build-indep build-arch install-indep install-arch binary-indep \
@@ -118,6 +119,7 @@ build: build-indep build-arch
 install: install-indep install-arch
 binary: binary-indep binary-arch
 clean:
+	pwd; ls -l
 	dh_testdir
 	dh_testroot
 	dh_clean $(verbose)
@@ -133,7 +135,7 @@ install-indep: $(PACKAGES.indep:%=install-%-stamp)
 install-arch: $(PACKAGES.arch:%=install-%-stamp)
 
 # make the doc-package installable by renaming everything to avoid clashing
-patch-ncurses6-stamp:
+patch-ncurses6td-stamp:
 	dh_testdir
 	sed -i.bak \
 		-e 's/-config\.1$$/dev-config.1/;t' \
@@ -147,91 +149,91 @@ patch-ncurses6-stamp:
 	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
 	touch $@
 
-config-ncurses6-stamp: patch-ncurses6-stamp
+config-ncurses6td-stamp: patch-ncurses6td-stamp
 	dh_testdir
-	rm -rf t/ncurses6
-	mkdir -p t/ncurses6
-	cd t/ncurses6; $(configure)
+	rm -rf t/ncurses6td
+	mkdir -p t/ncurses6td
+	cd t/ncurses6td; $(configure)
 	touch $@
 
-config-ncursest6-stamp: patch-ncurses6-stamp
+config-ncursest6td-stamp: patch-ncurses6td-stamp
 	dh_testdir
-	rm -rf t/ncursest6
-	mkdir -p t/ncursest6
-	cd t/ncursest6; $(configure) \
+	rm -rf t/ncursest6td
+	mkdir -p t/ncursest6td
+	cd t/ncursest6td; $(configure) \
 		--enable-interop \
 		--enable-sp-funcs \
 		--program-suffix=t$(MY_ABI) \
 		--with-pthread
 	touch $@
 
-config-ncurses6-doc-stamp \
-config-ncurses6-doc-html-stamp: config-ncurses6-stamp
+config-ncurses6td-doc-stamp \
+config-ncurses6td-doc-html-stamp: config-ncurses6td-stamp
 	touch $@
 
-build-ncurses6-stamp: config-ncurses6-stamp
+build-ncurses6td-stamp: config-ncurses6td-stamp
 	dh_testdir
 
-	$(MAKE) -C t/ncurses6
+	$(MAKE) -C t/ncurses6td
 
 	touch $@
 
-build-ncursest6-stamp: config-ncursest6-stamp
+build-ncursest6td-stamp: config-ncursest6td-stamp
 	dh_testdir
 
-	$(MAKE) -C t/ncursest6
+	$(MAKE) -C t/ncursest6td
 
 	touch $@
 
-build-ncurses6-doc-stamp \
-build-ncurses6-doc-html-stamp: build-ncurses6-stamp
+build-ncurses6td-doc-stamp \
+build-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
 	touch $@
 
-install-ncurses6-stamp: build-ncurses6-stamp
+install-ncurses6td-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6
+	dh_prep        $(verbose) -pncurses6td
 
-	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+	$(MAKE) -C t/ncurses6td install.libs install.progs DESTDIR=$(NCURSES6_DIR)
+	$(MAKE) -C t/ncurses6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
+	mv t/ncurses6td/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
 
 	touch $@
 
-install-ncursest6-stamp: build-ncursest6-stamp
+install-ncursest6td-stamp: build-ncursest6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncursest6
+	dh_prep        $(verbose) -pncursest6td
 
-	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+	$(MAKE) -C t/ncursest6td install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
+	$(MAKE) -C t/ncursest6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
+	mv t/ncursest6td/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
 
 	touch $@
 
-install-ncurses6-doc-stamp: build-ncurses6-stamp
+install-ncurses6td-doc-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6-doc
+	dh_prep        $(verbose) -pncurses6td-doc
 
-	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
+	$(MAKE) -C t/ncurses6td install.man DESTDIR=$(NCURSES6_DIR)-doc
 	find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete
 
 	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
 
 	touch $@
 
-HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
-install-ncurses6-doc-html-stamp: build-ncurses6-stamp
+HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6td-doc-html
+install-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6-doc-html
+	dh_prep        $(verbose) -pncurses6td-doc-html
 
 	cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{}
 	cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{}
diff --git a/package/debian/watch b/package/debian/watch
index f6b3987e0dda..11c22c5a61bd 100644
--- a/package/debian/watch
+++ b/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate