• Bug#1091781: console-data: uses orphaned cdbs (2/2)

    From Chris Hofstaedtler@21:1/5 to All on Sun Mar 9 18:20:01 2025
    [continued from previous message]

    +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 <mckinstry@debian.org>
    Uploaders: Anton Zinoviev <anton@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_