r12615 - in packages/trunk/kxl/debian: . patches

[Christoph Egger]

Author: christoph
Date: 2011-08-19 11:35:47 +0000 (Fri, 19 Aug 2011)
New Revision: 12615

Added:
   packages/trunk/kxl/debian/patches/40_nonlinux.diff
Modified:
   packages/trunk/kxl/debian/changelog
   packages/trunk/kxl/debian/control
   packages/trunk/kxl/debian/patches/series
   packages/trunk/kxl/debian/rules
Log:
Remove also config.log in debian/rules clean

Modified: packages/trunk/kxl/debian/changelog
===================================================================
--- packages/trunk/kxl/debian/changelog	2011-08-16 06:15:01 UTC (rev 12614)
+++ packages/trunk/kxl/debian/changelog	2011-08-19 11:35:47 UTC (rev 12615)
@@ -1,3 +1,11 @@
+kxl (1.1.7-15) unstable; urgency=low
+
+  * Team upload.
+  * Import patch by Samuel Thibault to build on !linux architectures
+    (Closes: #638387)
+
+ -- Christoph Egger <christoph at debian.org>  Fri, 19 Aug 2011 04:10:52 +0200
+
 kxl (1.1.7-14) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/kxl/debian/control
===================================================================
--- packages/trunk/kxl/debian/control	2011-08-16 06:15:01 UTC (rev 12614)
+++ packages/trunk/kxl/debian/control	2011-08-19 11:35:47 UTC (rev 12615)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0), autotools-dev, quilt, libx11-dev, linux-kernel-headers
+Build-Depends: debhelper (>= 5.0), autotools-dev, quilt, libx11-dev
 Standards-Version: 3.7.2
 Homepage: http://kxl.orz.hm/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/kxl/

Added: packages/trunk/kxl/debian/patches/40_nonlinux.diff
===================================================================
--- packages/trunk/kxl/debian/patches/40_nonlinux.diff	                        (rev 0)
+++ packages/trunk/kxl/debian/patches/40_nonlinux.diff	2011-08-19 11:35:47 UTC (rev 12615)
@@ -0,0 +1,57 @@
+--- a/src/KXLsound.c.orig	2011-08-19 00:57:45.000000000 +0000
++++ a/src/KXLsound.c	2011-08-19 00:57:47.000000000 +0000
+@@ -6,7 +6,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+-#include <linux/soundcard.h>
++#include <sys/soundcard.h>
+ #include "KXL.h"
+ 
+ #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+--- a/src/KXL.h.orig	2011-08-19 00:58:51.000000000 +0000
++++ a/src/KXL.h	2011-08-19 00:58:52.000000000 +0000
+@@ -6,7 +6,9 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/XKBlib.h>
++#ifdef __linux__
+ #include <linux/joystick.h>
++#endif
+ 
+ 
+ //================================================================
+--- a/src/KXLjoystick.c.orig	2011-08-19 00:59:41.000000000 +0000
++++ a/src/KXLjoystick.c	2011-08-19 01:00:00.000000000 +0000
+@@ -16,6 +16,7 @@
+   Uint8  axis = 2;
+   Uint8  buttons = 2;
+ 
++#ifdef __linux__
+   KXL_joydev = open(devname, O_RDONLY);
+   if (KXL_joydev < 0) {
+     fprintf(stderr, "KXL error message\nCannot open \"%s\".\n", devname);
+@@ -29,6 +30,9 @@
+   fprintf(stderr, "KXL message\nJoystick (%s) has %d axes and %d buttons.\nDriver version is %d.%d.%d.\n",
+ 	  name, axis, buttons, version >> 16, (version >> 8) & 0xff, version & 0xff);
+   return True;
++#else
++  return False;
++#endif
+ }
+ 
+ //==============================================================
+@@ -46,11 +50,13 @@
+ //  return value : True - ok, False - NG
+ //==============================================================
+ Bool KXL_ReadJoystick(KXL_Joystick *my) {
++#ifdef __linux__
+   if (KXL_joydev >= 0) {
+     if (read(KXL_joydev, my, JS_RETURN) == JS_RETURN) {
+       return True;
+     }
+   }
+   fprintf(stderr, "KXL error message\njoystick reading error\n");
++#endif
+   return False;
+ }

Modified: packages/trunk/kxl/debian/patches/series
===================================================================
--- packages/trunk/kxl/debian/patches/series	2011-08-16 06:15:01 UTC (rev 12614)
+++ packages/trunk/kxl/debian/patches/series	2011-08-19 11:35:47 UTC (rev 12615)
@@ -6,3 +6,4 @@
 020_headers.diff -p1
 020_badfont.diff
 030_underquoted_definition.diff
+40_nonlinux.diff

Modified: packages/trunk/kxl/debian/rules
===================================================================
--- packages/trunk/kxl/debian/rules	2011-08-16 06:15:01 UTC (rev 12614)
+++ packages/trunk/kxl/debian/rules	2011-08-19 11:35:47 UTC (rev 12615)
@@ -36,7 +36,7 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
-	rm -f config.sub config.guess
+	rm -f config.sub config.guess config.log
 
 	dh_clean