Hello,
Adrian Glaubitz (CCed) prepared an upload for kcemu (debdiff attached) to fix
#592978, a FTBFS on kfreebsd and hurd-i386. Would you unblock the package if
I'd sponsor the upload?
Regards
Jan Dittberner
--
Jan Dittberner - Debian Developer
GPG-key: 4096R/558FB8DD 2009-05-10
B2FF 1D95 CE8F 7A22 DF4C F09B A73E 0055 558F B8DD
http://ddportfolio.debian.net/ - http://people.debian.org/~jandd/
diff -Nru kcemu-0.5.1+dfsg/debian/changelog kcemu-0.5.1+dfsg/debian/changelog
--- kcemu-0.5.1+dfsg/debian/changelog 2010-06-30 17:48:42.000000000 +0200
+++ kcemu-0.5.1+dfsg/debian/changelog 2010-08-15 21:17:39.000000000 +0200
@@ -1,3 +1,12 @@
+kcemu (0.5.1+dfsg-2) unstable; urgency=low
+
+ * Fix FTBFS on ports kfreebsd-i386, kfreebsd-amd64
+ and hurd-i386 (Closes: #592978)
+ * debian/control: bump standards version
+ to 3.9.1 (no changes needed)
+
+ -- Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Sun, 15 Aug 2010 21:08:28 +0200
+
kcemu (0.5.1+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #538914)
diff -Nru kcemu-0.5.1+dfsg/debian/control kcemu-0.5.1+dfsg/debian/control
--- kcemu-0.5.1+dfsg/debian/control 2010-06-30 17:48:42.000000000 +0200
+++ kcemu-0.5.1+dfsg/debian/control 2010-08-15 21:17:39.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Build-Depends: debhelper (>> 7.0.50~), libz80ex-dev, libsdl-dev, libsndfile-dev, libvncserver-dev, libtheora-dev, libgtk2.0-dev, automake, autoconf, libxmu-dev, libncurses5-dev, netpbm, imagemagick
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://kcemu.sourceforge.net/
Package: kcemu
diff -Nru kcemu-0.5.1+dfsg/debian/patches/0001-Directly-check-for-Joystick-interface.patch kcemu-0.5.1+dfsg/debian/patches/0001-Directly-check-for-Joystick-interface.patch
--- kcemu-0.5.1+dfsg/debian/patches/0001-Directly-check-for-Joystick-interface.patch 1970-01-01 01:00:00.000000000 +0100
+++ kcemu-0.5.1+dfsg/debian/patches/0001-Directly-check-for-Joystick-interface.patch 2010-08-15 21:17:39.000000000 +0200
@@ -0,0 +1,120 @@
+From 04416ce2112a66d4bd342f7c34eb087a6459eb56 Mon Sep 17 00:00:00 2001
+From: Michael Karcher <karcher@physik.fu-berlin.de>
+Date: Sun, 11 Jul 2010 23:50:25 +0200
+Subject: [PATCH] Directly check for Joystick interface
+
+---
+ configure.in | 9 +++++++++
+ include/kc/config.h.in | 3 +++
+ src/kc/Makefile.am | 17 ++++++++++++-----
+ src/kc/mod_list.cc | 9 ++++++---
+ 4 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 0f3e777..26d6251 100644
+--- a/configure.in
++++ b/configure.in
+@@ -790,6 +790,15 @@ else
+ fi
+ fi
+
++dnl ----------------------------------------
++dnl check for the Linux Joystick interface
++dnl ----------------------------------------
++
++AC_CHECK_HEADER(linux/joystick.h,
++ [AM_CONDITIONAL(HAVE_JOYSTICK, true)
++ AC_DEFINE(HAVE_JOYSTICK, 1, "Supported joystick interface present - Currently linux only")],
++ [AM_CONDITIONAL(HAVE_JOYSTICK, false)])
++
+ AC_OUTPUT([
+ Makefile
+ include/Makefile
+diff --git a/include/kc/config.h.in b/include/kc/config.h.in
+index dbd72cf..1f81b16 100644
+--- a/include/kc/config.h.in
++++ b/include/kc/config.h.in
+@@ -121,6 +121,9 @@
+ declares uintmax_t. */
+ #undef HAVE_INTTYPES_H_WITH_UINTMAX
+
++/* "Supported joystick interface present - Currently linux only" */
++#undef HAVE_JOYSTICK
++
+ /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+ #undef HAVE_LANGINFO_CODESET
+
+diff --git a/src/kc/Makefile.am b/src/kc/Makefile.am
+index cf8a257..0670b7b 100644
+--- a/src/kc/Makefile.am
++++ b/src/kc/Makefile.am
+@@ -29,23 +29,30 @@ AM_CPPFLAGS = \
+ $(GTK_CFLAGS) \
+ $(SDL_CFLAGS)
+
+-LINUX_EXTRA_kcemu_SOURCES = mod_v24.cc mod_js.cc
++JOYSTICK_EXTRA_kcemu_SOURCES = mod_js.cc
++LINUX_EXTRA_kcemu_SOURCES = mod_v24.cc
+ MINGW_EXTRA_kcemu_SOURCES = kcemu.rc
+ FREEBSD_EXTRA_kcemu_SOURCES = mod_v24.cc
+
++EXTRA_kcemu_SOURCES =
++
++if HAVE_JOYSTICK
++EXTRA_kcemu_SOURCES += $(JOYSTICK_EXTRA_kcemu_SOURCES)
++endif
++
+ if TARGET_LINUX
+-EXTRA_kcemu_SOURCES = $(LINUX_EXTRA_kcemu_SOURCES)
++EXTRA_kcemu_SOURCES += $(LINUX_EXTRA_kcemu_SOURCES)
+ endif
+
+ if TARGET_MINGW
+-EXTRA_kcemu_SOURCES = $(MINGW_EXTRA_kcemu_SOURCES)
++EXTRA_kcemu_SOURCES += $(MINGW_EXTRA_kcemu_SOURCES)
+ endif
+
+ if TARGET_FREEBSD
+-EXTRA_kcemu_SOURCES = $(FREEBSD_EXTRA_kcemu_SOURCES)
++EXTRA_kcemu_SOURCES += $(FREEBSD_EXTRA_kcemu_SOURCES)
+ endif
+
+-EXTRA_DIST = $(LINUX_EXTRA_kcemu_SOURCES) $(MINGW_EXTRA_kcemu_SOURCES) $(FREEBSD_EXTRA_kcemu_SOURCES)
++EXTRA_DIST = $(JOYSTICK_EXTRA_kcemu_SOURCES) $(LINUX_EXTRA_kcemu_SOURCES) $(MINGW_EXTRA_kcemu_SOURCES) $(FREEBSD_EXTRA_kcemu_SOURCES)
+
+ kcemu_SOURCES = \
+ kc.cc \
+diff --git a/src/kc/mod_list.cc b/src/kc/mod_list.cc
+index 6b85956..b21f405 100644
+--- a/src/kc/mod_list.cc
++++ b/src/kc/mod_list.cc
+@@ -167,9 +167,12 @@
+
+ #ifdef HOST_OS_LINUX
+ #include "kc/mod_v24.h"
+-#include "kc/mod_js.h"
+ #endif /* HOST_OS_LINUX */
+
++#ifdef HAVE_JOYSTICK
++#include "kc/mod_js.h"
++#endif
++
+ #include "fileio/load.h"
+
+ #include "ui/ui.h"
+@@ -463,10 +466,10 @@ ModuleList::ModuleList(void)
+ /*
+ * Joystick module (kc85/2-4)
+ */
+-#ifdef HOST_OS_LINUX
++#ifdef HAVE_JOYSTICK
+ m = new ModuleJoystick("M008", 0xff);
+ _mod_list.push_back(new ModuleListEntry(_("M008: Joystick"), m, KC_TYPE_85_2_CLASS));
+-#endif /* HOST_OS_LINUX */
++#endif /* HAVE_JOYSTICK */
+
+ /*
+ * RAM module 64k (kc85/2-4)
+--
+1.7.1
+
diff -Nru kcemu-0.5.1+dfsg/debian/patches/series kcemu-0.5.1+dfsg/debian/patches/series
--- kcemu-0.5.1+dfsg/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ kcemu-0.5.1+dfsg/debian/patches/series 2010-08-15 21:17:39.000000000 +0200
@@ -0,0 +1 @@
+0001-Directly-check-for-Joystick-interface.patch
Attachment:
signature.asc
Description: Digital signature