Bug#653036: gpm: please default to /dev/input/mice instead of legacy /dev/psaux

[Stefan Lippers-Hollmann]

Hi

I'd consider it to be a pity if wheezy would release with a gpm version
that creates deprecated config files for pretty much every newly 
installed system because of faulty uname parsing. Therefore I'd like
to ask you to consider uploading the attached NMU diff or something 
equivalent (there are low hanging fruits like the i18n update in 
#658143 or just dropping the versioned component, or inverting it to 
test for known old kernel versions <= 2.4, from the uname parsing, but 
I kept this potential NMU as minimal as possible).

The attached NMU diff is pretty much unchanged from the version I 
submitted in December, but has gained a changelog entry and a 
git-inspired patch header to 
debian/patches/090_correctly_parse_shorter_linux_version_numbers.patch,
which should satisfy dep-3 suggestions. I can confirm that gpm creates
correct config files with this patch applied and continues to compile
using gcc-4.7 on amd64 and i386. I have successfully tested this patch
against a kernel compiled with
        # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
and this kind of versioning:
        VERSION = 3
        PATCHLEVEL = 3
        SUBLEVEL =
        EXTRAVERSION =
        NAME = Saber-toothed Squirrel

While I would strongly prefer a maintainer upload, I may search for a 
sponsor to upload the attached NMU diff after ~2 weeks.

Regards
        Stefan Lippers-Hollmann

diff -u gpm-1.20.4/debian/changelog gpm-1.20.4/debian/changelog
--- gpm-1.20.4/debian/changelog
+++ gpm-1.20.4/debian/changelog
@@ -1,3 +1,11 @@
+gpm (1.20.4-4+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * fix kernel detection for kernel >=3 (Closes: #653036).
+  * fix gpm-root.y to accept kernel 3.0 with empty sublevel as well.
+
+ -- Stefan Lippers-Hollmann <s....@gmx.de>  Sat, 31 Dec 2011 01:09:07 +0100
+
 gpm (1.20.4-4) unstable; urgency=low
 
   * Ack NMUs - thanks, guys!
diff -u gpm-1.20.4/debian/gpm.config gpm-1.20.4/debian/gpm.config
--- gpm-1.20.4/debian/gpm.config
+++ gpm-1.20.4/debian/gpm.config
@@ -30,7 +30,7 @@
       db_set gpm/type autops2;;
   esac;
   case $KVER in
-    Linux-2.6*)
+    Linux-2.6*|Linux-[3-9]*)
       # Use the input layer by default.
       # The input layer also makes the gpm repeater rather moot.
       db_set gpm/device /dev/input/mice;
diff -u gpm-1.20.4/debian/patches/series gpm-1.20.4/debian/patches/series
--- gpm-1.20.4/debian/patches/series
+++ gpm-1.20.4/debian/patches/series
@@ -19,0 +20 @@
+090_correctly_parse_shorter_linux_version_numbers.patch
only in patch2:
unchanged:
--- gpm-1.20.4.orig/debian/patches/090_correctly_parse_shorter_linux_version_numbers.patch
+++ gpm-1.20.4/debian/patches/090_correctly_parse_shorter_linux_version_numbers.patch
@@ -0,0 +1,21 @@
+initialize kernel version, to cope with empty sublevel definitions, e.g.:
+
+VERSION = 3
+PATCHLEVEL = 3
+SUBLEVEL =
+EXTRAVERSION =
+NAME = Saber-toothed Squirrel
+
+Signed-off-by: Stefan Lippers-Hollmann <s....@gmx.de>
+
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1161,7 +1161,7 @@ int main(int argc, char **argv)
+    */
+    {
+       struct utsname linux_info;
+-      int v1,v2,v3;
++      int v1=0,v2=0,v3=0;
+       struct stat sbuf;
+ 
+       if (uname(&linux_info)) {

signature.asc
Description: This is a digitally signed message part.