From 862f2f0883a0083abae305e11e319e35ffcb8219 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 20 Nov 2013 10:16:51 +0100
Subject: [PATCH] added keywords for debian and switch to dyn libs in travis

---
 .travis.yml          | 6 +++---
 cmake/FindOGRE.cmake | 6 ++++++
 files/opencs.desktop | 1 +
 files/openmw.desktop | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index caf2e3389..0fb8bf71a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,13 @@ before_install:
  - pwd
  - git submodule update --init --recursive
  - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
- - echo "yes" | sudo apt-add-repository ppa:openmw/deps
+ - echo "yes" | sudo apt-add-repository ppa:openmw/openmw
  - sudo apt-get update -qq
  - sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
  - sudo apt-get install -qq libqt4-dev libxaw7-dev libxrandr-dev libfreeimage-dev libpng-dev
  - sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev
  - sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
- - sudo apt-get install -qq libbullet-dev libogre-static-dev libmygui-static-dev libsdl2-static-dev libunshield-dev
+ - sudo apt-get install -qq libbullet-dev libogre-1.8-dev libmygui-dev libsdl2-dev libunshield-dev
  - sudo mkdir /usr/src/gtest/build
  - cd /usr/src/gtest/build
  - sudo cmake .. -DBUILD_SHARED_LIBS=1
@@ -26,7 +26,7 @@ before_script:
  - cd -
  - mkdir build
  - cd build
- - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBOOST_STATIC=1 -DSDL2_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1
+ - cmake .. -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1 DBUILD_WITH_DPKG=1
 script:
  - make -j4
 after_script:
diff --git a/cmake/FindOGRE.cmake b/cmake/FindOGRE.cmake
index fb4a090c6..6a3ffd6ed 100644
--- a/cmake/FindOGRE.cmake
+++ b/cmake/FindOGRE.cmake
@@ -552,3 +552,9 @@ clear_if_changed(OGRE_PREFIX_WATCH OGRE_MEDIA_DIR)
 find_path(OGRE_MEDIA_DIR NAMES packs/cubemapsJS.zip HINTS ${OGRE_MEDIA_SEARCH_PATH}
   PATHS ${OGRE_PREFIX_PATH} PATH_SUFFIXES ${OGRE_MEDIA_SEARCH_SUFFIX})
 
+if (OGRE_RenderSystem_GL_FOUND)
+MESSAGE("-- OpenGL -- Found!")
+else()
+MESSAGE("-- OpenGL -- Not Found!")
+endif()
+MESSAGE("-- ${OGRE_RenderSystem_GL_LIBRARIES} ${OPENGL_LIBRARIES}")
diff --git a/files/opencs.desktop b/files/opencs.desktop
index f6aad5b09..80afa26bc 100644
--- a/files/opencs.desktop
+++ b/files/opencs.desktop
@@ -3,6 +3,7 @@ Type=Application
 Name=OpenMW Content Editor
 GenericName=Content Editor
 Comment=A replacement for the Morrowind Construction Set.
+Keywords=Morrowind;Construction Set;Creation Kit Editor;Set;Kit
 TryExec=opencs
 Exec=opencs
 Icon=opencs
diff --git a/files/openmw.desktop b/files/openmw.desktop
index 118cd3bbe..3e26018d0 100644
--- a/files/openmw.desktop
+++ b/files/openmw.desktop
@@ -3,6 +3,7 @@ Type=Application
 Name=OpenMW Launcher
 GenericName=Role Playing Game
 Comment=An engine replacement for The Elder Scrolls III: Morrowind
+Keywords=Morrowind;Reimplementation Mods;esm;bsa
 TryExec=omwlauncher
 Exec=omwlauncher
 Icon=openmw