[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 69d00eea6f4b72ff02739d5503bbf3a67f248a1b
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Fri Oct 28 19:57:01 2011 -0400

    remove vcs files in clean rule

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f0c372a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-map/*
-world/*
-CMakeFiles/*
-src/CMakeFiles/*
-src/Makefile
-src/cmake_config.h
-src/cmake_install.cmake
-src/jthread/CMakeFiles/*
-src/jthread/Makefile
-src/jthread/cmake_config.h
-src/jthread/cmake_install.cmake
-minetest.conf
-bin/
-CMakeCache.txt
-CPackConfig.cmake
-CPackSourceConfig.cmake
-Makefile
-cmake_install.cmake
-src/jthread/libjthread.a
-debug.txt
-bin/debug.txt
-minetestmapper/map.png
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index e4e0caa..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,25 +0,0 @@
-map/*
-world/*
-CMakeFiles/*
-src/CMakeFiles/*
-src/Makefile
-src/cmake_config.h
-src/cmake_install.cmake
-src/jthread/CMakeFiles/*
-src/jthread/Makefile
-src/jthread/cmake_config.h
-src/jthread/cmake_install.cmake
-src/.*.swp
-src/sqlite/libsqlite3.a
-src/session.vim
-util/uloste.png
-minetest.conf
-debug.txt
-bin/
-CMakeCache.txt
-CPackConfig.cmake
-CPackSourceConfig.cmake
-Makefile
-cmake_install.cmake
-src/jthread/libjthread.a
-data_temp/*
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index f42b9af..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,28 +0,0 @@
-c37bcfd89dd627fdb131ae3f77fcaab02721bf76 working
-69547bd6be420eb40f55524fd2131cbbaa2e0e29 110107195706-exp
-e3c3c8e27bbc8c9b61710517a78944deb1c61696 110211211322
-23880c78e40c50ad54fcd8844510f7a423b37f2a 110212200513
-20c49c98c92a62df457b773c562df41d4167492b 110214175330
-10be2b71f965585af90af96903e83b4ddff52bf9 20110424_0
-9b05d4bfee9312aef4182fa6f63b4237368cec34 0.2.20110529_0
-6fa0a8b40406aa567f8fa84b5e2045a7e3762c1d 0.2.20110529_1
-cf6dd618ef0b7514c81ae87749733b5a328fc763 0.2.20110529_2
-96efc17b4cd92aacbe947b520a6ba91727d42f03 0.2.20110602_0
-0000000000000000000000000000000000000000 0.2.20110602_0
-6f17cd3f6c5481e6abc906fc441980c764632cbc 0.2.20110602_0
-dd08a9b5cb84d55b7576bb3fde3068dd263bc3bc 0.2.20110618_0_dev
-25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
-25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
-0000000000000000000000000000000000000000 0.2.20110704_0
-0000000000000000000000000000000000000000 0.2.20110704_0
-65263ec55caf526e3f3e0bdc6657ce42daee46bc 0.2.20110704_0
-06c62112b503e746d5d8cc40f951974447d590b7 0.2.20110731_0
-705a7e95b8710c8cada5524d8c7bb658f4b710d9 0.2.20110731_1
-4a6cf9491306988b24c79438ee6398885c432fce 0.2.20110731_2
-4a6cf9491306988b24c79438ee6398885c432fce 0.2.20110731_2
-0000000000000000000000000000000000000000 0.2.20110731_2
-0000000000000000000000000000000000000000 0.2.20110731_2
-8ad16fbce9a4da45b2552ad8b400a5a127722acc 0.2.20110731_2
-c87e28deaabf4a776c261b3a09b6bf5ea3e04abf 0.2.20110731_3
-c87e28deaabf4a776c261b3a09b6bf5ea3e04abf 0.2.20110731_3
-0000000000000000000000000000000000000000 0.2.20110731_3
diff --git a/debian/changelog b/debian/changelog
index f49a2fa..12f6d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 minetest (0.2.20110731.3-2) unstable; urgency=low
 
   * Update watch file.
-  * Make clean rule better.
+  * Remove vcs files in clean rule.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Fri, 28 Oct 2011 19:46:35 -0400
 
diff --git a/debian/rules b/debian/rules
index 843fdda..0fd8935 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
 
-override_dh_autoclean:
-	dh_autoclean
-	rm -rf bin obj-x86_64-linux-gnu/ .gitignore .hg_archival .hgignore .hgtags \
-	    old/Makefile.bak
+override_dh_auto_clean:
+	dh_clean
+	rm -rf bin obj-x86_64-linux-gnu/ .gitignore .hg_archival .hgignore .hgtags
 
 %:
 	dh $@ 

-- 
InfiniMiner/Minecraft-inspired open game world