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

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 71fb36bb5a48f6a033a0ce26cea4dc423b316610
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sun Nov 27 03:47:55 2011 -0500

    update watch file

diff --git a/debian/changelog b/debian/changelog
index 3550f45..c548692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ minetest (0.3.1+dfsg-1) unstable; urgency=low
   * Implement get-orig-source to generate dfsg-free upstream tarball.
   * Build using dfsg-free tarball.
   * Install freedesktop menu and icons.
+  * Fix watch file for dfsg name
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sat, 26 Nov 2011 22:27:53 -0500
 
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index e1985a5..c2e4c35 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 21:37:43.000000000 -0500
-+++ minetest/src/CMakeLists.txt	2011-11-26 21:37:48.000000000 -0500
+--- minetest.orig/src/CMakeLists.txt	2011-11-27 03:35:38.000000000 -0500
++++ minetest/src/CMakeLists.txt	2011-11-27 03:35:40.000000000 -0500
 @@ -265,7 +265,7 @@
  		set(ARCH i386)
  	endif()
@@ -15,9 +15,16 @@ Index: minetest/src/CMakeLists.txt
  	if(USE_GPROF)
 Index: minetest/CMakeLists.txt
 ===================================================================
---- 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 @@
+--- minetest.orig/CMakeLists.txt	2011-11-27 03:35:38.000000000 -0500
++++ minetest/CMakeLists.txt	2011-11-27 03:35:50.000000000 -0500
+@@ -61,13 +61,12 @@
+ 	set(EXAMPLE_CONF_DIR ".")
+ elseif(UNIX) # Linux, BSD etc
+ 	set(DATADIR "share/${PROJECT_NAME}")
+-	set(BINDIR "bin")
++	set(BINDIR "games")
+ 	set(DOCDIR "share/doc/${PROJECT_NAME}")
+ 	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
  endif()
  
  install(FILES "README.txt" DESTINATION "${DOCDIR}")
@@ -27,8 +34,8 @@ Index: minetest/CMakeLists.txt
  #
 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
+--- minetest.orig/cmake/Modules/FindIrrlicht.cmake	2011-11-27 03:35:38.000000000 -0500
++++ minetest/cmake/Modules/FindIrrlicht.cmake	2011-11-27 03:35:40.000000000 -0500
 @@ -50,7 +50,7 @@
  		/usr/include/irrlicht
  	)
diff --git a/debian/watch b/debian/watch
index b0d622c..1db16b1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/_/./g" \
+opts="dversionmangle=s/\+dfsg//g" \
   http://celeron.55.lt/minetest/download.php \
   https://github.com/celeron55/minetest/tarball/(\d.*)

-- 
InfiniMiner/Minecraft-inspired open game world