[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-21-g1eb4088

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 83d058795a44a70fcc3a5dc5def8170985a32184
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat Nov 26 21:54:49 2011 -0500

    dynamically link to irrlicht and some minor clean-up

diff --git a/debian/changelog b/debian/changelog
index 816c571..06ac019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ minetest (0.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release:
     - Refresh patches.
+  * Dynamically link to irrlicht.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sat, 26 Nov 2011 20:08:08 -0500
 
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 6dbf0a0..e1985a5 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,8 +2,8 @@ Description: install binaries to /usr/games and don't install changelog twice
 Author: Michael Gilbert <michael.s.gilbert at gmail.com>
 Index: minetest/src/CMakeLists.txt
 ===================================================================
---- minetest.orig/src/CMakeLists.txt	2011-11-26 20:58:40.000000000 -0500
-+++ minetest/src/CMakeLists.txt	2011-11-26 20:59:55.000000000 -0500
+--- minetest.orig/src/CMakeLists.txt	2011-11-26 21:37:43.000000000 -0500
++++ minetest/src/CMakeLists.txt	2011-11-26 21:37:48.000000000 -0500
 @@ -265,7 +265,7 @@
  		set(ARCH i386)
  	endif()
@@ -15,8 +15,8 @@ Index: minetest/src/CMakeLists.txt
  	if(USE_GPROF)
 Index: minetest/CMakeLists.txt
 ===================================================================
---- minetest.orig/CMakeLists.txt	2011-11-26 21:01:09.000000000 -0500
-+++ minetest/CMakeLists.txt	2011-11-26 21:01:41.000000000 -0500
+--- minetest.orig/CMakeLists.txt	2011-11-26 21:37:43.000000000 -0500
++++ minetest/CMakeLists.txt	2011-11-26 21:37:48.000000000 -0500
 @@ -67,7 +67,6 @@
  endif()
  
@@ -25,3 +25,16 @@ Index: minetest/CMakeLists.txt
  install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
  
  #
+Index: minetest/cmake/Modules/FindIrrlicht.cmake
+===================================================================
+--- minetest.orig/cmake/Modules/FindIrrlicht.cmake	2011-11-26 21:37:43.000000000 -0500
++++ minetest/cmake/Modules/FindIrrlicht.cmake	2011-11-26 21:39:27.000000000 -0500
+@@ -50,7 +50,7 @@
+ 		/usr/include/irrlicht
+ 	)
+ 
+-	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
++	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so
+ 		PATHS
+ 		/usr/local/lib
+ 		/usr/lib
diff --git a/debian/rules b/debian/rules
index 33165e8..6b1437e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ override_dh_auto_clean:
 	    .hgtags \
 	    CMakeFiles \
 	    src/CMakeFiles \
-	    src/jthread/CMakeFiles \
 	    CMakeCache.txt \
 	    CPackConfig.cmake \
 	    CPackSourceConfig.cmake \
@@ -46,7 +45,6 @@ override_dh_auto_configure:
 	CFLAGS="${CFLAGS}" \
 	    LDFLAGS="${LDFLAGS}" \
 	    CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
-	    MFLAGS="${MFLAGS}" \
 	    cmake -DCMAKE_INCLUDE_PATH=/usr/include/jthread -DCMAKE_INSTALL_PREFIX=/usr .
 
 override_dh_auto_build:

-- 
InfiniMiner/Minecraft-inspired open game world