On Thu, 22 Sep 2016 18:31:17 +0200, Vincent Lefevre wrote:
> On 2016-09-22 18:42:21 +0300, Anton Zinoviev wrote:
> > On Thu, Sep 22, 2016 at 02:17:54PM +0200, Sven Joachim wrote:
> > > I'm pretty sure it is. The list of keyboard models is generated by
> > > running "./kbdnames-maker KeyboardNames.pl" from the Keyboard/
> > > directory, and currently this command does not print anything. I
> > > tracked the problem down to the removal of the current directory from
> > > @INC in perl, running "perl -I. kbdnames-maker KeyboardNames.pl" gives
> > > the long list of keyboard models again.
> >
> > Conceivably, the fix will be trivial. I don't know if the following
> > will fix the bug and if this is the right thing to do, but it seems
> > simple to change the first line
> >
> > #!/usr/bin/perl
> >
> > of Keyboard/kbdcompiler and Keyboard/kbdnames-maker to
> >
> > #!/usr/bin/perl -I.
>
> This solves the issue for the keyboard-configuration.config file.
>
> This also introduces the following change in
> "/usr/share/console-setup/kbdnames-maker":
>
> @@ -1,4 +1,4 @@
> -#!/usr/bin/perl
> +#!/usr/bin/perl -I.
>
> use warnings 'all';
> use strict;
Here's a different patch which is longer but more targetted. It
prefixes the argument to kbdnames-maker and kbdcompiler with ./
everywhere I found them and also changes the fallback values in the
two scripts (although I'm not sure this second part is needed).
Comparing the build logs (and build duration :)) and the resulting
packages (with debdiff and diffoscope) looks promising.
I also installed console-setup_1.151_all.deb,
console-setup-linux_1.151_all.deb, and
keyboard-configuration_1.151_all.deb and it didn't change my
/etc/default/keyboard (or /var/cache/debconf/config.dat). [0]
HTH,
gregor
[0] What did change in /etc is:
diff --git a/console-setup/cached_setup_keyboard.sh
b/console-setup/cached_setup_keyboard.sh
index dc50c88..5fc1fa1 100755
--- a/console-setup/cached_setup_keyboard.sh
+++ b/console-setup/cached_setup_keyboard.sh
@@ -10,4 +10,4 @@ kbd_mode '-u' < '/dev/tty3'
kbd_mode '-u' < '/dev/tty4'
kbd_mode '-u' < '/dev/tty5'
kbd_mode '-u' < '/dev/tty6'
-loadkeys '/tmp/tmpkbd.4jYCsa' > '/dev/null'
+loadkeys '/tmp/tmpkbd.HiTF3M' > '/dev/null'
--
.''`. Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/
`. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
`- NP: Eric Clapton: Running On Faith
diff -Nru console-setup-1.150/CHANGES console-setup-1.151/CHANGES
--- console-setup-1.150/CHANGES 2016-09-21 09:16:22.0 +0200
+++ console-setup-1.151/CHANGES 2016-10-02 17:37:46.0 +0200
@@ -1,3 +1,12 @@
+console-setup (1.151) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+!!! With wrong number as the package FTBFS with 1.150+nmu1 !!!
+ * Fix "user configuration lost + error message from setupcon":
+(Closes: #838310)
+
+ -- gregor herrmann Sun, 02 Oct 2016 17:37:46 +0200
+
console-setup (1.150) unstable; urgency=medium
[ Updated translations ]
diff -Nru console-setup-1.150/Keyboard/Makefile
console-setup-1.151/Keyboard/Makefile
--- console-setup-1.150/Keyboard/Makefile 2016-05-19 05:01:09.0
+0200
+++ console-setup-1.151/Keyboard/Makefile 2016-10-02 17:37:46.0
+0200
@@ -17,12 +17,12 @@
$./%.ekmap : model = $(notdir $(@:%.ekmap=%))
$./%.ekmap :
(cd $(kbddir) && \
- ./kbdcompiler $(model) KeyboardNames.pl $(xkbdir)) >$@
+ ./kbdcompiler $(model) ./KeyboardNames.pl $(xkbdir)) >$@
$./%.ekbd : model = $(notdir $(@:%.ekbd=%))
$./%.ekbd :
(cd $(kbddir) && \
- ./kbdcompiler freebsd-$(model) KeyboardNames.pl $(xkbdir)) >$@
+ ./kbdcompiler freebsd-$(model) ./KeyboardNames.pl $(xkbdir)) >$@
$./charmap_functions.sh : $(acmfiles)
$(kbddir)/make_charmap_functions $(kbddir)/../acm $(charmaps) >$@
diff -Nru console-setup-1.150/Keyboard/kbdcompiler
console-setup-1.151/Keyboard/kbdcompiler
--- console-setup-1.150/Keyboard/kbdcompiler2016-05-19 05:01:09.0
+0200
+++ console-setup-1.151/Keyboard/kbdcompiler2016-10-02 17:37:46.0
+0200
@@ -11,7 +11,7 @@
if ($ARGV[1]) {
$file = $ARGV[1];
} else {
- $file = 'KeyboardNames.pl';
+ $file = './KeyboardNames.pl';
}
do "$file";
}
diff -Nru console-setup-1.150/Keyboard/kbdnames-maker
console-setup-1.151/Keyboard/kbdnames-maker
--- console-setup-1.150/Keyboard/kbdnames-maker 2016-03-03 05:01:15.0
+0100
+++ console-setup-1.151/Keyboard/kbdnames-maker 2016-10-02 17:37:46.0
+0200
@@ -10,7 +10,7 @@
if ($ARGV[0]) {
$file = $ARGV[0];
} else {
- $file = 'KeyboardNames.pl';
+ $file = './KeyboardNames.pl';
}
do "$file";
}
diff -Nru console-setup-1.150/debian/changelog
console-setup-1.151/debian/changelog
--- console-setup
