Bug#320515: NMU diff for l-k-h bug #320515

[Adeodato Simó <adeodato@debian.org>]

* Adeodato Simó [Thu, 04 Aug 2005 02:14:39 +0200]:

>   Do you have an approximate idea when an upload could happen? Depending
>   on your timing, I'd like to adjust the upload of qt-x11-free.

>   Also, wouldn't the attached patch be enough? FWIW, xorg-x11 builds
>   fine with it applied. Is there any possibility of a quick upload with
>   only this patch?

  This bug has been RC for more than a week now. Since it's blocking
  some important bits of the X.org and C++ transitions, I'd like to
  upload a NMU in a couple of hours.

  The NMU diff is attached, let me know if you were planning a
  maintainer upload for today and I'll refrain from uploading.

  Hoping to help,

-- 
Adeodato Simó
    EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
 
You've come to the right place.  At debian-devel we are always willing
to argue over the meanings of words.
                -- seen on debian-devel@l.d.o

--- linux-kernel-headers-2.6.13+0rc3/debian/changelog
+++ linux-kernel-headers-2.6.13+0rc3/debian/changelog
@@ -1,3 +1,12 @@
+linux-kernel-headers (2.6.13+0rc3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix RC bug that makes other packages FTBFS.
+
+  * debian/patches/linux-joystick.patch: New file, wrap the usage of
+    BITS_PER_LONG with #ifdef __KERNEL__. (Closes: #320515)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Sun, 07 Aug 2005 12:57:42 +0200
+
 linux-kernel-headers (2.6.13+0rc3-1) unstable; urgency=low
 
   * GOTO Masanori <gotom@debian.org>
--- linux-kernel-headers-2.6.13+0rc3/debian/patches/linux-joystick.patch
+++ linux-kernel-headers-2.6.13+0rc3/debian/patches/linux-joystick.patch
@@ -0,0 +1,20 @@
+2005-08-07 adeodato
+Wrap the usage of BITS_PER_LONG with #ifdef __KERNEL__ (#320515)
+
+--- include/linux/joystick.h
++++ include/linux/joystick.h
+@@ -134,6 +134,7 @@
+        struct JS_DATA_TYPE JS_CORR;
+ };
+ 
++#ifdef __KERNEL__
+ #if BITS_PER_LONG == 64
+ #define JS_DATA_SAVE_TYPE JS_DATA_SAVE_TYPE_64
+ #elif BITS_PER_LONG == 32
+@@ -141,5 +142,6 @@
+ #else
+ #error Unexpected BITS_PER_LONG
+ #endif
++#endif
+ 
+ #endif /* _LINUX_JOYSTICK_H */

Attachment: signature.asc
Description: Digital signature