I'll upload the attached diff shortly to delay/2 in order to minimize impact on the Qt 4.8 transition. If you'd prefer I delay it further because you are preparing an upload, please let me know.
Scott K
diff -Nru mudlet-2.0-rc12/debian/changelog mudlet-2.0-rc12/debian/changelog --- mudlet-2.0-rc12/debian/changelog 2012-02-18 17:12:16.000000000 -0500 +++ mudlet-2.0-rc12/debian/changelog 2012-05-10 17:39:54.000000000 -0400 @@ -1,3 +1,11 @@ +mudlet (2.0-rc12-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add missing include to fix FTBFS with Qt 4.8 (Closes: #661946) + - Thanks to Andreas Moog from Ubuntu for the patch + + -- Scott Kitterman <sc...@kitterman.com> Thu, 10 May 2012 17:39:10 -0400 + mudlet (2.0-rc12-2) unstable; urgency=low * Linked to yajl2 Closes: #653880 diff -Nru mudlet-2.0-rc12/debian/patches/ftbfs_qt4.8.patch mudlet-2.0-rc12/debian/patches/ftbfs_qt4.8.patch --- mudlet-2.0-rc12/debian/patches/ftbfs_qt4.8.patch 1969-12-31 19:00:00.000000000 -0500 +++ mudlet-2.0-rc12/debian/patches/ftbfs_qt4.8.patch 2012-05-10 17:37:25.000000000 -0400 @@ -0,0 +1,27 @@ +Description: Include glu.h and link to -lGLU to fix FTBFS against + qt4.8 (LP: #934992) +Author: Andreas Moog <am...@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/934992 + +--- mudlet-2.0-rc12.orig/src/glwidget.cpp ++++ mudlet-2.0-rc12/src/glwidget.cpp +@@ -29,6 +29,8 @@ + #include "Host.h" + #include "dlgMapper.h" + ++#include <GL/glu.h> ++ + #ifndef GL_MULTISAMPLE + #define GL_MULTISAMPLE 0x809D + #endif +--- mudlet-2.0-rc12.orig/src/src.pro ++++ mudlet-2.0-rc12/src/src.pro +@@ -23,7 +23,7 @@ LIBLUA = -llua5.1 + # automatically link to LuaJIT if it exists + exists(/usr/local/lib/libluajit-5.1.a):LIBLUA = -L/usr/local/lib -lluajit-5.1 + +-unix:LIBS += -lyajl ++unix:LIBS += -lyajl -lGLU + + win32:LIBS += -L"c:\mudlet2_package" \ + -llua51 \ diff -Nru mudlet-2.0-rc12/debian/patches/series mudlet-2.0-rc12/debian/patches/series --- mudlet-2.0-rc12/debian/patches/series 2012-02-18 17:22:59.000000000 -0500 +++ mudlet-2.0-rc12/debian/patches/series 2012-05-10 17:38:08.000000000 -0400 @@ -5,3 +5,4 @@ luaglobal_path freebsd_ifdef yajl2_api +ftbfs_qt4.8.patch
signature.asc
Description: This is a digitally signed message part.
