Package: kbd
Version: 2.5.1-1+b1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
X-Debbugs-Cc: ca...@allfreemail.net
Dear Maintainer,
I attach a patch to make sure all files are moved to /usr/bin and /usr/sbin
instead of /bin or /sbin
also fixes #919275
---
debian/kbd.dirs | 2 --
debian/kbd.postinst | 18 ------------------
debian/kbd.postrm | 17 -----------------
debian/rules | 6 +-----
4 files changed, 1 insertion(+), 42 deletions(-)
delete mode 100644 debian/kbd.postinst
delete mode 100644 debian/kbd.postrm
diff --git a/debian/kbd.dirs b/debian/kbd.dirs
index 6ac6526..ca882bb 100644
--- a/debian/kbd.dirs
+++ b/debian/kbd.dirs
@@ -1,4 +1,2 @@
-bin
-sbin
usr/bin
usr/sbin
diff --git a/debian/kbd.postinst b/debian/kbd.postinst
deleted file mode 100644
index 6c5bc50..0000000
--- a/debian/kbd.postinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- # see #261801
- for file in dumpkeys loadkeys; do
- if [ ! -e /usr/bin/$file ]; then
- ln -s /bin/$file /usr/bin/$file
- fi
- done
- ;;
-esac
-
-#DEBHELPER#
-
-# vim:sw=4:sts=4:et:
diff --git a/debian/kbd.postrm b/debian/kbd.postrm
deleted file mode 100644
index 43c7827..0000000
--- a/debian/kbd.postrm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove)
- for file in dumpkeys loadkeys; do
- if [ -L /usr/bin/$file ]; then
- rm /usr/bin/$file
- fi
- done
- ;;
-esac
-
-#DEBHELPER#
-
-# vim:sw=4:sts=4:et:
diff --git a/debian/rules b/debian/rules
index be15c39..4d98ce3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,7 @@ EXTRA_BINARIES = screendump setlogcons setvesablank
CONTRIB_BINARIES = codepage splitfont vcstime
# we don’t want these in /usr/bin
-MOVE_TO_BIN = kbd_mode setfont fgconsole openvt chvt dumpkeys unicode_start
loadkeys
-MOVE_TO_SBIN = kbdrate
-MOVE_TO_USR_SBIN = vcstime setvesablank
+MOVE_TO_USR_SBIN = vcstime setvesablank kbdrate
include /usr/share/dpkg/architecture.mk
@@ -70,8 +68,6 @@ override_dh_auto_install:
install -m755 $(addprefix contrib/,$(CONTRIB_BINARIES)) $(KBD)/usr/bin/
install -m755 data/keymaps/i386/mk_modmap $(KBD)/usr/bin
# move everything where it belongs
- mv $(addprefix debian/kbd/usr/bin/,$(MOVE_TO_BIN)) $(KBD)/bin/
- mv $(addprefix debian/kbd/usr/bin/,$(MOVE_TO_SBIN)) $(KBD)/sbin/
mv $(addprefix debian/kbd/usr/bin/,$(MOVE_TO_USR_SBIN)) $(KBD)/usr/sbin/
# prepare udeb
ifeq (, $(filter noudeb, $(DEB_BUILD_PROFILES)))
--
2.39.2
