Control: tags -1 + patch
Hi,
please find patches attached to convert from CDBS to debhelper.
I've checked the resulting debs and udebs with diffoscope (against a
fresh cdbs build). The only difference in the results I can spot are
timestamp differences.
Difference at build time:
- autotools files get rebuilt. This may have been desired before, but if
so, it did not work. Patches against Makefile.am are added to fix
trivial bugs in the upstream build system.
Best,
Chris
>From f98b5c2df8ef1bc64ff4602bbc69feec6c8c9f64 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Sun, 9 Mar 2025 16:30:33 +0100
Subject: [PATCH 1/2] Switch from cdbs to dh sequencer, compat 13
---
debian/compat | 1 -
debian/console-data.docs | 1 +
debian/console-keymaps-acorn.install | 112 ++++++++++++------------
debian/console-keymaps-amiga.install | 14 +--
debian/console-keymaps-at.install | 124 +++++++++++++--------------
debian/console-keymaps-atari.install | 10 +--
debian/console-keymaps-dec.install | 2 +-
debian/console-keymaps-mac.install | 12 +--
debian/console-keymaps-sun.install | 36 ++++----
debian/console-keymaps-usb.install | 48 +++++------
debian/control | 2 +-
debian/rules | 38 ++++----
debian/source/options | 1 -
13 files changed, 201 insertions(+), 200 deletions(-)
delete mode 100644 debian/compat
delete mode 100644 debian/source/options
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/console-data.docs b/debian/console-data.docs
index 2fcf63a..b123df9 100644
--- a/debian/console-data.docs
+++ b/debian/console-data.docs
@@ -1,3 +1,4 @@
+README
doc/keymaps/
doc/fonts/
doc/README.acm
diff --git a/debian/console-keymaps-acorn.install
b/debian/console-keymaps-acorn.install
index cf68cdf..72cb14f 100644
--- a/debian/console-keymaps-acorn.install
+++ b/debian/console-keymaps-acorn.install
@@ -1,58 +1,58 @@
-debian/tmp/usr/share/keymaps/i386/qwerty/us.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/azerty/be2-latin1.kmap.gz
usr/share/acorn/azerty
-debian/tmp/usr/share/keymaps/i386/azerty/be-latin1.kmap.gz
usr/share/acorn/azerty
-debian/tmp/usr/share/keymaps/i386/qwerty/br-abnt2.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/br-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/bg.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/croat.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/cz-lat2.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/dk-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/dvorak/dvorak.kmap.gz
usr/share/acorn/dvorak
-debian/tmp/usr/share/keymaps/i386/qwerty/fi-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/azerty/fr-latin9.kmap.gz
usr/share/acorn/azerty
-debian/tmp/usr/share/keymaps/i386/azerty/fr-latin1.kmap.gz
usr/share/acorn/azerty
-debian/tmp/usr/share/keymaps/i386/qwerty/gr.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/cf.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ca-multi.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/de-latin1.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/include/compose.latin1.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps/i386/qwerty/hebrew.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/hu.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/is-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/is-latin1-us.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/it.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/kg.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/jp106.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/lv-latin4.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/lt.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mk.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/no-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/nl.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/pl.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/pt-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ro.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ru.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/se-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/slovene.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/sr.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/sk-qwerty.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/es.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/la-latin1.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/fr_CH-latin1.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/sg-latin1.kmap.gz
usr/share/acorn/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/trqu.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/fgGIod/trfu.kmap.gz
usr/share/acorn/fgGIod
-debian/tmp/usr/share/keymaps-acorn/i386/qwerty/ua-utf.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/uk.kmap.gz
usr/share/acorn/qwerty
-debian/tmp/usr/share/keymaps/i386/include/euro.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/qwerty-layout.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/qwertz-layout.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/azerty-layout.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/linux-keys-bare.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/linux-keys-extd.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc.gz
usr/share/acorn/include
-debian/tmp/usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/qwerty/us.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/azerty/be2-latin1.kmap.gz
usr/share/acorn/azerty
+usr/share/keymaps/i386/azerty/be-latin1.kmap.gz
usr/share/acorn/azerty
+usr/share/keymaps/i386/qwerty/br-abnt2.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/br-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/bg.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwertz/croat.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwerty/cz-lat2.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/dk-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/dvorak/dvorak.kmap.gz
usr/share/acorn/dvorak
+usr/share/keymaps/i386/qwerty/fi-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/azerty/fr-latin9.kmap.gz
usr/share/acorn/azerty
+usr/share/keymaps/i386/azerty/fr-latin1.kmap.gz
usr/share/acorn/azerty
+usr/share/keymaps/i386/qwerty/gr.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/cf.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/ca-multi.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwertz/de-latin1.kmap.gz usr/share/acorn/qwertz
+usr/share/keymaps/include/compose.latin1.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/qwerty/hebrew.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwertz/hu.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwerty/is-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/is-latin1-us.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/it.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/kg.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/jp106.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/lv-latin4.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/lt.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/mk.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/no-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/nl.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/pl.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/pt-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/ro.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/ru.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/se-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwertz/slovene.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwertz/sr.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwerty/sk-qwerty.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/es.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/la-latin1.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwertz/fr_CH-latin1.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwertz/sg-latin1.kmap.gz
usr/share/acorn/qwertz
+usr/share/keymaps/i386/qwerty/trqu.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/fgGIod/trfu.kmap.gz
usr/share/acorn/fgGIod
+usr/share/keymaps-acorn/i386/qwerty/ua-utf.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/qwerty/uk.kmap.gz
usr/share/acorn/qwerty
+usr/share/keymaps/i386/include/euro.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/qwerty-layout.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/qwertz-layout.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/azerty-layout.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/linux-keys-bare.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/linux-keys-extd.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc.gz
usr/share/acorn/include
+usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc.gz
usr/share/acorn/include
debian/udeb/console-keymaps-acorn
usr/share/console/lists
diff --git a/debian/console-keymaps-amiga.install
b/debian/console-keymaps-amiga.install
index f416acf..ce195ed 100644
--- a/debian/console-keymaps-amiga.install
+++ b/debian/console-keymaps-amiga.install
@@ -1,9 +1,9 @@
-debian/tmp/usr/share/keymaps/amiga/amiga-us.kmap.gz
usr/share/keymaps/amiga
-debian/tmp/usr/share/keymaps/amiga/amiga-fr.kmap.gz
usr/share/keymaps/amiga
-debian/tmp/usr/share/keymaps/amiga/amiga-de.kmap.gz
usr/share/keymaps/amiga
-debian/tmp/usr/share/keymaps/amiga/amiga-it.kmap.gz
usr/share/keymaps/amiga
-debian/tmp/usr/share/keymaps/amiga/amiga-es.kmap.gz
usr/share/keymaps/amiga
-debian/tmp/usr/share/keymaps/amiga/amiga-se.kmap.gz
usr/share/keymaps/amiga
-debian/tmp/usr/share/keymaps/amiga/amiga-sg.kmap.gz
usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-us.kmap.gz usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-fr.kmap.gz usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-de.kmap.gz usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-it.kmap.gz usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-es.kmap.gz usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-se.kmap.gz usr/share/keymaps/amiga
+usr/share/keymaps/amiga/amiga-sg.kmap.gz usr/share/keymaps/amiga
debian/udeb/console-keymaps-amiga
usr/share/console/lists
diff --git a/debian/console-keymaps-at.install
b/debian/console-keymaps-at.install
index 2a14df4..7c36a6d 100644
--- a/debian/console-keymaps-at.install
+++ b/debian/console-keymaps-at.install
@@ -1,65 +1,65 @@
-debian/tmp/usr/share/keymaps/i386/qwerty/us.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/azerty/be-latin1.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/azerty/be2-latin1.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/qwerty/br-abnt2.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/br-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/bg.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ca-multi.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/croat.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/cz-lat2.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/dk-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/dvorak/dvorak.kmap.gz
usr/share/keymaps/i386/dvorak
-debian/tmp/usr/share/keymaps/i386/qwerty/et.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/fa.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/fi-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/azerty/fr-latin9.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/azerty/fr-latin1.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/azerty/wo.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/qwerty/gr.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/gr-utf8.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/cf.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/de-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/include/compose.latin1.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps/i386/qwerty/hebrew.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/hu.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/is-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/is-latin1-us.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/it.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/kg.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/jp106.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/lv-latin4.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/lt.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mk.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/no-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/nl.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/pl.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/pt-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ro.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ru.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/se-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/slovene.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/sr.kmap.gz
+usr/share/keymaps/i386/qwerty/us.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/azerty/be-latin1.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/azerty/be2-latin1.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/qwerty/br-abnt2.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/br-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/bg.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/ca-multi.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/croat.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwerty/cz-lat2.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/dk-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/dvorak/dvorak.kmap.gz
usr/share/keymaps/i386/dvorak
+usr/share/keymaps/i386/qwerty/et.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/fa.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/fi-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/azerty/fr-latin9.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/azerty/fr-latin1.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/azerty/wo.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/qwerty/gr.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/gr-utf8.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/cf.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwertz/de-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/include/compose.latin1.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/qwerty/hebrew.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/hu.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwerty/is-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/is-latin1-us.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/it.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/kg.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/jp106.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/lv-latin4.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/lt.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/mk.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/no-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/nl.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/pl.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/pt-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/ro.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/ru.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/se-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/slovene.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwertz/sr.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/sk-qwerty.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/th-tis.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/es.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/la-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/fr_CH-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/sg-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/trqu.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/fgGIod/trfu.kmap.gz
usr/share/keymaps/i386/fgGIod
-debian/tmp/usr/share/keymaps/i386/qwerty/ua.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/ua-utf.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/uk.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/include/euro.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/qwerty-layout.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/qwertz-layout.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/azerty-layout.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/linux-keys-bare.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/linux-keys-extd.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc.gz
usr/share/keymaps/i386/include
-debian/tmp/usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/qwerty/sk-qwerty.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/th-tis.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/es.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/la-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/fr_CH-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwertz/sg-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwerty/trqu.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/fgGIod/trfu.kmap.gz
usr/share/keymaps/i386/fgGIod
+usr/share/keymaps/i386/qwerty/ua.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/ua-utf.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/uk.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/include/euro.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/qwerty-layout.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/qwertz-layout.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/azerty-layout.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/linux-keys-bare.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/linux-keys-extd.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc.gz
usr/share/keymaps/i386/include
+usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc.gz
usr/share/keymaps/i386/include
debian/udeb/console-keymaps-at
usr/share/console/lists
diff --git a/debian/console-keymaps-atari.install
b/debian/console-keymaps-atari.install
index 63e5680..c4cc194 100644
--- a/debian/console-keymaps-atari.install
+++ b/debian/console-keymaps-atari.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/share/keymaps/atari/atari-us.kmap.gz usr/share/keymaps/atari
-debian/tmp/usr/share/keymaps/atari/atari-de.kmap.gz usr/share/keymaps/atari
-debian/tmp/usr/share/keymaps/atari/atari-se.kmap.gz usr/share/keymaps/atari
-debian/tmp/usr/share/keymaps/atari/atari-uk.kmap.gz usr/share/keymaps/atari
-debian/tmp/usr/share/keymaps/atari/atari-fr.kmap.gz
usr/share/keymaps/atari
+usr/share/keymaps/atari/atari-us.kmap.gz usr/share/keymaps/atari
+usr/share/keymaps/atari/atari-de.kmap.gz usr/share/keymaps/atari
+usr/share/keymaps/atari/atari-se.kmap.gz usr/share/keymaps/atari
+usr/share/keymaps/atari/atari-uk.kmap.gz usr/share/keymaps/atari
+usr/share/keymaps/atari/atari-fr.kmap.gz usr/share/keymaps/atari
debian/udeb/console-keymaps-atari
usr/share/console/lists
diff --git a/debian/console-keymaps-dec.install
b/debian/console-keymaps-dec.install
index 0f3a77d..81145ea 100644
--- a/debian/console-keymaps-dec.install
+++ b/debian/console-keymaps-dec.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/keymaps/i386/qwerty/lk201-us.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/lk201-us.kmap.gz
usr/share/keymaps/i386/qwerty
debian/udeb/console-keymaps-dec
usr/share/console/lists
diff --git a/debian/console-keymaps-mac.install
b/debian/console-keymaps-mac.install
index b077003..fcb37d8 100644
--- a/debian/console-keymaps-mac.install
+++ b/debian/console-keymaps-mac.install
@@ -1,7 +1,7 @@
-debian/tmp/usr/share/keymaps/mac/mac-us-std.kmap.gz usr/share/keymaps/mac
-debian/tmp/usr/share/keymaps/mac/mac-us-ext.kmap.gz usr/share/keymaps/mac
-debian/tmp/usr/share/keymaps/mac/mac-de2-ext.kmap.gz usr/share/keymaps/mac
-debian/tmp/usr/share/keymaps/mac/mac-fr2-ext.kmap.gz usr/share/keymaps/mac
-debian/tmp/usr/share/keymaps/mac/mac-fr3.kmap.gz
usr/share/keymaps/mac
-debian/tmp/usr/share/keymaps/mac/mac-es.kmap.gz
usr/share/keymaps/mac
+usr/share/keymaps/mac/mac-us-std.kmap.gz usr/share/keymaps/mac
+usr/share/keymaps/mac/mac-us-ext.kmap.gz usr/share/keymaps/mac
+usr/share/keymaps/mac/mac-de2-ext.kmap.gz usr/share/keymaps/mac
+usr/share/keymaps/mac/mac-fr2-ext.kmap.gz usr/share/keymaps/mac
+usr/share/keymaps/mac/mac-fr3.kmap.gz usr/share/keymaps/mac
+usr/share/keymaps/mac/mac-es.kmap.gz usr/share/keymaps/mac
debian/udeb/console-keymaps-mac usr/share/console/lists
diff --git a/debian/console-keymaps-sun.install
b/debian/console-keymaps-sun.install
index 667e1c9..62ca099 100644
--- a/debian/console-keymaps-sun.install
+++ b/debian/console-keymaps-sun.install
@@ -1,19 +1,19 @@
-debian/tmp/usr/share/keymaps/sun/sunkeymap.kmap.gz usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sundvorak.kmap.gz usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-fi-latin1.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-fr-latin1.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-de-latin1.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-ru.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt4-es.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-es.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sun-pl.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-cz-us.kmap.gz usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-uk.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/include/sun-uk.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/sun/sunkeymap.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sundvorak.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-fi-latin1.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-fr-latin1.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-de-latin1.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-ru.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt4-es.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-es.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sun-pl.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-cz-us.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-uk.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/include/sun-uk.inc.gz usr/share/keymaps/include
debian/udeb/console-keymaps-sun
usr/share/console/lists
-debian/tmp/usr/share/keymaps/sun/sunt4-no-latin1.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-no.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-ru.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-trqalt.kmap.gz usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt4-ja.kmap.gz
usr/share/keymaps/sun
-debian/tmp/usr/share/keymaps/sun/sunt5-ja.kmap.gz
usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt4-no-latin1.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-no.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-ru.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-trqalt.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt4-ja.kmap.gz usr/share/keymaps/sun
+usr/share/keymaps/sun/sunt5-ja.kmap.gz usr/share/keymaps/sun
diff --git a/debian/console-keymaps-usb.install
b/debian/console-keymaps-usb.install
index 36ac372..6ba2b68 100644
--- a/debian/console-keymaps-usb.install
+++ b/debian/console-keymaps-usb.install
@@ -1,25 +1,25 @@
-debian/tmp/usr/share/keymaps/i386/azerty/mac-usb-be.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/azerty/mac-usb-fr.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/qwertz/mac-usb-fr_CH-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/dvorak/mac-usb-dvorak.kmap.gz
usr/share/keymaps/i386/dvorak
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-dk-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-es.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-euro.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/azerty/mac-usb-it.kmap.gz
usr/share/keymaps/i386/azerty
-debian/tmp/usr/share/keymaps/i386/qwerty/it.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/jp106.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/mac-usb-pt-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-se.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-uk.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwerty/mac-usb-us.kmap.gz
usr/share/keymaps/i386/qwerty
-debian/tmp/usr/share/keymaps/i386/qwertz/mac-usb-de-latin1-nodeadkeys.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/mac-usb-de-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/qwertz/mac-usb-de_CH.kmap.gz
usr/share/keymaps/i386/qwertz
-debian/tmp/usr/share/keymaps/i386/include/euro.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps/i386/include/azerty-layout.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps/i386/include/qwertz-layout.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps/i386/include/qwerty-layout.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps/i386/include/mac-linux-keys-bare.inc.gz
usr/share/keymaps/include
-debian/tmp/usr/share/keymaps-acorn/i386/include/linux-with-alt-and-altgr.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/azerty/mac-usb-be.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/azerty/mac-usb-fr.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/qwertz/mac-usb-fr_CH-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/dvorak/mac-usb-dvorak.kmap.gz
usr/share/keymaps/i386/dvorak
+usr/share/keymaps/i386/qwerty/mac-usb-dk-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/mac-usb-es.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/mac-usb-euro.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/azerty/mac-usb-it.kmap.gz
usr/share/keymaps/i386/azerty
+usr/share/keymaps/i386/qwerty/it.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/jp106.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/mac-usb-pt-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwerty/mac-usb-se.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/mac-usb-uk.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwerty/mac-usb-us.kmap.gz
usr/share/keymaps/i386/qwerty
+usr/share/keymaps/i386/qwertz/mac-usb-de-latin1-nodeadkeys.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwertz/mac-usb-de-latin1.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/qwertz/mac-usb-de_CH.kmap.gz
usr/share/keymaps/i386/qwertz
+usr/share/keymaps/i386/include/euro.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/include/azerty-layout.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/include/qwertz-layout.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/include/qwerty-layout.inc.gz
usr/share/keymaps/include
+usr/share/keymaps/i386/include/mac-linux-keys-bare.inc.gz
usr/share/keymaps/include
+usr/share/keymaps-acorn/i386/include/linux-with-alt-and-altgr.inc.gz
usr/share/keymaps/include
debian/udeb/console-keymaps-usb usr/share/console/lists
diff --git a/debian/control b/debian/control
index d3947f7..0fdb853 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Alastair McKinstry <mckins...@debian.org>
Uploaders: Anton Zinoviev <an...@lml.bas.bg>
-Build-Depends: cdbs, debhelper (>= 10),
+Build-Depends: debhelper-compat (= 13),
unicode-data (>= 5.0.0),
locales
Build-Depends-Indep: dh-consoledata (>= 0.7.72),
diff --git a/debian/rules b/debian/rules
index 3910ec0..ed0c106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,8 @@
export DH_VERBOSE=1
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# Automatically controls patching at build time:
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+ dh $@
# All the small .udebs that get built
EXTRA_UDEB_PKGS = console-keymaps-mac \
@@ -18,16 +16,14 @@ EXTRA_UDEB_PKGS = console-keymaps-mac \
OPTIONAL_UDEB_PKGS = console-keymaps-at
UDEB_PKGS=${OPTIONAL_UDEB_PKGS} ${EXTRA_UDEB_PKGS}
-DEB_CONFIGURE_EXTRA_FLAGS := --with-main_compressor=gzip
-
-DEB_DH_GENCONTROL_ARGS_ALL := \
- -- -VBuilt-Using="`dpkg-query -f'$${source:Package} (= $${Version})' -W
unicode-data`"
-
-clean::
+execute_after_dh_clean:
rm -rf debian/console-data.config debian/console-data.templates
debian/sort-tmp debian/locales debian/substvars
rm -f ./consoletrans/latin_diacr.fallback
./consoletrans/latin_diacr.nofallback
-install/console-data::
+override_dh_auto_configure:
+ dh_auto_configure -- --with-main_compressor=gzip
+
+override_dh_auto_install:
make install DESTDIR=$(CURDIR)/debian/tmp
make install DESTDIR=$(CURDIR)/debian/console-data
# Remove useless empty directory
@@ -36,7 +32,7 @@ install/console-data::
chmod +x debian/gen-acorn-keymaps
debian/gen-acorn-keymaps
- # For convenience of programs that want a list of supported keymaps
+ # For convenience of programs that want a list of supported
keymaps
chmod u+x $(CURDIR)/debian/list-keymaps.pl
$(CURDIR)/debian/list-keymaps.pl $(CURDIR)/debian/console-data.keymaps
> $(CURDIR)/debian/console-data/usr/share/console/lists/console-data.keymap-list
@@ -53,15 +49,21 @@ install/console-data::
msgfmt -o
$(CURDIR)/debian/console-data/usr/share/locale/$$L/LC_MESSAGES/console-data.mo
$$PO; \
done
-binary-predeb/console-data::
+execute_after_dh_install:
+ chmod +x debian/trim_keymaps.sh
+ for P in ${UDEB_PKGS}; do
\
+ ./debian/trim_keymaps.sh $(CURDIR)/debian/$${P} ;
\
+ done
+
+execute_after_dh_installdebconf:
# Sort keymaps (including in translations)
# MUST be after dh_installdebconf
sh debian/sort-keymaps
+execute_after_dh_installexamples:
+ gzip -9nf
$(CURDIR)/debian/console-data/usr/share/doc/console-data/examples/hypermap.m4
-common-binary-post-install-indep::
- chmod +x debian/trim_keymaps.sh
- for P in ${UDEB_PKGS}; do
\
- ./debian/trim_keymaps.sh $(CURDIR)/debian/$${P} ;
\
- done
+override_dh_missing:
+override_dh_gencontrol:
+ dh_gencontrol -- -VBuilt-Using="`dpkg-query -f'$${source:Package} (=
$${Version})' -W unicode-data`"
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index b7bc1f2..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression = "xz"
--
2.47.2
>From c0ea5c87cc6a5bbf45d5571e042b4bd03e006bfa Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Sun, 9 Mar 2025 17:57:18 +0100
Subject: [PATCH 2/2] Fix upstream Makefile.am
---
debian/patches/fix-upstream-makefile.am.patch | 51 +++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 52 insertions(+)
create mode 100644 debian/patches/fix-upstream-makefile.am.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/fix-upstream-makefile.am.patch
b/debian/patches/fix-upstream-makefile.am.patch
new file mode 100644
index 0000000..274d781
--- /dev/null
+++ b/debian/patches/fix-upstream-makefile.am.patch
@@ -0,0 +1,51 @@
+From: Chris Hofstaedtler <z...@debian.org>
+Date: Sun, 9 Mar 2025 16:43:46 +0100
+X-Dgit-Generated: 2:1.12-9 42998f3f56184f19031b933c393e2e9eb03d0611
+Subject: Fix upstream Makefile.am
+
+Remove a duplicated file, and add missing files.
+
+---
+
+diff --git a/consolefonts/Makefile.am b/consolefonts/Makefile.am
+index ab4ebc7..9e7e087 100644
+--- a/consolefonts/Makefile.am
++++ b/consolefonts/Makefile.am
+@@ -94,5 +94,7 @@ ka8x16thin-1.psf \
+ tis-phaisarn.f16.psf tis-ptconsl.f16.psf \
+ tis-ptlight.f16.psf tis-ptsmall.f16.psf \
+ tis-ptcufont.f20.psf tis-ptramafo.f20.psf \
+-tis-ptkmfont.f24.psf
++tis-ptkmfont.f24.psf \
++\
++brl-08.psf brl-10.psf brl-12.psf brl-14.psf brl-16.psf
+
+diff --git a/consoletrans/Makefile.am b/consoletrans/Makefile.am
+index 935ac40..31787fd 100644
+--- a/consoletrans/Makefile.am
++++ b/consoletrans/Makefile.am
+@@ -60,7 +60,7 @@ ECMA144.sfm cp437.sfm def.sfm ethiopic.sfm koi8-r.sfm \
+ lat1.sfm lat1u.sfm lat2u.sfm lat4.sfm lat4u.sfm \
+ armscii8.sfm cp850.sfm cp850b.sfm tcvn.sfm viscii.sfm \
+ koi8u.sfm ruscii.sfm \
+-alt.sfm cp866.sfm iso13.sfm lat2-g.sfm lat2.sfm ucx.sfm UniCyr.sfm
UniCyrX.sfm \
++alt.sfm cp866.sfm lat2-g.sfm lat2.sfm ucx.sfm UniCyr.sfm UniCyrX.sfm \
+ tis620.sfm tis620x.sfm
+
+ OLD_ACM_FILES = null.trans space.trans trivial.trans zero.trans \
+@@ -68,13 +68,13 @@ vga2iso.trans koi2alt.trans koi8u2ruscii.trans \
+ cp437_to_iso01.trans cp850_to_iso01.trans \
+ viscii1.0_to_tcvn.trans viscii1.0_to_viscii1.1.trans \
+ \
+-lat9u.uni lat9v.uni lat9w.uni
++lat9u.uni lat9v.uni lat9w.uni lat9wbrl.uni
+
+ ACM_FILES = \
+ bulgarian-mic.acm cp1251.acm cp857.acm cp866.acm iso13.acm MacCyrillic.acm \
+ cp437.acm iso01.acm iso02.acm iso03.acm iso04.acm iso05.acm iso06.acm \
+ iso07.acm iso08.acm iso09.acm iso10.acm straight-to-font.acm \
+-iso15.acm iso02+euro.acm koi8u.acm ruscii.acm \
++iso15.acm iso02+euro.acm koi8u.acm koi8-r.acm ruscii.acm \
+ tis620.acm
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e19df62
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-upstream-makefile.am.patch
--
2.47.2
