diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-01-05 22:35:56 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-01-05 22:35:56 +0000 |
| commit | 386c193824117a45277b46288f3676c5cf5bbac1 (patch) | |
| tree | d265c6e953d74baf91bb9c8caa404b975e75007a /debian | |
| parent | f52bc137d2f91b7ebc06110263a6e85509aea4a6 (diff) | |
| parent | fcf5ba9e5c3c10ef1e0c31580f8a00a2c3b1cd6f (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/local/runsystem | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 0d15a9b1..ca51e306 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,9 @@ hurd (20121127-1) unstable; urgency=low flex, and bison build-dependencies. * New upstream patch patches/pfinet_local_port_range.patch to increase number of available local ports. - * hurd.install: Install all msgids, not only hurd.msgids. + * Fix g-i by putting console keyboard parameters before mouse parameters, + otherwise it seems the -c option gets lost. + * Install all msgids files, not only hurd.msgids. -- Samuel Thibault <sthibault@debian.org> Sat, 05 Jan 2013 22:30:06 +0000 diff --git a/debian/local/runsystem b/debian/local/runsystem index b35131af..a59ff716 100755 --- a/debian/local/runsystem +++ b/debian/local/runsystem @@ -63,7 +63,7 @@ then . /etc/default/keyboard [ -z "$XKBLAYOUT" ] || LAYOUT="--keymap $XKBLAYOUT" fi - console -d vga -g -d pc_mouse --repeat=mouse -d pc_kbd --repeat=kbd $LAYOUT -c /dev/vcs & + console -d vga -g -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs & echo $! > /var/run/hurd-console.pid wait echo |