X Strike Force X.Org X11 SVN commit: r336 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-12 10:53:27 -0500 (Tue, 12 Jul 2005)
New Revision: 336
Added:
trunk/debian/patches/000_stolen_from_drm.diff
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
- Revert last change because I'm a retard. Thanks Michel D?\195?\164nzer!
- Add patch that I missed earlier.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-12 15:24:07 UTC (rev 335)
+++ trunk/debian/changelog 2005-07-12 15:53:27 UTC (rev 336)
@@ -16,8 +16,6 @@
- Add 104_sparc_no_mv8_flag.diff to fix a build problem on sparc (thanks
Julien Cristau)
-
- - Add libglu1 to Provides for libglu1-xorg
Changes by Daniel Stone:
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-07-12 15:24:07 UTC (rev 335)
+++ trunk/debian/control 2005-07-12 15:53:27 UTC (rev 336)
@@ -2317,7 +2317,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu, xlibmesa-glu
-Provides: libglu1c2, libglu1
+Provides: libglu1c2
Replaces: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu, xlibmesa-glu
Description: Mesa OpenGL utility library [X.Org]
The OpenGL utility library (GLU) offers simple interfaces for building
Added: trunk/debian/patches/000_stolen_from_drm.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_drm.diff 2005-07-12 15:24:07 UTC (rev 335)
+++ trunk/debian/patches/000_stolen_from_drm.diff 2005-07-12 15:53:27 UTC (rev 336)
@@ -0,0 +1,16 @@
+Guard inclusion of <linux/config.h> to __KERNEL__, fixing FTBFS with
+linux-libc-headers in place of linux-kernel-headers. (Dave Airlie -- revision
+1.62, +1 -1)
+
+--- xc/extras/drm/shared/drm.h.orig 2005-05-17 13:09:08.589822352 +1000
++++ xc/extras/drm/shared/drm.h 2005-05-17 13:10:06.452025960 +1000
+@@ -38,7 +38,9 @@
+ #define _DRM_H_
+
+ #if defined(__linux__)
++#if defined(__KERNEL__)
+ #include <linux/config.h>
++#endif
+ #include <asm/ioctl.h> /* For _IO* macros */
+ #define DRM_IOCTL_NR(n) _IOC_NR(n)
+ #define DRM_IOC_VOID _IOC_NONE
Reply to: