7 files changed, 53 insertions, 40 deletions
diff --git a/package/debian/changelog b/package/debian/changelog
index 7884cace2042..12ba6fbd93dd 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,10 +1,10 @@
-ncurses6 (6.2+20210220) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Feb 2021 07:06:35 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
-ncurses6 (5.9-20120608) unstable; urgency=low
+ncurses6 (5.9+20120608) unstable; urgency=low
 
   * initial release
 
diff --git a/package/debian/compat b/package/debian/compat
index f599e28b8ab0..48082f72f087 100644
--- a/package/debian/compat
+++ b/package/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/package/debian/control b/package/debian/control
index fcd4dac31f2a..35921910f98d 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -3,8 +3,8 @@ Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
 Homepage: https://invisible-island.net/ncurses/
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 8.1.3)
+Standards-Version: 4.6.1.0
 
 Package: ncurses6
 Architecture: any
diff --git a/package/debian/copyright b/package/debian/copyright
index a01b3eec04de..32396640b07c 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -5,17 +5,17 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2020,2021 by Thomas E. Dickey
+Copyright: 2017-2023,2024 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
-Licence: X11
+License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2020,2021 by Thomas E. Dickey
-Licence: X11
+Copyright: 1996-2023,2024 by Thomas E. Dickey
+License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
 Copyright: 2001 by Pradeep Padala
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
@@ -44,7 +44,7 @@ Licence: X11
 -------------------------------------------------------------------------------
 Files: install-sh
 Copyright:  1994 X Consortium
-Licence: X11
+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
diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides
index 759fa7666eb3..8bd49457f089 100644
--- a/package/debian/ncurses6.lintian-overrides
+++ b/package/debian/ncurses6.lintian-overrides
@@ -1,15 +1,9 @@
 # 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 works around a bug in Debian's build-scripts.
-ncurses6: latest-debian-changelog-entry-changed-to-native
-
-ncurses6: hardening-no-fortify-functions usr/lib/libncurses++w6.so.6.1
-
 # This is intentional.
 ncurses6: binary-without-manpage
 ncurses6: non-dev-pkg-with-shlib-symlink
-ncurses6: embedded-library usr/lib/libtinfow6.so.6.1: ncurses
-ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1
+ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.4]
 
 # vile: confmode
diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides
index e8de0d6a718f..5a1b83bd49b5 100644
--- a/package/debian/ncursest6.lintian-overrides
+++ b/package/debian/ncursest6.lintian-overrides
@@ -1,15 +1,9 @@
 # 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 works around a bug in Debian's build-scripts.
-ncursest6: latest-debian-changelog-entry-changed-to-native
-
-ncursest6: hardening-no-fortify-functions usr/lib/libncurses++tw6.so.6.1
-
 # This is intentional.
 ncursest6: binary-without-manpage
 ncursest6: non-dev-pkg-with-shlib-symlink
-ncursest6: embedded-library usr/lib/libtinfotw6.so.6.1: ncurses
-ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1
+ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.4]
 
 # vile: confmode
diff --git a/package/debian/rules b/package/debian/rules
index ab94ef3f7b12..648939b22fba 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,9 +1,16 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.39 2020/08/22 22:03:06 tom Exp $
+# $Id: rules,v 1.53 2024/04/08 15:31:32 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
+
+include /usr/share/dpkg/buildflags.mk
+
 # packages
 PACKAGES.indep = ncurses6-doc ncurses6-doc-html
 PACKAGES.arch  = ncurses6 ncursest6
@@ -12,23 +19,23 @@ PACKAGES.arch  = ncurses6 ncursest6
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
 CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
 
 MY_ABI=6
 MY_DIR=/usr
+BINDIR=$(MY_DIR)/bin
+LIBDIR=$(MY_DIR)/lib/$(DEB_HOST_MULTIARCH)
 MYDATA=/usr/local/ncurses/share/terminfo
 NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
 THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI)
 
-CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL)
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS   += $(CC_NORMAL)
 
 ifneq ($(MY_DIR),/usr)
-	RPATH_ENV = RPATH_LIST=../lib:$(MY_DIR)/lib
+	RPATH_ENV = RPATH_LIST=../lib:$(LIBDIR)
 	RPATH_OPT = --enable-rpath
 else
 	RPATH_ENV =
@@ -54,19 +61,24 @@ configure = \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=$(MY_DIR) \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--disable-echo \
 		--disable-getcap \
 		--disable-leaks \
 		--disable-macros  \
 		--disable-overwrite  \
 		--disable-relink \
+		--disable-root-access \
+		--disable-root-environ \
 		--disable-termcap \
+		--enable-check-size \
 		--enable-hard-tabs \
 		--enable-opaque-curses \
 		--enable-opaque-form \
 		--enable-opaque-menu \
 		--enable-opaque-panel \
 		--enable-pc-files \
+		--enable-stdnoreturn \
 		--enable-warnings \
 		--enable-wgetch-events \
 		--enable-widec \
@@ -88,7 +100,8 @@ configure = \
 		--with-xterm-kbs=DEL \
 		--without-ada \
 		--without-debug \
-		--without-manpage-aliases \
+		--with-manpage-aliases \
+		--with-manpage-symlinks \
 		--without-normal
 
 NCURSES6_DIR = $(CURDIR)/debian/ncurses6
@@ -130,8 +143,8 @@ patch-ncurses6-stamp:
 		-e 's/\.3menu$$/.3menu6/' \
 		-e 's/\.3panel$$/.3panel6/' \
 		-e 's/\.\([157]\)$$/6.\1/' \
-		man/man_db.renames
-	diff -u man/man_db.renames.bak man/man_db.renames || true
+		man/man_db.renames.in
+	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
 	touch $@
 
 config-ncurses6-stamp: patch-ncurses6-stamp
@@ -181,9 +194,9 @@ install-ncurses6-stamp: build-ncurses6-stamp
 	dh_prep        $(verbose) -pncurses6
 
 	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
+	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(MY_DIR)/bin/ncurses$(MY_ABI)
+	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
 
 	touch $@
 
@@ -194,9 +207,9 @@ install-ncursest6-stamp: build-ncursest6-stamp
 	dh_prep        $(verbose) -pncursest6
 
 	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
+	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(MY_DIR)/bin/ncursest$(MY_ABI)
+	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
 
 	touch $@
 
@@ -207,10 +220,13 @@ install-ncurses6-doc-stamp: build-ncurses6-stamp
 	dh_prep        $(verbose) -pncurses6-doc
 
 	$(MAKE) -C t/ncurses6 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/ncurses6-doc-html
+HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
 install-ncurses6-doc-html-stamp: build-ncurses6-stamp
 	dh_testdir
 	dh_testroot
@@ -219,6 +235,8 @@ install-ncurses6-doc-html-stamp: build-ncurses6-stamp
 
 	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)/{}
+	find $(HTML_DESTDIR) -type d -empty -delete -print
+	find $(HTML_DESTDIR) -type d -empty -delete -print
 
 	touch $@
 
@@ -247,6 +265,13 @@ ifneq ($(PACKAGES.arch),)
 	rm -f $(PACKAGES.arch:%=install-%-stamp)
 	dh_testdir
 	dh_testroot
+
+	version=`set -x; awk 'BEGIN{major=minor=0} /^NCURSES_MAJOR/{major=$$3} /^NCURSES_MINOR/{minor=$$3} END{print major "." minor}' < dist.mk`; \
+	sed -i \
+		-e "s, usr/lib, usr/lib/$(DEB_HOST_MULTIARCH)," \
+		-e "s,6\.1,$${version}," \
+		debian/*.lintian-overrides
+
 	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_installdocs       $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%)  NEWS