[freeorion] 06/33: OIS and Ogre are gone. Remove all references to them.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freeorion.

commit 0b4f6c5ba361443912e2ac063ef9058815f08ca3
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Mar 26 23:05:36 2015 +0100

    OIS and Ogre are gone. Remove all references to them.
---
 debian/bin/freeorion                 |  5 -----
 debian/freeorion.install             |  1 -
 debian/patches/OISInput-config.patch | 25 -------------------------
 debian/rules                         |  2 --
 4 files changed, 33 deletions(-)

diff --git a/debian/bin/freeorion b/debian/bin/freeorion
index f34879f..4d8abd2 100755
--- a/debian/bin/freeorion
+++ b/debian/bin/freeorion
@@ -2,11 +2,6 @@
 
 set -e
 
-if [ ! -f ~/.freeorion/OISInput.cfg ]; then
-    mkdir -p ~/.freeorion
-    cp /usr/share/games/freeorion/default/OISInput.cfg ~/.freeorion/
-fi
-
 ROOT=/usr/share/games/freeorion
 cd ${ROOT}
 printf 'CWD: '
diff --git a/debian/freeorion.install b/debian/freeorion.install
index 089cc40..04aaa20 100644
--- a/debian/freeorion.install
+++ b/debian/freeorion.install
@@ -2,4 +2,3 @@ debian/bin/*                                usr/games
 usr/bin/*                                   usr/lib/freeorion
 usr/lib/freeorion/freeorion/*               usr/lib/freeorion
 usr/share/applications
-usr/share/freeorion/ogre_plugins.cfg        usr/share/games/freeorion
diff --git a/debian/patches/OISInput-config.patch b/debian/patches/OISInput-config.patch
deleted file mode 100644
index 5cbaaa2..0000000
--- a/debian/patches/OISInput-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 20 Nov 2013 12:29:33 +0100
-Subject: OISInput config
-
-Forwarded: http://www.freeorion.org/forum/viewtopic.php?f=25&t=7719
----
- FreeOrion/client/human/chmain.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/FreeOrion/client/human/chmain.cpp b/FreeOrion/client/human/chmain.cpp
-index d2eb697..b08d9b5 100644
---- a/FreeOrion/client/human/chmain.cpp
-+++ b/FreeOrion/client/human/chmain.cpp
-@@ -284,7 +284,7 @@ int mainSetupAndRunOgre() {
-         //EntityRenderer entity_renderer(scene_manager);
- 
-         parse::init();
--        HumanClientApp app(root, window, scene_manager, camera, viewport, GetRootDataDir() / "OISInput.cfg");
-+        HumanClientApp app(root, window, scene_manager, camera, viewport, GetUserDir() / "OISInput.cfg");
- 
- 
-         ois_input_plugin = new OISInput;
--- 
-1.8.4.3
-
diff --git a/debian/rules b/debian/rules
index d3938dc..967f837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,6 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DBUILD_DOCUMENTATION=off \
 		-DBUILD_TUTORIALS=off \
-		-DBUILD_OGRE_DRIVER=ON \
-		-DBUILD_OGRE_OIS_PLUGIN=ON \
 		-DLIB_SUFFIX=/freeorion \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_BUILD_TYPE=$(TYPE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeorion.git