From: nicolas@debian.org
Package: kbd
Followup-For: Bug #766240
Hello.
Please ignore 0002-0009 in the previous message
and read the attached new 0002-0008 instead.
Thanks.
From 8bebfb7e6e43faa10e046a85c3e275195121e7eb Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Tue, 24 Feb 2026 14:14:36 +0100
Subject: [PATCH 2/8] Remove obsolete console-utilities virtual package
---
debian/control | 2 --
1 file changed, 2 deletions(-)
diff --git a/debian/control b/debian/control
index 73e53bf..89eeef0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,6 @@ Package: kbd
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: console-setup | console-data
-Provides: console-utilities
-Conflicts: console-utilities
Description: Linux console font and keytable utilities
This package allows you to set up the Linux console, change the font,
resize text mode virtual consoles and remap the keyboard.
--
2.47.3
From 3fdf9a3f6d9ebefba5aea5d4e8c10934945b091f Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Tue, 24 Feb 2026 14:15:34 +0100
Subject: [PATCH 3/8] Wrap and sort build dependencies
---
debian/control | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 89eeef0..c5a1dca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,15 @@ Section: utils
Priority: optional
Maintainer: Console utilities maintainers
Uploaders: Michael Schutte , Anton Zinoviev <
inoviev@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1), debhelper-compat (= 13),
- linuxdoc-tools, gettext, flex, bison, pkgconf, check
+Build-Depends:
+ bison,
+ check,
+ debhelper-compat (= 13),
+ dpkg-dev (>= 1.16.1),
+ flex,
+ gettext,
+ linuxdoc-tools,
+ pkgconf,
Standards-Version: 4.1.5
Homepage: https://kbd-project.org/
Vcs-Git: https://salsa.debian.org/debian/kbd.git
--
2.47.3
From 73ddf213b8854a56ec488fb902e124949095e5a2 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Tue, 24 Feb 2026 14:15:59 +0100
Subject: [PATCH 4/8] Remove obsolete version restriction on the dpkg-dev build
dependency
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index c5a1dca..af8fc53 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends:
bison,
check,
debhelper-compat (= 13),
- dpkg-dev (>= 1.16.1),
flex,
gettext,
linuxdoc-tools,
--
2.47.3
From 396c94b46c3328b708569a88fe606aee162bbc6e Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Tue, 24 Feb 2026 14:17:50 +0100
Subject: [PATCH 5/8] Standards-Version 4.7.3
---
debian/control | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index af8fc53..e59a5c9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,5 @@
Source: kbd
Section: utils
-Priority: optional
Maintainer: Console utilities maintainers
Uploaders: Michael Schutte , Anton Zinoviev <
inoviev@debian.org>
Build-Depends:
@@ -11,7 +10,7 @@ Build-Depends:
gettext,
linuxdoc-tools,
pkgconf,
-Standards-Version: 4.1.5
+Standards-Version: 4.7.3
Homepage: https://kbd-project.org/
Vcs-Git: https://salsa.debian.org/debian/kbd.git
Vcs-Browser: https://salsa.debian.org/debian/kbd
--
2.47.3
From 50cce7c4f04e03dccf8106eaa27f1035a5fc5f1d Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Wed, 25 Feb 2026 04:45:32 +0100
Subject: [PATCH 6/8] Simplify debian/rules
Instal mk_modmap with a debhelper configuration file.
When debian/rules install files by itself, select the right place
directly instead of moving some later.
Build out of the source tree. This simplifies the clean target, but
also makes it possible to build twice in a row (for deb and udeb).
I assume '-Os -g' was intending '-Os $(filter-out -O%,$(CFLAGS))'.
Set this during configuration instead of duplicating the setting for
each Make.
Delegate as much as possible to debhelper, which for example sets
CFLAGS and CC.
---
debian/kbd.dirs | 2 -
debian/kbd.install | 5 +++
debian/rules | 98 +++++++++++++++++++---------------------------
3 files changed, 46 insertions(+), 59 deletions(-)
delete mode 100644 debian/kbd.dirs
create mode 100644 debian/kbd.install
diff --git a/debian/kbd.dirs b/debian/kbd.dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/kbd.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/kbd.install b/debian/kbd.install
new file mode 100644
index 0000000..0cdd7f5
--- /dev/null
+++ b/debian/kbd.install
@@ -0,0 +1,5 @@
+data/keymaps/i386/mk_modmap usr/bin
+
+docs/doc/iso8859.info usr/share/doc/kbd/charsets
+docs/doc/iso*.txt usr/share/doc/kbd/charsets
+docs/doc/cp*.txt usr/share/doc/kbd/charsets
diff --git a/debian/rules b/debian/rules
index 684a0b0..cea0c0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,85 +1,69 @@
#!/usr/bin/make -f
-TOPDIR = $(shell pwd)
[continued in next message]
--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)
|
