Source: ncurses
Severity: wishlist
Tags: patch
Dear maintainers,
the attached suggestions for the Debian packaging of ncurses apply on
the current master branch (759ec4a1).
Diffoscope reports the following differences in the eventual (noopt)
debs and udebs.
* The new Commands field appears in libncurses-dev and ncurses-bin.
* ncurses-examples now Depends on perl:any.
This seems OK, tracemunch is a perl script.
* The config scripts and pkgconfig .pc files use ${prefix} instead of
/usr, which is equivalent and more common
(the dh_auto_configure default could be fixed in CONFARGS if necessary).
* The differences in the assembly code are all short and carry label
like gnu-build-id or debug.
dh_dwz is active by default in debhelper 13, inactive by default in
debhelper 14, making the diffoscope output useless, so I have
explicitly enabled it for now.
I have also tried (noopt) -arch and -indep builds.
Thanks in advance for a review.
>From 295ccf03258d4303440d5b4bcab08ae950aa9346 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Wed, 4 Nov 2026 17:01:37 +0100
Subject: [PATCH 01/10] Simplify debian/rules with dpkg Makefile snippets
---
debian/rules | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/debian/rules b/debian/rules
index 0bc489c4..3b27d013 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,30 +2,26 @@
# This file has gone through many maintainers. Mostly rewritten
# by Daniel Jacobowitz.
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS) -Otarget
-endif
-
-export CFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get CFLAGS)
-export CPPFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get CPPFLAGS)
-export CXXFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get LDFLAGS)
-export BUILD_CFLAGS := $(shell DEB_HOST_ARCH=`dpkg --print-architecture` dpkg-buildflags --get CFLAGS)
-export BUILD_CPPFLAGS := $(shell DEB_HOST_ARCH=`dpkg --print-architecture` dpkg-buildflags --get CPPFLAGS)
-export BUILD_LDFLAGS := $(shell DEB_HOST_ARCH=`dpkg --print-architecture` \
+DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# Next line only has an effect if DEB_BUILD_OPTIONS contains parallel=.
+MAKEFLAGS += $(DEB_BUILD_OPTION_PARALLEL:%=-j% -Otarget)
+
+# Next 3 lines only have an effect if dpkg < 1.22.1 (Debian < 13).
+# They will be removed when Debian 14 is released.
+CFLAGS_FOR_BUILD ?= $(shell DEB_HOST_ARCH=$(DEB_BUILD_ARCH) dpkg-buildflags --get CFLAGS)
+CPPFLAGS_FOR_BUILD ?= $(shell DEB_HOST_ARCH=$(DEB_BUILD_ARCH) dpkg-buildflags --get CPPFLAGS)
+LDLAGS_FOR_BUILD ?= $(shell DEB_HOST_ARCH=$(DEB_BUILD_ARCH) \
DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get LDFLAGS)
+export BUILD_CFLAGS = $(CFLAGS_FOR_BUILD)
+export BUILD_CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
+export BUILD_LDFLAGS = $(LDFLAGS_FOR_BUILD)
export ARFLAGS = -crv
-include /usr/share/dpkg/architecture.mk
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-HOST_CC ?= $(DEB_HOST_GNU_TYPE)-gcc
-HOST_CXX ?= $(DEB_HOST_GNU_TYPE)-g++
-else
-HOST_CC ?= gcc
-HOST_CXX ?= g++
-endif
+HOST_CC ?= $(CC)
+HOST_CXX ?= $(CXX)
# These are important since this is a library package
soname=6
--
2.47.3
>From 3115b330b1155fb2be319e712a09ba8c77f9c73a Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 11:37:52 +0100
Subject: [PATCH 02/10] Add comments and references to debian/rules
---
debian/rules | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/rules b/debian/rules
index 3b27d013..85ff8783 100755
--- a/debian/rules
+++ b/debian/rules
@@ -172,6 +172,8 @@ export cf_cv_working_poll=yes
export cf_cv_gpm_soname=libgpm.so.2
endif
+# See bug #1035621 and commit bbd46b39.
+# autoconf-dickey has no -f option.
config.guess-stamp:
dh_update_autotools_config
dh_autoreconf debian/autoconf.sh
@@ -391,6 +393,7 @@ terminfocheck: install-indep
$(workdir)/debian/tidiff /usr/share/terminfo $(fulltempdir)/usr/share/terminfo
install-arch: build-arch install-indep
+# Two passes because install refuses to overwrite.
install -m 644 -t $(fulltempdir)/usr/lib/$(DEB_HOST_MULTIARCH) $(objdir-static)/lib/*.a
install -m 644 -t $(fulltempdir)/usr/lib/$(DEB_HOST_MULTIARCH) $(wobjdir-static)/lib/*.a
@@ -413,6 +416,7 @@ binary-arch: build-arch install-arch
dh_testdir
dh_testroot
dh_installdirs -a
+# Exclude from ncurses-bin terminfos already installed in libncurses-dev.
dh_install -p$(package-bin) -Xncurses6-config -Xncursesw6-config
dh_install -a -N$(package-bin)
dh_installdocs -p$(package-ti) -p$(package-bin) -p$(package-examples)
@@ -441,6 +445,7 @@ endif
dh_compress -p$(package-examples) usr/libexec/ncurses-examples/README
dh_compress -a -N$(package-examples)
dh_fixperms -a
+# Bug 1003929, commit f95536ec
ifneq ($(build_examples),)
chmod -x debian/$(package-examples)/usr/libexec/ncurses-examples/README*
endif
@@ -476,8 +481,11 @@ binary-indep: build-indep install-indep $(check_ti)
dh_installdirs -i
dh_install -i
+# Exclude from ncurses-term terminfos already installed in ncurses-base.
rm -f $$(find debian/$(package-base)/usr/share/terminfo/*/* \
| sed 's/$(package-base)/$(package-term)/')
+# The Ada binding is packaged separately (in libncursesada).
+# debian/FAQ is installed in the first package (ncurses-base).
dh_installdocs -i -Xhtml/Ada95.html -Xhtml/ada/ debian/FAQ
dh_installchangelogs -i NEWS
dh_lintian -i
--
2.47.3
>From b5cea2840adba18ff45b739c2706287c2ba8d1b1 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 11:45:48 +0100
Subject: [PATCH 03/10] Run autoconf-dickey with -i -v options
---
debian/autoconf.sh | 5 -----
debian/rules | 9 +++++++--
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100755 debian/autoconf.sh
diff --git a/debian/autoconf.sh b/debian/autoconf.sh
deleted file mode 100755
index 603b898a..00000000
--- a/debian/autoconf.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-
-autoconf-dickey
-cd test && autoconf-dickey
diff --git a/debian/rules b/debian/rules
index 85ff8783..120dec7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,9 @@ ifneq (,$(filter pkg.ncurses.terminfocheck,$(DEB_BUILD_PROFILES)))
check_ti = terminfocheck
endif
-ifneq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
+ -v_unless_terse = -v
+else
echo = --disable-echo
endif
@@ -176,8 +178,11 @@ endif
# autoconf-dickey has no -f option.
config.guess-stamp:
dh_update_autotools_config
- dh_autoreconf debian/autoconf.sh
+ dh_autoreconf debian/rules -- autoreconf
touch $@
+autoreconf:
+ autoconf-dickey -i $(-v_unless_terse)
+ cd test && autoconf-dickey -i $(-v_unless_terse)
$(objdir)/config.status: config.guess-stamp
test -d $(objdir) || mkdir $(objdir)
--
2.47.3
>From 98002aca5d7b486fcec83c53a35266a4d1961731 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 11:47:38 +0100
Subject: [PATCH 04/10] Merge 3 sed commands into a single one for readability
---
debian/rules | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 120dec7c..dc02f87e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -474,9 +474,7 @@ endif
# We don't install the tic library in the libtinfo6 udeb, adjust the shlibs file
sed -i '/^udeb: libtic /d' debian/$(package-ti)/DEBIAN/shlibs
# For the ncurses udeb, we discard libformw, libmenuw and libpanelw as well
- sed -i '/^udeb: libformw /d' debian/$(package-libw)/DEBIAN/shlibs
- sed -i '/^udeb: libmenuw /d' debian/$(package-libw)/DEBIAN/shlibs
- sed -i '/^udeb: libpanelw /d' debian/$(package-libw)/DEBIAN/shlibs
+ sed -ri '/^udeb: lib(form|menu|panel)w /d' debian/$(package-libw)/DEBIAN/shlibs
dh_md5sums -a
dh_builddeb -a
--
2.47.3
>From b068356295404bae6bfaab022c2db905e74e6137 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 11:54:42 +0100
Subject: [PATCH 05/10] Clarify dh_installdocs --linkdoc thanks to
--remaining-packages
---
debian/rules | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/debian/rules b/debian/rules
index dc02f87e..ee2fcdc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -424,21 +424,17 @@ binary-arch: build-arch install-arch
# Exclude from ncurses-bin terminfos already installed in libncurses-dev.
dh_install -p$(package-bin) -Xncurses6-config -Xncursesw6-config
dh_install -a -N$(package-bin)
- dh_installdocs -p$(package-ti) -p$(package-bin) -p$(package-examples)
- dh_installdocs -a -N$(package-bin) -N$(package-ti) -N$(package-examples) \
- -N$(package-lib-32) -N$(package-libw-32) -N$(package-dev-32) -N$(package-ti-32) \
- -N$(package-lib-64) -N$(package-libw-64) -N$(package-dev-64) -N$(package-ti-64) \
+ dh_installdocs -p$(package-lib) -p$(package-libw) -plibncurses-dev \
--link-doc=$(package-ti)
ifneq ($(build_32),)
- dh_installdocs -p$(package-ti-32)
dh_installdocs -p$(package-lib-32) -p$(package-libw-32) -p$(package-dev-32) \
--link-doc=$(package-ti-32)
endif
ifneq ($(build_64),)
- dh_installdocs -p$(package-ti-64)
dh_installdocs -p$(package-lib-64) -p$(package-libw-64) -p$(package-dev-64) \
--link-doc=$(package-ti-64)
endif
+ dh_installdocs -a --remaining-packages
dh_installchangelogs -a NEWS
dh_installman -a
--
2.47.3
>From bf3fbf7f99565bad3fe10f06bebc2e34a1fcf9b2 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 12:08:38 +0100
Subject: [PATCH 06/10] Reduce duplication for 32/64 bits biarch packages
At most one is built, all recipes and most paths can be shared.
---
debian/lib32ncurses-dev.install | 22 ----
debian/lib32ncurses-dev.links | 5 -
debian/lib32ncurses6.install | 4 -
debian/lib32ncursesw6.install | 4 -
debian/lib32tinfo6.install | 2 -
debian/lib64ncurses-dev.install | 22 ----
debian/lib64ncurses-dev.links | 5 -
debian/lib64ncurses6.install | 4 -
debian/lib64ncursesw6.install | 4 -
debian/lib64tinfo6.install | 2 -
debian/rules | 218 ++++++++++++++------------------
11 files changed, 97 insertions(+), 195 deletions(-)
delete mode 100644 debian/lib32ncurses-dev.install
delete mode 100644 debian/lib32ncurses-dev.links
delete mode 100644 debian/lib32ncurses6.install
delete mode 100644 debian/lib32ncursesw6.install
delete mode 100644 debian/lib32tinfo6.install
delete mode 100644 debian/lib64ncurses-dev.install
delete mode 100644 debian/lib64ncurses-dev.links
delete mode 100644 debian/lib64ncurses6.install
delete mode 100644 debian/lib64ncursesw6.install
delete mode 100644 debian/lib64tinfo6.install
diff --git a/debian/lib32ncurses-dev.install b/debian/lib32ncurses-dev.install
deleted file mode 100644
index b5e4cd07..00000000
--- a/debian/lib32ncurses-dev.install
+++ /dev/null
@@ -1,22 +0,0 @@
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libncurses.so usr/lib32
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libncursesw.so usr/lib32
-obj-32/lib/libtic.so usr/lib32
-obj-32/lib/libform.so usr/lib32
-obj-32/lib/libmenu.so usr/lib32
-obj-32/lib/libpanel.so usr/lib32
-obj-32/lib/libtinfo.so usr/lib32
-obj-32/lib/libncurses.a usr/lib32
-obj-32/lib/libncurses++.a usr/lib32
-obj-32/lib/libtic.a usr/lib32
-obj-32/lib/libform.a usr/lib32
-obj-32/lib/libmenu.a usr/lib32
-obj-32/lib/libpanel.a usr/lib32
-obj-32/lib/libtinfo.a usr/lib32
-obj-wide-32/lib/libformw.so usr/lib32
-obj-wide-32/lib/libmenuw.so usr/lib32
-obj-wide-32/lib/libpanelw.so usr/lib32
-obj-wide-32/lib/libncursesw.a usr/lib32
-obj-wide-32/lib/libncurses++w.a usr/lib32
-obj-wide-32/lib/libformw.a usr/lib32
-obj-wide-32/lib/libmenuw.a usr/lib32
-obj-wide-32/lib/libpanelw.a usr/lib32
diff --git a/debian/lib32ncurses-dev.links b/debian/lib32ncurses-dev.links
deleted file mode 100644
index 92b11d37..00000000
--- a/debian/lib32ncurses-dev.links
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib32/libtinfo.so.6 usr/lib32/libtinfo.so
-usr/lib32/libncurses.so usr/lib32/libcurses.so
-usr/lib32/libncurses.a usr/lib32/libcurses.a
-usr/lib32/libtinfo.so usr/lib32/libtermcap.so
-usr/lib32/libtinfo.a usr/lib32/libtermcap.a
diff --git a/debian/lib32ncurses6.install b/debian/lib32ncurses6.install
deleted file mode 100644
index b68a8229..00000000
--- a/debian/lib32ncurses6.install
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-32/lib/libncurses.so.* usr/lib32
-obj-32/lib/libpanel.so.* usr/lib32
-obj-32/lib/libform.so.* usr/lib32
-obj-32/lib/libmenu.so.* usr/lib32
diff --git a/debian/lib32ncursesw6.install b/debian/lib32ncursesw6.install
deleted file mode 100644
index b54182f2..00000000
--- a/debian/lib32ncursesw6.install
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-wide-32/lib/libncursesw.so.* usr/lib32
-obj-wide-32/lib/libpanelw.so.* usr/lib32
-obj-wide-32/lib/libformw.so.* usr/lib32
-obj-wide-32/lib/libmenuw.so.* usr/lib32
diff --git a/debian/lib32tinfo6.install b/debian/lib32tinfo6.install
deleted file mode 100644
index e4aaa06e..00000000
--- a/debian/lib32tinfo6.install
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-wide-32/lib/libtinfo.so.* usr/lib32
-obj-wide-32/lib/libtic.so.* usr/lib32
diff --git a/debian/lib64ncurses-dev.install b/debian/lib64ncurses-dev.install
deleted file mode 100644
index fd1aba7f..00000000
--- a/debian/lib64ncurses-dev.install
+++ /dev/null
@@ -1,22 +0,0 @@
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libncurses.so usr/lib64
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libncursesw.so usr/lib64
-obj-64/lib/libtic.so usr/lib64
-obj-64/lib/libform.so usr/lib64
-obj-64/lib/libmenu.so usr/lib64
-obj-64/lib/libpanel.so usr/lib64
-obj-64/lib/libtinfo.so usr/lib64
-obj-64/lib/libncurses.a usr/lib64
-obj-64/lib/libncurses++.a usr/lib64
-obj-64/lib/libtic.a usr/lib64
-obj-64/lib/libform.a usr/lib64
-obj-64/lib/libmenu.a usr/lib64
-obj-64/lib/libpanel.a usr/lib64
-obj-64/lib/libtinfo.a usr/lib64
-obj-wide-64/lib/libformw.so usr/lib64
-obj-wide-64/lib/libmenuw.so usr/lib64
-obj-wide-64/lib/libpanelw.so usr/lib64
-obj-wide-64/lib/libncursesw.a usr/lib64
-obj-wide-64/lib/libncurses++w.a usr/lib64
-obj-wide-64/lib/libformw.a usr/lib64
-obj-wide-64/lib/libmenuw.a usr/lib64
-obj-wide-64/lib/libpanelw.a usr/lib64
diff --git a/debian/lib64ncurses-dev.links b/debian/lib64ncurses-dev.links
deleted file mode 100644
index f6e06e40..00000000
--- a/debian/lib64ncurses-dev.links
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib64/libtinfo.so.6 usr/lib64/libtinfo.so
-usr/lib64/libncurses.so usr/lib64/libcurses.so
-usr/lib64/libncurses.a usr/lib64/libcurses.a
-usr/lib64/libtinfo.so usr/lib64/libtermcap.so
-usr/lib64/libtinfo.a usr/lib64/libtermcap.a
diff --git a/debian/lib64ncurses6.install b/debian/lib64ncurses6.install
deleted file mode 100644
index 13ef6808..00000000
--- a/debian/lib64ncurses6.install
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-64/lib/libncurses.so.* usr/lib64
-obj-64/lib/libpanel.so.* usr/lib64
-obj-64/lib/libform.so.* usr/lib64
-obj-64/lib/libmenu.so.* usr/lib64
diff --git a/debian/lib64ncursesw6.install b/debian/lib64ncursesw6.install
deleted file mode 100644
index ad2132d6..00000000
--- a/debian/lib64ncursesw6.install
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-wide-64/lib/libncursesw.so.* usr/lib64
-obj-wide-64/lib/libpanelw.so.* usr/lib64
-obj-wide-64/lib/libformw.so.* usr/lib64
-obj-wide-64/lib/libmenuw.so.* usr/lib64
diff --git a/debian/lib64tinfo6.install b/debian/lib64tinfo6.install
deleted file mode 100644
index 16a43135..00000000
--- a/debian/lib64tinfo6.install
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-wide-64/lib/libtinfo.so.* usr/lib64
-obj-wide-64/lib/libtic.so.* usr/lib64
diff --git a/debian/rules b/debian/rules
index ee2fcdc1..e241d5b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,20 +27,22 @@ HOST_CXX ?= $(CXX)
soname=6
sodepver = (>= 6.6)
+ifeq (32,$(DEB_HOST_ARCH_BITS))
+ biarch_bits = 64
+else
+ biarch_bits = 32
+endif
+
# Name our packages
package-base=ncurses-base
package-bin=ncurses-bin
package-lib=libncurses$(soname)
-package-lib-32=lib32ncurses$(soname)
-package-lib-64=lib64ncurses$(soname)
+package-lib-biarch=lib$(biarch_bits)ncurses$(soname)
package-ti=libtinfo$(soname)
-package-ti-32=lib32tinfo$(soname)
-package-ti-64=lib64tinfo$(soname)
+package-ti-biarch=lib$(biarch_bits)tinfo$(soname)
package-libw=libncursesw$(soname)
-package-libw-32=lib32ncursesw$(soname)
-package-libw-64=lib64ncursesw$(soname)
-package-dev-32=lib32ncurses-dev
-package-dev-64=lib64ncurses-dev
+package-libw-biarch=lib$(biarch_bits)ncursesw$(soname)
+package-dev-biarch=lib$(biarch_bits)ncurses-dev
package-term=ncurses-term
package-examples=ncurses-examples
@@ -52,47 +54,22 @@ srcdir=$(shell pwd)
relsrcdir=..
objdir=$(srcdir)/obj
objdir-static=$(srcdir)/obj-static
-objdir-32=$(srcdir)/obj-32
-objdir-64=$(srcdir)/obj-64
+objdir-biarch=$(srcdir)/obj-biarch
wobjdir=$(srcdir)/obj-wide
wobjdir-static=$(srcdir)/obj-wide-static
-wobjdir-32=$(srcdir)/obj-wide-32
-wobjdir-64=$(srcdir)/obj-wide-64
+wobjdir-biarch=$(srcdir)/obj-wide-biarch
objdir-test=$(srcdir)/obj-test
-ifeq ($(DEB_HOST_ARCH),i386)
-build_64_target = x86_64-$(DEB_HOST_GNU_SYSTEM)
-build_64 = build-64 build-wide-64
-endif
-
-ifeq ($(DEB_HOST_ARCH),powerpc)
-build_64_target = powerpc64-$(DEB_HOST_GNU_SYSTEM)
-build_64 = build-64 build-wide-64
-endif
-
-ifeq ($(DEB_HOST_ARCH),s390)
-build_64_target = s390x-$(DEB_HOST_GNU_SYSTEM)
-build_64 = build-64 build-wide-64
-endif
-
-ifeq ($(DEB_HOST_ARCH),sparc)
-build_64_target = sparc64-$(DEB_HOST_GNU_SYSTEM)
-build_64 = build-64 build-wide-64
-endif
-
-ifeq ($(DEB_HOST_ARCH),amd64)
-build_32_target = i686-$(DEB_HOST_GNU_SYSTEM)
-build_32 = build-32 build-wide-32
-endif
-
-ifeq ($(DEB_HOST_ARCH),ppc64)
-build_32_target = powerpc-$(DEB_HOST_GNU_SYSTEM)
-build_32 = build-32 build-wide-32
-endif
-
-ifneq (,$(filter nobiarch,$(DEB_BUILD_PROFILES)))
-override build_32=
-override build_64=
+biarch_gnu_cpu_i386 = x86-64
+biarch_gnu_cpu_powerpc = powerpc64
+biarch_gnu_cpu_s390 = s390x
+biarch_gnu_cpu_sparc = sparc64
+biarch_gnu_cpu_amd64 = i386
+biarch_gnu_cpu_ppc64 = powerpc
+ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES)))
+ ifdef biarch_gnu_cpu_$(DEB_HOST_ARCH)
+ biarch_stamps = biarch-stamp wide-biarch-stamp
+ endif
endif
ifeq (,$(filter pkg.ncurses.noexamples,$(DEB_BUILD_PROFILES)))
@@ -199,33 +176,19 @@ $(objdir-static)/config.status: config.guess-stamp
--without-gpm \
--disable-widec
-$(objdir-32)/config.status: config.guess-stamp
- test -d $(objdir-32) || mkdir $(objdir-32)
+$(objdir-biarch)/config.status: config.guess-stamp
+ test -d $(objdir-biarch) || mkdir $(objdir-biarch)
cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd $(objdir-32) && CC="$(HOST_CC) -m32" \
- BUILD_CC="gcc" CXX="$(HOST_CXX) -m32" \
+ cd $(objdir-biarch) && CC="$(HOST_CC) -m$(biarch_bits)" \
+ BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
$(relsrcdir)/configure \
$(CONFARGS) \
- --host=$(build_32_target) \
+ --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM) \
--without-gpm \
--disable-widec \
- --libdir=/usr/lib32
-
-$(objdir-64)/config.status: config.guess-stamp
- test -d $(objdir-64) || mkdir $(objdir-64)
-
- cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
- cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd $(objdir-64) && CC="$(HOST_CC) -m64" \
- BUILD_CC="gcc" CXX="$(HOST_CXX) -m64" \
- $(relsrcdir)/configure \
- $(CONFARGS) \
- --host=$(build_64_target) \
- --without-gpm \
- --disable-widec \
- --libdir=/usr/lib64
+ --libdir=/usr/lib$(biarch_bits)
$(wobjdir)/config.status: config.guess-stamp
test -d $(wobjdir) || mkdir $(wobjdir)
@@ -243,33 +206,19 @@ $(wobjdir-static)/config.status: config.guess-stamp
--without-gpm \
--enable-widec
-$(wobjdir-32)/config.status: config.guess-stamp
- test -d $(wobjdir-32) || mkdir $(wobjdir-32)
+$(wobjdir-biarch)/config.status: config.guess-stamp
+ test -d $(wobjdir-biarch) || mkdir $(wobjdir-biarch)
cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd $(wobjdir-32) && CC="$(HOST_CC) -m32" \
- BUILD_CC="gcc" CXX="$(HOST_CXX) -m32" \
+ cd $(wobjdir-biarch) && CC="$(HOST_CC) -m$(biarch_bits)" \
+ BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
$(relsrcdir)/configure \
$(CONFARGS) \
- --host=$(build_32_target) \
+ --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM) \
--without-gpm \
--enable-widec \
- --libdir=/usr/lib32
-
-$(wobjdir-64)/config.status: config.guess-stamp
- test -d $(wobjdir-64) || mkdir $(wobjdir-64)
-
- cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
- cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd $(wobjdir-64) && CC="$(HOST_CC) -m64" \
- BUILD_CC="gcc" CXX="$(HOST_CXX) -m64" \
- $(relsrcdir)/configure \
- $(CONFARGS) \
- --host=$(build_64_target) \
- --without-gpm \
- --enable-widec \
- --libdir=/usr/lib64
+ --libdir=/usr/lib$(biarch_bits)
$(objdir-test)/config.status: build-wide config.guess-stamp
test -d $(objdir-test) || mkdir $(objdir-test)
@@ -282,7 +231,7 @@ build-indep: build-normal build-wide
touch $@
build-arch build: build-indep build-static build-wide-static $(build_examples) \
- $(build_64) $(build_32)
+ $(biarch_stamps)
touch build-arch build
build-normal: $(objdir)/config.status
@@ -293,12 +242,8 @@ build-static: $(objdir-static)/config.status
cd $(objdir-static) && $(MAKE)
touch $@
-build-32: $(objdir-32)/config.status
- cd $(objdir-32) && $(MAKE) CC="$(HOST_CC) -m32" CXX="$(HOST_CXX) -m32"
- touch $@
-
-build-64: $(objdir-64)/config.status
- cd $(objdir-64) && $(MAKE) CC="$(HOST_CC) -m64" CXX="$(HOST_CXX) -m64"
+biarch-stamp: $(objdir-biarch)/config.status
+ cd $(objdir-biarch) && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
touch $@
build-wide: $(wobjdir)/config.status
@@ -311,12 +256,8 @@ build-wide-static: $(wobjdir-static)/config.status
cd $(wobjdir-static) && $(MAKE)
touch $@
-build-wide-32: $(wobjdir-32)/config.status
- cd $(wobjdir-32) && $(MAKE) CC="$(HOST_CC) -m32" CXX="$(HOST_CXX) -m32"
- touch $@
-
-build-wide-64: $(wobjdir-64)/config.status
- cd $(wobjdir-64) && $(MAKE) CC="$(HOST_CC) -m64" CXX="$(HOST_CXX) -m64"
+wide-biarch-stamp: $(wobjdir-biarch)/config.status
+ cd $(wobjdir-biarch) && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
touch $@
build-test: $(objdir-test)/config.status
@@ -327,15 +268,13 @@ clean:
dh_testdir
rm -f build build-arch build-indep
rm -f build-normal build-static build-wide \
- build-wide-static build-test $(build_32) $(build_64)
+ build-wide-static build-test
rm -rf $(objdir)
rm -rf $(objdir-static)
- rm -rf $(objdir-32)
- rm -rf $(objdir-64)
+ rm -rf $(objdir-biarch)
rm -rf $(wobjdir)
rm -rf $(wobjdir-static)
- rm -rf $(wobjdir-32)
- rm -rf $(wobjdir-64)
+ rm -rf $(wobjdir-biarch)
rm -rf $(objdir-test)
dh_autoreconf_clean
dh_clean
@@ -423,16 +362,50 @@ binary-arch: build-arch install-arch
dh_installdirs -a
# Exclude from ncurses-bin terminfos already installed in libncurses-dev.
dh_install -p$(package-bin) -Xncurses6-config -Xncursesw6-config
- dh_install -a -N$(package-bin)
+ifdef biarch_stamps
+ dh_install -p$(package-dev-biarch) \
+ $(tmpdir)/usr/lib/$(DEB_HOST_MULTIARCH)/libncurses.so \
+ $(tmpdir)/usr/lib/$(DEB_HOST_MULTIARCH)/libncursesw.so \
+ obj-biarch/lib/libtic.so \
+ obj-biarch/lib/libform.so \
+ obj-biarch/lib/libmenu.so \
+ obj-biarch/lib/libpanel.so \
+ obj-biarch/lib/libtinfo.so \
+ obj-biarch/lib/libncurses.a \
+ obj-biarch/lib/libncurses++.a \
+ obj-biarch/lib/libtic.a \
+ obj-biarch/lib/libform.a \
+ obj-biarch/lib/libmenu.a \
+ obj-biarch/lib/libpanel.a \
+ obj-biarch/lib/libtinfo.a \
+ obj-wide-biarch/lib/libformw.so \
+ obj-wide-biarch/lib/libmenuw.so \
+ obj-wide-biarch/lib/libpanelw.so \
+ obj-wide-biarch/lib/libncursesw.a \
+ obj-wide-biarch/lib/libncurses++w.a \
+ obj-wide-biarch/lib/libformw.a \
+ obj-wide-biarch/lib/libmenuw.a \
+ obj-wide-biarch/lib/libpanelw.a usr/lib$(biarch_bits)
+ dh_install -p$(package-lib-biarch) \
+ obj-biarch/lib/libncurses.so.* \
+ obj-biarch/lib/libpanel.so.* \
+ obj-biarch/lib/libform.so.* \
+ obj-biarch/lib/libmenu.so.* usr/lib$(biarch_bits)
+ dh_install -p$(package-libw-biarch) \
+ obj-wide-biarch/lib/libncursesw.so.* \
+ obj-wide-biarch/lib/libpanelw.so.* \
+ obj-wide-biarch/lib/libformw.so.* \
+ obj-wide-biarch/lib/libmenuw.so.* usr/lib$(biarch_bits)
+ dh_install -p$(package-ti-biarch) \
+ obj-wide-biarch/lib/libtinfo.so.* \
+ obj-wide-biarch/lib/libtic.so.* usr/lib$(biarch_bits)
+endif
+ dh_install -a --remaining-packages
dh_installdocs -p$(package-lib) -p$(package-libw) -plibncurses-dev \
--link-doc=$(package-ti)
-ifneq ($(build_32),)
- dh_installdocs -p$(package-lib-32) -p$(package-libw-32) -p$(package-dev-32) \
- --link-doc=$(package-ti-32)
-endif
-ifneq ($(build_64),)
- dh_installdocs -p$(package-lib-64) -p$(package-libw-64) -p$(package-dev-64) \
- --link-doc=$(package-ti-64)
+ifdef biarch_stamps
+ dh_installdocs -p$(package-lib-biarch) -p$(package-libw-biarch) -p$(package-dev-biarch) \
+ --link-doc=$(package-ti-biarch)
endif
dh_installdocs -a --remaining-packages
dh_installchangelogs -a NEWS
@@ -442,7 +415,15 @@ endif
dh_dwz -a
dh_strip -a
dh_lintian -a
- dh_link -a
+ifdef biarch_stamps
+ dh_link -p$(package-dev-biarch) \
+ usr/lib$(biarch_bits)/libtinfo.so.6 usr/lib$(biarch_bits)/libtinfo.so \
+ usr/lib$(biarch_bits)/libncurses.so usr/lib$(biarch_bits)/libcurses.so \
+ usr/lib$(biarch_bits)/libncurses.a usr/lib$(biarch_bits)/libcurses.a \
+ usr/lib$(biarch_bits)/libtinfo.so usr/lib$(biarch_bits)/libtermcap.so \
+ usr/lib$(biarch_bits)/libtinfo.a usr/lib$(biarch_bits)/libtermcap.a
+endif
+ dh_link -a --remaining-packages
dh_compress -p$(package-examples) usr/libexec/ncurses-examples/README
dh_compress -a -N$(package-examples)
dh_fixperms -a
@@ -454,15 +435,10 @@ endif
dh_makeshlibs -p$(package-ti) -V "$(package-ti) $(sodepver)" -- -c4
dh_makeshlibs -p$(package-lib) -V "$(package-lib) $(sodepver)" -- -c4
dh_makeshlibs -p$(package-libw) -V "$(package-libw) $(sodepver)" -- -c4
-ifneq ($(build_32),)
- dh_makeshlibs -p$(package-ti-32) -V "$(package-ti-32) $(sodepver)" -- -c4
- dh_makeshlibs -p$(package-lib-32) -V "$(package-lib-32) $(sodepver)" -- -c4
- dh_makeshlibs -p$(package-libw-32) -V "$(package-libw-32) $(sodepver)" -- -c4
-endif
-ifneq ($(build_64),)
- dh_makeshlibs -p$(package-ti-64) -V "$(package-ti-64) $(sodepver)" -- -c4
- dh_makeshlibs -p$(package-lib-64) -V "$(package-lib-64) $(sodepver)" -- -c4
- dh_makeshlibs -p$(package-libw-64) -V "$(package-libw-64) $(sodepver)" -- -c4
+ifdef biarch_stamps
+ dh_makeshlibs -p$(package-ti-biarch) -V "$(package-ti-biarch) $(sodepver)" -- -c4
+ dh_makeshlibs -p$(package-lib-biarch) -V "$(package-lib-biarch) $(sodepver)" -- -c4
+ dh_makeshlibs -p$(package-libw-biarch) -V "$(package-libw-biarch) $(sodepver)" -- -c4
endif
dh_shlibdeps -a
dh_installdeb -a
--
2.47.3
>From 794ec59a585f01d6e7cdda66cb20a177dc84597b Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 13:01:14 +0100
Subject: [PATCH 07/10] Rename build-foo to foo-stamp
Such names are more explicit, and removed by dh_clean.
---
debian/rules | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/debian/rules b/debian/rules
index e241d5b5..8e86ad11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES)))
endif
ifeq (,$(filter pkg.ncurses.noexamples,$(DEB_BUILD_PROFILES)))
-build_examples = build-test
+build_examples = test-stamp
endif
ifneq (,$(filter pkg.ncurses.terminfocheck,$(DEB_BUILD_PROFILES)))
@@ -220,25 +220,25 @@ $(wobjdir-biarch)/config.status: config.guess-stamp
--enable-widec \
--libdir=/usr/lib$(biarch_bits)
-$(objdir-test)/config.status: build-wide config.guess-stamp
+$(objdir-test)/config.status: wide-stamp config.guess-stamp
test -d $(objdir-test) || mkdir $(objdir-test)
export LD_LIBRARY_PATH=$${LD_LIBRARY_PATH}:$(wobjdir)/lib && \
cd $(objdir-test) && \
PKG_CONFIG_LIBDIR=$(wobjdir)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
$(relsrcdir)/test/configure $(CONFARGS-TEST)
-build-indep: build-normal build-wide
+build-indep: normal-stamp wide-stamp
touch $@
-build-arch build: build-indep build-static build-wide-static $(build_examples) \
+build-arch build: build-indep static-stamp wide-static-stamp $(build_examples) \
$(biarch_stamps)
touch build-arch build
-build-normal: $(objdir)/config.status
+normal-stamp: $(objdir)/config.status
cd $(objdir) && $(MAKE)
touch $@
-build-static: $(objdir-static)/config.status
+static-stamp: $(objdir-static)/config.status
cd $(objdir-static) && $(MAKE)
touch $@
@@ -246,13 +246,13 @@ biarch-stamp: $(objdir-biarch)/config.status
cd $(objdir-biarch) && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
touch $@
-build-wide: $(wobjdir)/config.status
+wide-stamp: $(wobjdir)/config.status
cd $(wobjdir) && $(MAKE)
# needed for building the examples
$(MAKE) -C $(wobjdir) DESTDIR=$(wobjdir) install.libs
touch $@
-build-wide-static: $(wobjdir-static)/config.status
+wide-static-stamp: $(wobjdir-static)/config.status
cd $(wobjdir-static) && $(MAKE)
touch $@
@@ -260,15 +260,13 @@ wide-biarch-stamp: $(wobjdir-biarch)/config.status
cd $(wobjdir-biarch) && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
touch $@
-build-test: $(objdir-test)/config.status
+test-stamp: $(objdir-test)/config.status
cd $(objdir-test) && $(MAKE)
touch $@
clean:
dh_testdir
rm -f build build-arch build-indep
- rm -f build-normal build-static build-wide \
- build-wide-static build-test
rm -rf $(objdir)
rm -rf $(objdir-static)
rm -rf $(objdir-biarch)
--
2.47.3
>From 4b32b52fc51000c397ee264f4abaff7061d13d72 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 13:27:38 +0100
Subject: [PATCH 08/10] Use relative paths when possible in debian/rules
This improves the readabilit of logs and prepares the use of generic
recipes.
---
debian/rules | 133 ++++++++++++++++++++++++---------------------------
1 file changed, 62 insertions(+), 71 deletions(-)
diff --git a/debian/rules b/debian/rules
index 8e86ad11..6e294f1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,19 +46,10 @@ package-dev-biarch=lib$(biarch_bits)ncurses-dev
package-term=ncurses-term
package-examples=ncurses-examples
-workdir=$(shell pwd)
+workdir = '$(CURDIR)'
tempdir=debian/tmp
fulltempdir=$(workdir)/$(tempdir)
-
-srcdir=$(shell pwd)
-relsrcdir=..
-objdir=$(srcdir)/obj
-objdir-static=$(srcdir)/obj-static
-objdir-biarch=$(srcdir)/obj-biarch
-wobjdir=$(srcdir)/obj-wide
-wobjdir-static=$(srcdir)/obj-wide-static
-wobjdir-biarch=$(srcdir)/obj-wide-biarch
-objdir-test=$(srcdir)/obj-test
+wobjdir = $(workdir)/obj-wide
biarch_gnu_cpu_i386 = x86-64
biarch_gnu_cpu_powerpc = powerpc64
@@ -161,71 +152,73 @@ autoreconf:
autoconf-dickey -i $(-v_unless_terse)
cd test && autoconf-dickey -i $(-v_unless_terse)
-$(objdir)/config.status: config.guess-stamp
- test -d $(objdir) || mkdir $(objdir)
- cd $(objdir) && $(relsrcdir)/configure \
+obj-normal/config.status: config.guess-stamp
+ test -d obj-normal || mkdir obj-normal
+ cd obj-normal && ../configure \
$(CONFARGS) \
--without-normal \
--disable-widec
-$(objdir-static)/config.status: config.guess-stamp
- test -d $(objdir-static) || mkdir $(objdir-static)
- cd $(objdir-static) && $(relsrcdir)/configure \
+obj-static/config.status: config.guess-stamp
+ test -d obj-static || mkdir obj-static
+ cd obj-static && ../configure \
$(CONFARGS) \
--without-shared \
--without-gpm \
--disable-widec
-$(objdir-biarch)/config.status: config.guess-stamp
- test -d $(objdir-biarch) || mkdir $(objdir-biarch)
+obj-biarch/config.status: config.guess-stamp
+ test -d obj-biarch || mkdir obj-biarch
cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd $(objdir-biarch) && CC="$(HOST_CC) -m$(biarch_bits)" \
+ cd obj-biarch && CC="$(HOST_CC) -m$(biarch_bits)" \
BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
- $(relsrcdir)/configure \
+ ../configure \
$(CONFARGS) \
--host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM) \
--without-gpm \
--disable-widec \
--libdir=/usr/lib$(biarch_bits)
-$(wobjdir)/config.status: config.guess-stamp
- test -d $(wobjdir) || mkdir $(wobjdir)
- cd $(wobjdir) && $(relsrcdir)/configure \
+obj-wide/config.status: config.guess-stamp
+ test -d obj-wide || mkdir obj-wide
+ cd obj-wide && ../configure \
$(CONFARGS) \
--without-normal \
--with-progs \
--enable-widec
-$(wobjdir-static)/config.status: config.guess-stamp
- test -d $(wobjdir-static) || mkdir $(wobjdir-static)
- cd $(wobjdir-static) && $(relsrcdir)/configure \
+obj-wide-static/config.status: config.guess-stamp
+ test -d obj-wide-static || mkdir obj-wide-static
+ cd obj-wide-static && ../configure \
$(CONFARGS) \
--without-shared \
--without-gpm \
--enable-widec
-$(wobjdir-biarch)/config.status: config.guess-stamp
- test -d $(wobjdir-biarch) || mkdir $(wobjdir-biarch)
+obj-wide-biarch/config.status: config.guess-stamp
+ test -d obj-wide-biarch || mkdir obj-wide-biarch
cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd $(wobjdir-biarch) && CC="$(HOST_CC) -m$(biarch_bits)" \
+ cd obj-wide-biarch && CC="$(HOST_CC) -m$(biarch_bits)" \
BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
- $(relsrcdir)/configure \
+ ../configure \
$(CONFARGS) \
--host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM) \
--without-gpm \
--enable-widec \
--libdir=/usr/lib$(biarch_bits)
-$(objdir-test)/config.status: wide-stamp config.guess-stamp
- test -d $(objdir-test) || mkdir $(objdir-test)
- export LD_LIBRARY_PATH=$${LD_LIBRARY_PATH}:$(wobjdir)/lib && \
- cd $(objdir-test) && \
+obj-test/config.status: wide-stamp config.guess-stamp
+ $(MAKE) -C obj-wide DESTDIR=$(wobjdir) install.libs
+
+ test -d obj-test || mkdir obj-test
+ export LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}":$(wobjdir)/lib && \
+ cd obj-test && \
PKG_CONFIG_LIBDIR=$(wobjdir)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
- $(relsrcdir)/test/configure $(CONFARGS-TEST)
+ ../configure $(CONFARGS-TEST)
build-indep: normal-stamp wide-stamp
touch $@
@@ -234,46 +227,44 @@ build-arch build: build-indep static-stamp wide-static-stamp $(build_examples) \
$(biarch_stamps)
touch build-arch build
-normal-stamp: $(objdir)/config.status
- cd $(objdir) && $(MAKE)
+normal-stamp: obj-normal/config.status
+ cd obj-normal && $(MAKE)
touch $@
-static-stamp: $(objdir-static)/config.status
- cd $(objdir-static) && $(MAKE)
+static-stamp: obj-static/config.status
+ cd obj-static && $(MAKE)
touch $@
-biarch-stamp: $(objdir-biarch)/config.status
- cd $(objdir-biarch) && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
+biarch-stamp: obj-biarch/config.status
+ cd obj-biarch && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
touch $@
-wide-stamp: $(wobjdir)/config.status
- cd $(wobjdir) && $(MAKE)
- # needed for building the examples
- $(MAKE) -C $(wobjdir) DESTDIR=$(wobjdir) install.libs
+wide-stamp: obj-wide/config.status
+ cd obj-wide && $(MAKE)
touch $@
-wide-static-stamp: $(wobjdir-static)/config.status
- cd $(wobjdir-static) && $(MAKE)
+wide-static-stamp: obj-wide-static/config.status
+ cd obj-wide-static && $(MAKE)
touch $@
-wide-biarch-stamp: $(wobjdir-biarch)/config.status
- cd $(wobjdir-biarch) && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
+wide-biarch-stamp: obj-wide-biarch/config.status
+ cd obj-wide-biarch && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
touch $@
-test-stamp: $(objdir-test)/config.status
- cd $(objdir-test) && $(MAKE)
+test-stamp: obj-test/config.status
+ cd obj-test && $(MAKE)
touch $@
clean:
dh_testdir
rm -f build build-arch build-indep
- rm -rf $(objdir)
- rm -rf $(objdir-static)
- rm -rf $(objdir-biarch)
- rm -rf $(wobjdir)
- rm -rf $(wobjdir-static)
- rm -rf $(wobjdir-biarch)
- rm -rf $(objdir-test)
+ rm -rf obj-normal
+ rm -rf obj-static
+ rm -rf obj-biarch
+ rm -rf obj-wide
+ rm -rf obj-wide-static
+ rm -rf obj-wide-biarch
+ rm -rf obj-test
dh_autoreconf_clean
dh_clean
@@ -284,11 +275,11 @@ install-indep: build-indep
# We need the tinfo and tic libraries from the wide build, so install the
# non-wide libraries first and overwrite their tinfo tic libraries later.
- $(MAKE) -C $(objdir) install.libs
+ $(MAKE) -C obj-normal install.libs
rm -f $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH)/libtinfo.so*
rm -f $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH)/libtic.so*
- install -m 644 $(objdir)/man/ncurses6-config.1 $(wobjdir)/man
- $(MAKE) -C $(wobjdir) install
+ install -m 644 obj-normal/man/ncurses6-config.1 obj-wide/man
+ $(MAKE) -C obj-wide install
# Move terminfo files to the right place.
mv $(tempdir)/etc/terminfo $(tempdir)/usr/share/terminfo
@@ -299,7 +290,7 @@ install-indep: build-indep
$(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH)/libcurses.so
# Provide header file symlinks under usr/include/ncursesw
- install -d $(fulltempdir)/usr/include/ncursesw
+ install -d $(tempdir)/usr/include/ncursesw
set -e; \
for file in $(tempdir)/usr/include/*.h; do \
ln -s ../$${file##*/} $(tempdir)/usr/include/ncursesw; \
@@ -310,7 +301,7 @@ install-indep: build-indep
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
set -e; \
for ti in hurd rxvt-unicode; do \
- LD_LIBRARY_PATH=$${LD_LIBRARY_PATH}:$(fulltempdir)/usr/lib/$(DEB_HOST_MULTIARCH) \
+ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}":$(fulltempdir)/usr/lib/$(DEB_HOST_MULTIARCH) \
TERMINFO=$(fulltempdir)/usr/share/terminfo \
$(tempdir)/usr/bin/tic -x debian/$$ti.ti; \
done
@@ -323,8 +314,8 @@ else
endif
# Create Debian-specific aliases xterm-debian and rxvt-m
- ln -sf xterm $(fulltempdir)/usr/share/terminfo/x/xterm-debian
- ln -sf rxvt-basic $(fulltempdir)/usr/share/terminfo/r/rxvt-m
+ ln -sf xterm $(tempdir)/usr/share/terminfo/x/xterm-debian
+ ln -sf rxvt-basic $(tempdir)/usr/share/terminfo/r/rxvt-m
# Create an empty /etc/terminfo for the sysadmin.
mkdir -p $(tempdir)/etc/terminfo
@@ -332,12 +323,12 @@ endif
terminfocheck: install-indep
# Compare the just installed terminfo files against the system database
- $(workdir)/debian/tidiff /usr/share/terminfo $(fulltempdir)/usr/share/terminfo
+ debian/tidiff /usr/share/terminfo $(tempdir)/usr/share/terminfo
install-arch: build-arch install-indep
# Two passes because install refuses to overwrite.
- install -m 644 -t $(fulltempdir)/usr/lib/$(DEB_HOST_MULTIARCH) $(objdir-static)/lib/*.a
- install -m 644 -t $(fulltempdir)/usr/lib/$(DEB_HOST_MULTIARCH) $(wobjdir-static)/lib/*.a
+ install -m 644 -t $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH) obj-static/lib/*.a
+ install -m 644 -t $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH) obj-wide-static/lib/*.a
# Always add -ltinfo when linking with -lncurses or -lncursesw
rm -f $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH)/libncurses.so
@@ -347,9 +338,9 @@ install-arch: build-arch install-indep
ifneq ($(build_examples),)
# Install the test programs, sparing the detour to debian/tmp.
- $(MAKE) -C $(objdir-test) DESTDIR=$(workdir)/debian/$(package-examples) install
+ $(MAKE) -C obj-test DESTDIR=$(workdir)/debian/$(package-examples) install
sed -i -e 's%^#!/usr/bin/env perl%#!/usr/bin/perl%' \
- $(workdir)/debian/$(package-examples)/usr/libexec/ncurses-examples/tracemunch
+ debian/$(package-examples)/usr/libexec/ncurses-examples/tracemunch
endif
binary: binary-arch binary-indep
--
2.47.3
>From 724ba05d029864e5c044018e1b6b663b8624c7d3 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 13:50:31 +0100
Subject: [PATCH 09/10] Use generic recipes in debian/rules, reduce conflicting
options
For example, a single place computes --with{,out}-gpm, and it appears
once in the eventual command line.
---
debian/rules | 120 +++++++++++----------------------------------------
1 file changed, 26 insertions(+), 94 deletions(-)
diff --git a/debian/rules b/debian/rules
index 6e294f1a..82d398bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,13 +77,12 @@ else
echo = --disable-echo
endif
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-with_mouse = --with-gpm
-endif
+# In the following, $* is among
+goals = normal wide static wide-static biarch wide-biarch
CONFARGS = --prefix=/usr \
--build=$(DEB_BUILD_GNU_TYPE) \
- --with-shared \
+ --$(if $(filter %static,$*),without,with)-shared \
--mandir=/usr/share/man \
--with-manpage-format=normal \
--without-profile --without-debug \
@@ -93,12 +92,14 @@ CONFARGS = --prefix=/usr \
--enable-const \
--enable-pc-files \
--with-pkg-config-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ $(if $(filter %biarch,$*),--libdir=/usr/lib$(biarch_bits),\
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)) \
--with-install-prefix=$(fulltempdir) \
--without-ada \
--without-tests \
- --without-progs \
- $(with_mouse) \
+ --$(if $(filter wide,$*),with,without)-progs \
+ --$(if $(filter normal/linux wide/linux,$*/$(DEB_HOST_ARCH_OS))\
+ ,with,without)-gpm \
--enable-symlinks \
--disable-setuid-environ \
--disable-root-access \
@@ -125,10 +126,16 @@ CONFARGS-TEST = --prefix=/usr \
--with-curses-dir=$(wobjdir)
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-CONFARGS += --with-build-cc=gcc --host=$(DEB_HOST_GNU_TYPE)
+CONFARGS += --with-build-cc=gcc
CONFARGS-TEST += --host=$(DEB_HOST_GNU_TYPE)
endif
+CONFARGS += $(if $(filter normal wide,$*),--without-normal)
+CONFARGS += $(if $(filter %biarch,$*),\
+ --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM),\
+ --host=$(DEB_HOST_GNU_TYPE))
+CONFARGS += --$(if $(filter wide%,$*),enable,disable)-widec
+
# Exclude terminfo entries shipped by other Debian packages so that we do
# not begin shipping them by accident.
badterminfo = f/fbterm k/kbtin x/xterm-kitty K/KBtin
@@ -152,64 +159,16 @@ autoreconf:
autoconf-dickey -i $(-v_unless_terse)
cd test && autoconf-dickey -i $(-v_unless_terse)
-obj-normal/config.status: config.guess-stamp
- test -d obj-normal || mkdir obj-normal
- cd obj-normal && ../configure \
- $(CONFARGS) \
- --without-normal \
- --disable-widec
-
-obj-static/config.status: config.guess-stamp
- test -d obj-static || mkdir obj-static
- cd obj-static && ../configure \
- $(CONFARGS) \
- --without-shared \
- --without-gpm \
- --disable-widec
-
-obj-biarch/config.status: config.guess-stamp
- test -d obj-biarch || mkdir obj-biarch
-
+$(goals:%=obj-%/config.status): obj-%/config.status:
+ test -d obj-$* || mkdir obj-$*
+ cd obj/$*; $(if $(filter %biarch,$*),\
cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd obj-biarch && CC="$(HOST_CC) -m$(biarch_bits)" \
+ CC="$(HOST_CC) -m$(biarch_bits)" \
BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
+ ) \
../configure \
- $(CONFARGS) \
- --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM) \
- --without-gpm \
- --disable-widec \
- --libdir=/usr/lib$(biarch_bits)
-
-obj-wide/config.status: config.guess-stamp
- test -d obj-wide || mkdir obj-wide
- cd obj-wide && ../configure \
- $(CONFARGS) \
- --without-normal \
- --with-progs \
- --enable-widec
-
-obj-wide-static/config.status: config.guess-stamp
- test -d obj-wide-static || mkdir obj-wide-static
- cd obj-wide-static && ../configure \
- $(CONFARGS) \
- --without-shared \
- --without-gpm \
- --enable-widec
-
-obj-wide-biarch/config.status: config.guess-stamp
- test -d obj-wide-biarch || mkdir obj-wide-biarch
-
- cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
- cf_cv_working_poll=yes; export cf_cv_working_poll; \
- cd obj-wide-biarch && CC="$(HOST_CC) -m$(biarch_bits)" \
- BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
- ../configure \
- $(CONFARGS) \
- --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM) \
- --without-gpm \
- --enable-widec \
- --libdir=/usr/lib$(biarch_bits)
+ $(CONFARGS)
obj-test/config.status: wide-stamp config.guess-stamp
$(MAKE) -C obj-wide DESTDIR=$(wobjdir) install.libs
@@ -227,43 +186,16 @@ build-arch build: build-indep static-stamp wide-static-stamp $(build_examples) \
$(biarch_stamps)
touch build-arch build
-normal-stamp: obj-normal/config.status
- cd obj-normal && $(MAKE)
- touch $@
-
-static-stamp: obj-static/config.status
- cd obj-static && $(MAKE)
- touch $@
-
-biarch-stamp: obj-biarch/config.status
- cd obj-biarch && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
- touch $@
-
-wide-stamp: obj-wide/config.status
- cd obj-wide && $(MAKE)
- touch $@
-
-wide-static-stamp: obj-wide-static/config.status
- cd obj-wide-static && $(MAKE)
- touch $@
-
-wide-biarch-stamp: obj-wide-biarch/config.status
- cd obj-wide-biarch && $(MAKE) CC="$(HOST_CC) -m$(biarch_bits)" CXX="$(HOST_CXX) -m$(biarch_bits)"
- touch $@
-
-test-stamp: obj-test/config.status
- cd obj-test && $(MAKE)
+$(goals:=-stamp) test-stamp: %-stamp: obj-%/config.status
+ cd obj-$* && $(MAKE) $(if $(filter %biarch,$*),\
+ CC="$(HOST_CC) -m$(biarch_bits)" \
+ CXX="$(HOST_CXX) -m$(biarch_bits)")
touch $@
clean:
dh_testdir
rm -f build build-arch build-indep
- rm -rf obj-normal
- rm -rf obj-static
- rm -rf obj-biarch
- rm -rf obj-wide
- rm -rf obj-wide-static
- rm -rf obj-wide-biarch
+ rm -rf $(goals:%=obj-%)
rm -rf obj-test
dh_autoreconf_clean
dh_clean
--
2.47.3
>From f19cb5618b918c4f9b994826447628ded04b1179 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 14 Nov 2026 14:18:25 +0100
Subject: [PATCH 10/10] Switch to the dh sequencer, debhelper 14 and
dh_auto_configure
The three changes would ideally be separate, but affect the same
source lines.
Helper targets: -terminfocheck, +install-indep-stamp
Delegate common settings to dh_auto_configure. Add an ugly
conflicting override --{host,libdir} in the biarch case.
Keep dh_dwz until this commit is validated. Removing it introduces
lots of noise in the diffoscope output.
The --fail-missing was already enabled by default with debhelper 13.
The sequencer completes all install targets, then all binary targets,
and eventually runs dh_missing once, so the -Xusr/lib workaround by
bb3946e9 does not seem necessary anymore.
---
debian/control | 39 +++++----------
debian/rules | 131 +++++++++++++++++++------------------------------
2 files changed, 63 insertions(+), 107 deletions(-)
diff --git a/debian/control b/debian/control
index 01e226b5..d925e398 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: required
Maintainer: Ncurses Maintainers <[email protected]>
Uploaders: Sven Joachim <[email protected]>, Craig Small <[email protected]>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 14),
libgpm-dev [linux-any],
pkgconf,
autoconf-dickey (>= 2.52+20210509),
@@ -19,7 +19,6 @@ Architecture: all
Section: misc
Essential: yes
Multi-Arch: foreign
-Depends: ${misc:Depends}
Provides: ncurses-runtime
Replaces: ncurses-term (<< 6.4+20230603)
Breaks: neovim (<< 0.6.0), vim-common (<< 2:9.0.1000-2),
@@ -37,7 +36,7 @@ Architecture: all
Section: misc
Priority: standard
Multi-Arch: foreign
-Depends: ncurses-base (= ${binary:Version}), ${misc:Depends}
+Depends: ncurses-base (= ${binary:Version})
Replaces: jfbterm (<< 0.4.7-10), kmscon (= 10.0.1-1~bpo13+1),
kon2 (<< 0.3.9b-21), libiterm1 (<< 0.5-9), tn5250 (<< 0.17.4-3),
ncurses-base (<< 6.4+20230625), foot-terminfo (<< 1.15.1-2)
@@ -53,9 +52,7 @@ Description: additional terminal type definitions
Package: libtinfo6
Architecture: any
Priority: optional
-Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: tmux (<< 3.3a-4)
Description: shared low-level terminfo library for terminal handling
The ncurses library routines are a terminal-independent method of
@@ -68,7 +65,6 @@ Package-Type: udeb
Section: debian-installer
Architecture: any
Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}
Build-Profiles: <!noudeb>
Description: shared low-level terminfo library for terminal handling - udeb
The ncurses library routines are a terminal-independent method of
@@ -80,9 +76,8 @@ Description: shared low-level terminfo library for terminal handling - udeb
Package: libncurses6
Architecture: any
Priority: optional
-Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libtinfo6 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libtinfo6 (= ${binary:Version})
Recommends: libgpm2 [linux-any]
Description: shared libraries for terminal handling
The ncurses library routines are a terminal-independent method of
@@ -97,7 +92,7 @@ Section: libdevel
Priority: optional
Multi-Arch: same
Depends: libtinfo6 (= ${binary:Version}), libncurses6 (= ${binary:Version}),
- libncursesw6 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends}
+ libncursesw6 (= ${binary:Version}), libc6-dev | libc-dev
Conflicts: ncurses-dev
Replaces: ncurses-dev
Provides: libncurses5-dev (= ${binary:Version}),
@@ -114,9 +109,8 @@ Description: developer's libraries for ncurses
Package: libncursesw6
Architecture: any
Priority: optional
-Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: libtinfo6 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libtinfo6 (= ${binary:Version})
Recommends: libgpm2 [linux-any]
Description: shared libraries for terminal handling (wide character support)
The ncurses library routines are a terminal-independent method of
@@ -130,7 +124,7 @@ Package-Type: udeb
Section: debian-installer
Architecture: any
Priority: optional
-Depends: libtinfo6-udeb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libtinfo6-udeb (= ${binary:Version})
Build-Profiles: <!noudeb>
Description: shared libraries for terminal handling (wide character support) - udeb
The ncurses library routines are a terminal-independent method of
@@ -143,7 +137,6 @@ Description: shared libraries for terminal handling (wide character support) - u
Package: lib64tinfo6
Architecture: i386 powerpc sparc s390
Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}
Build-Profiles: <!nobiarch>
Description: shared low-level terminfo library for terminal handling (64-bit)
The ncurses library routines are a terminal-independent method of
@@ -156,8 +149,7 @@ Description: shared low-level terminfo library for terminal handling (64-bit)
Package: lib64ncurses6
Architecture: i386 powerpc sparc s390
Priority: optional
-Depends: lib64tinfo6 (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: lib64tinfo6 (= ${binary:Version})
Build-Profiles: <!nobiarch>
Description: shared libraries for terminal handling (64-bit)
The ncurses library routines are a terminal-independent method of
@@ -172,8 +164,7 @@ Description: shared libraries for terminal handling (64-bit)
Package: lib64ncursesw6
Architecture: i386 powerpc sparc s390
Priority: optional
-Depends: lib64tinfo6 (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: lib64tinfo6 (= ${binary:Version})
Build-Profiles: <!nobiarch>
Description: shared libraries for terminal handling (wide character support) (64-bit)
The ncurses library routines are a terminal-independent method of
@@ -192,7 +183,7 @@ Priority: optional
Depends: lib64ncurses6 (= ${binary:Version}),
lib64ncursesw6 (= ${binary:Version}),
lib64tinfo6 (= ${binary:Version}),
- libncurses-dev (= ${binary:Version}), lib64c-dev, ${misc:Depends}
+ libncurses-dev (= ${binary:Version}), lib64c-dev
Suggests: ncurses-doc
Build-Profiles: <!nobiarch>
Description: developer's libraries for ncurses (64-bit)
@@ -208,7 +199,6 @@ Description: developer's libraries for ncurses (64-bit)
Package: lib32tinfo6
Architecture: amd64 ppc64
Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}
Build-Profiles: <!nobiarch>
Description: shared low-level terminfo library for terminal handling (32-bit)
The ncurses library routines are a terminal-independent method of
@@ -221,8 +211,7 @@ Description: shared low-level terminfo library for terminal handling (32-bit)
Package: lib32ncurses6
Architecture: amd64 ppc64
Priority: optional
-Depends: lib32tinfo6 (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: lib32tinfo6 (= ${binary:Version})
Build-Profiles: <!nobiarch>
Description: shared libraries for terminal handling (32-bit)
The ncurses library routines are a terminal-independent method of
@@ -237,8 +226,7 @@ Description: shared libraries for terminal handling (32-bit)
Package: lib32ncursesw6
Architecture: amd64 ppc64
Priority: optional
-Depends: lib32tinfo6 (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: lib32tinfo6 (= ${binary:Version})
Build-Profiles: <!nobiarch>
Description: shared libraries for terminal handling (wide character support) (32-bit)
The ncurses library routines are a terminal-independent method of
@@ -257,7 +245,7 @@ Priority: optional
Depends: lib32ncurses6 (= ${binary:Version}),
lib32ncursesw6 (= ${binary:Version}),
lib32tinfo6 (= ${binary:Version}),
- libncurses-dev (= ${binary:Version}), lib32c-dev, ${misc:Depends}
+ libncurses-dev (= ${binary:Version}), lib32c-dev
Suggests: ncurses-doc
Build-Profiles: <!nobiarch>
Description: developer's libraries for ncurses (32-bit)
@@ -274,7 +262,6 @@ Package: ncurses-bin
Architecture: any
Section: utils
Essential: yes
-Pre-Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
Description: terminal-related programs and man pages
The ncurses library routines are a terminal-independent method of
@@ -288,7 +275,6 @@ Package: ncurses-examples
Architecture: any
Section: misc
Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}
Build-Profiles: <!pkg.ncurses.noexamples>
Description: test programs and examples for ncurses
The ncurses library routines are a terminal-independent method of
@@ -305,7 +291,6 @@ Architecture: all
Section: doc
Priority: optional
Multi-Arch: foreign
-Depends: ${misc:Depends}
Description: developer's guide and documentation for ncurses
The ncurses library routines are a terminal-independent method of
updating character screens with reasonable optimization.
diff --git a/debian/rules b/debian/rules
index 82d398bd..92a1e8d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,10 +80,8 @@ endif
# In the following, $* is among
goals = normal wide static wide-static biarch wide-biarch
-CONFARGS = --prefix=/usr \
- --build=$(DEB_BUILD_GNU_TYPE) \
+CONFARGS = \
--$(if $(filter %static,$*),without,with)-shared \
- --mandir=/usr/share/man \
--with-manpage-format=normal \
--without-profile --without-debug \
--disable-rpath \
@@ -92,8 +90,7 @@ CONFARGS = --prefix=/usr \
--enable-const \
--enable-pc-files \
--with-pkg-config-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
- $(if $(filter %biarch,$*),--libdir=/usr/lib$(biarch_bits),\
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)) \
+ $(if $(filter %biarch,$*),--libdir=/usr/lib$(biarch_bits)) \
--with-install-prefix=$(fulltempdir) \
--without-ada \
--without-tests \
@@ -115,8 +112,7 @@ CONFARGS = --prefix=/usr \
--enable-overwrite \
--with-xterm-kbs=del
-CONFARGS-TEST = --prefix=/usr \
- --build=$(DEB_BUILD_GNU_TYPE) \
+CONFARGS-TEST = \
--bindir=/usr/libexec/ncurses-examples \
--datadir=/usr/share/ncurses-examples \
--disable-stripping \
@@ -127,13 +123,11 @@ CONFARGS-TEST = --prefix=/usr \
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
CONFARGS += --with-build-cc=gcc
-CONFARGS-TEST += --host=$(DEB_HOST_GNU_TYPE)
endif
CONFARGS += $(if $(filter normal wide,$*),--without-normal)
CONFARGS += $(if $(filter %biarch,$*),\
- --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM),\
- --host=$(DEB_HOST_GNU_TYPE))
+ --host=$(biarch_gnu_cpu_$(DEB_HOST_ARCH))-$(DEB_HOST_GNU_SYSTEM))
CONFARGS += --$(if $(filter wide%,$*),enable,disable)-widec
# Exclude terminfo entries shipped by other Debian packages so that we do
@@ -149,42 +143,38 @@ export cf_cv_working_poll=yes
export cf_cv_gpm_soname=libgpm.so.2
endif
+%:
+ dh $@
+
# See bug #1035621 and commit bbd46b39.
# autoconf-dickey has no -f option.
-config.guess-stamp:
- dh_update_autotools_config
+override_dh_autoreconf:
dh_autoreconf debian/rules -- autoreconf
- touch $@
autoreconf:
autoconf-dickey -i $(-v_unless_terse)
cd test && autoconf-dickey -i $(-v_unless_terse)
$(goals:%=obj-%/config.status): obj-%/config.status:
- test -d obj-$* || mkdir obj-$*
- cd obj/$*; $(if $(filter %biarch,$*),\
+ $(if $(filter %biarch,$*),\
cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \
cf_cv_working_poll=yes; export cf_cv_working_poll; \
CC="$(HOST_CC) -m$(biarch_bits)" \
BUILD_CC="gcc" CXX="$(HOST_CXX) -m$(biarch_bits)" \
- ) \
- ../configure \
+ ) dh_auto_configure -Bobj-$* -- \
$(CONFARGS)
-obj-test/config.status: wide-stamp config.guess-stamp
+obj-test/config.status: wide-stamp
$(MAKE) -C obj-wide DESTDIR=$(wobjdir) install.libs
- test -d obj-test || mkdir obj-test
export LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}":$(wobjdir)/lib && \
- cd obj-test && \
PKG_CONFIG_LIBDIR=$(wobjdir)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
- ../configure $(CONFARGS-TEST)
-
-build-indep: normal-stamp wide-stamp
- touch $@
+ dh_auto_configure -Dtest -Bobj-test -- $(CONFARGS-TEST)
-build-arch build: build-indep static-stamp wide-static-stamp $(build_examples) \
- $(biarch_stamps)
- touch build-arch build
+override_dh_auto_configure:
+override_dh_auto_build-indep: normal-stamp wide-stamp
+override_dh_auto_build-arch: normal-stamp wide-stamp \
+ static-stamp wide-static-stamp $(build_examples) $(biarch_stamps)
+override_dh_auto_check:
$(goals:=-stamp) test-stamp: %-stamp: obj-%/config.status
cd obj-$* && $(MAKE) $(if $(filter %biarch,$*),\
@@ -192,19 +182,11 @@ $(goals:=-stamp) test-stamp: %-stamp: obj-%/config.status
CXX="$(HOST_CXX) -m$(biarch_bits)")
touch $@
-clean:
- dh_testdir
- rm -f build build-arch build-indep
+override_dh_auto_clean:
rm -rf $(goals:%=obj-%)
rm -rf obj-test
- dh_autoreconf_clean
- dh_clean
-
-install-indep: build-indep
- dh_testdir
- dh_testroot
- dh_prep
+install-indep-stamp:
# We need the tinfo and tic libraries from the wide build, so install the
# non-wide libraries first and overwrite their tinfo tic libraries later.
$(MAKE) -C obj-normal install.libs
@@ -253,11 +235,15 @@ endif
mkdir -p $(tempdir)/etc/terminfo
install --mode 644 debian/README.etc $(tempdir)/etc/terminfo/README
-terminfocheck: install-indep
+ifdef check_ti
# Compare the just installed terminfo files against the system database
debian/tidiff /usr/share/terminfo $(tempdir)/usr/share/terminfo
+endif
-install-arch: build-arch install-indep
+ touch $@
+
+override_dh_auto_install-indep: install-indep-stamp
+override_dh_auto_install-arch: install-indep-stamp
# Two passes because install refuses to overwrite.
install -m 644 -t $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH) obj-static/lib/*.a
install -m 644 -t $(tempdir)/usr/lib/$(DEB_HOST_MULTIARCH) obj-wide-static/lib/*.a
@@ -275,12 +261,7 @@ ifneq ($(build_examples),)
debian/$(package-examples)/usr/libexec/ncurses-examples/tracemunch
endif
-binary: binary-arch binary-indep
-
-binary-arch: build-arch install-arch
- dh_testdir
- dh_testroot
- dh_installdirs -a
+override_dh_install-arch:
# Exclude from ncurses-bin terminfos already installed in libncurses-dev.
dh_install -p$(package-bin) -Xncurses6-config -Xncursesw6-config
ifdef biarch_stamps
@@ -322,6 +303,8 @@ ifdef biarch_stamps
obj-wide-biarch/lib/libtic.so.* usr/lib$(biarch_bits)
endif
dh_install -a --remaining-packages
+
+override_dh_installdocs-arch:
dh_installdocs -p$(package-lib) -p$(package-libw) -plibncurses-dev \
--link-doc=$(package-ti)
ifdef biarch_stamps
@@ -329,30 +312,36 @@ ifdef biarch_stamps
--link-doc=$(package-ti-biarch)
endif
dh_installdocs -a --remaining-packages
- dh_installchangelogs -a NEWS
- dh_installman -a
- # Strip the packages, shipping detached debugging symbols.
- dh_dwz -a
- dh_strip -a
- dh_lintian -a
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
+
ifdef biarch_stamps
+override_dh_link-arch:
dh_link -p$(package-dev-biarch) \
usr/lib$(biarch_bits)/libtinfo.so.6 usr/lib$(biarch_bits)/libtinfo.so \
usr/lib$(biarch_bits)/libncurses.so usr/lib$(biarch_bits)/libcurses.so \
usr/lib$(biarch_bits)/libncurses.a usr/lib$(biarch_bits)/libcurses.a \
usr/lib$(biarch_bits)/libtinfo.so usr/lib$(biarch_bits)/libtermcap.so \
usr/lib$(biarch_bits)/libtinfo.a usr/lib$(biarch_bits)/libtermcap.a
-endif
dh_link -a --remaining-packages
- dh_compress -p$(package-examples) usr/libexec/ncurses-examples/README
- dh_compress -a -N$(package-examples)
- dh_fixperms -a
+endif
+
+# TODO: this reduces a lot the diffoscope output between debhelper 13
+# and 14, but should eventually be removed.
+execute_before_dh_strip-arch:
+ dh_dwz -a
+
# Bug 1003929, commit f95536ec
+# With debhelper 14, dh_fixperms comes before dh_compress.
ifneq ($(build_examples),)
- chmod -x debian/$(package-examples)/usr/libexec/ncurses-examples/README*
+override_dh_compress-arch:
+ chmod -x debian/$(package-examples)/usr/libexec/ncurses-examples/README
+ dh_compress -p$(package-examples) usr/libexec/ncurses-examples/README
+ dh_compress -a -N$(package-examples)
endif
- dh_missing -a --fail-missing
+
+override_dh_makeshlibs-arch:
dh_makeshlibs -p$(package-ti) -V "$(package-ti) $(sodepver)" -- -c4
dh_makeshlibs -p$(package-lib) -V "$(package-lib) $(sodepver)" -- -c4
dh_makeshlibs -p$(package-libw) -V "$(package-libw) $(sodepver)" -- -c4
@@ -361,37 +350,19 @@ ifdef biarch_stamps
dh_makeshlibs -p$(package-lib-biarch) -V "$(package-lib-biarch) $(sodepver)" -- -c4
dh_makeshlibs -p$(package-libw-biarch) -V "$(package-libw-biarch) $(sodepver)" -- -c4
endif
- dh_shlibdeps -a
- dh_installdeb -a
- dh_gencontrol -a
+
+execute_after_dh_gencontrol-arch:
# We don't install the tic library in the libtinfo6 udeb, adjust the shlibs file
sed -i '/^udeb: libtic /d' debian/$(package-ti)/DEBIAN/shlibs
# For the ncurses udeb, we discard libformw, libmenuw and libpanelw as well
sed -ri '/^udeb: lib(form|menu|panel)w /d' debian/$(package-libw)/DEBIAN/shlibs
- dh_md5sums -a
- dh_builddeb -a
-
-binary-indep: build-indep install-indep $(check_ti)
- dh_testdir
- dh_testroot
- dh_installdirs -i
- dh_install -i
# Exclude from ncurses-term terminfos already installed in ncurses-base.
+execute_after_dh_install-indep:
rm -f $$(find debian/$(package-base)/usr/share/terminfo/*/* \
| sed 's/$(package-base)/$(package-term)/')
+
# The Ada binding is packaged separately (in libncursesada).
# debian/FAQ is installed in the first package (ncurses-base).
+override_dh_installdocs-indep:
dh_installdocs -i -Xhtml/Ada95.html -Xhtml/ada/ debian/FAQ
- dh_installchangelogs -i NEWS
- dh_lintian -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_missing -i --fail-missing -Xusr/lib
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-.PHONY: binary binary-arch binary-indep clean install-indep install-arch
--
2.47.3