[SCM] An enhanced version of the legendary DOOM game branch, master, updated. upstream/1.9.0-beta6.9+dfsg1-2-gf8e2d6b

[Jon Dowland]

The following commit has been merged in the master branch:
commit f8e2d6b8a3d6426aa61d252584351d05c9bf7a0f
Author: Jon Dowland <jmtd at debian.org>
Date:   Thu May 26 22:46:16 2011 +0100

    -lm fix

diff --git a/debian/changelog b/debian/changelog
index 823cf8e..c659285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+deng (1.9.0-beta6.9+dfsg1-2) unstable; urgency=low
+
+  * Add a patch from Jamie Jones to fix a FTBFS. Closes: #622583.
+
+ -- Jon Dowland <jmtd at debian.org>  Thu, 26 May 2011 22:43:27 +0100
+
 deng (1.9.0-beta6.9+dfsg1-1) unstable; urgency=low
 
   [ Kees Meijs ]
diff --git a/doomsday/CMakeLists.txt b/doomsday/CMakeLists.txt
index bd1a966..57e7eed 100644
--- a/doomsday/CMakeLists.txt
+++ b/doomsday/CMakeLists.txt
@@ -1,4 +1,4 @@
-## Copyright (c) 2006 - 2008 Jamie Jones <jamie_jones_au at yahoo.com.au>
+## Copyright (c) 2006 - 2011 Jamie Jones <jamie_jones_au at yahoo.com.au>
 ## Copyright (c) 2007 - 2008 Daniel Swanson <danij at dengine.net>
 ## Copyright (c) 2008 - 2009 Jaakko Keränen <jaakko.keranen at iki.fi>
 ##
@@ -277,6 +277,13 @@ FIND_PACKAGE(Doxygen)
 
 INCLUDE(TestBigEndian)
 
+IF (UNIX)
+    IF (NOT APPLE)
+        FIND_PACKAGE(libm REQUIRED)
+    ENDIF (NOT APPLE)
+ENDIF (UNIX)
+
+
 ################################################################################
 ######################## Cpack - Generate packages and source tarballs  ########
 
@@ -647,7 +654,7 @@ IF (UNIX)
     IF (NOT WIN32)
         TARGET_LINK_LIBRARIES (doomsday dl)
             IF (NOT APPLE)
-                TARGET_LINK_LIBRARIES (doomsday  ${X11_LIBRARIES})
+                TARGET_LINK_LIBRARIES (doomsday  ${X11_LIBRARIES} ${LIBM_LIBRARIES})
             ENDIF (NOT APPLE)
     ENDIF (NOT WIN32)
 ENDIF (UNIX)

-- 
An enhanced version of the legendary DOOM game