Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Rebuild for trusty
- Loading branch information
Christoph Korn
committed
Mar 31, 2015
1 parent
3f38f9a
commit d78e2c8
Showing
13 changed files
with
281 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
opendungeons (0.4.9-1~getdeb4) trusty; urgency=medium | ||
|
||
* Rebuild for trusty | ||
|
||
-- Christoph Korn <christoph.korn@getdeb.net> Sun, 29 Mar 2015 21:45:29 +0200 | ||
|
||
opendungeons (0.4.9-1~getdeb3) utopic; urgency=medium | ||
|
||
* Put plugins.cfg into /usr/lib/games because | ||
it contains an arch-dep path. | ||
|
||
-- Christoph Korn <christoph.korn@getdeb.net> Fri, 30 Jan 2015 23:43:47 +0100 | ||
|
||
opendungeons (0.4.9-1~getdeb2) utopic; urgency=medium | ||
|
||
* Fix Ogre (LP: #1415604) | ||
|
||
-- Christoph Korn <christoph.korn@getdeb.net> Fri, 30 Jan 2015 21:30:09 +0100 | ||
|
||
opendungeons (0.4.9-1~getdeb1) utopic; urgency=low | ||
|
||
* Initial release (LP: #1414001) | ||
|
||
-- Christoph Korn <christoph.korn@getdeb.net> Mon, 26 Jan 2015 23:13:06 +0100 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
Source: opendungeons | ||
Section: games | ||
Priority: optional | ||
Maintainer: Christoph Korn <christoph.korn@getdeb.net> | ||
Build-Depends: debhelper (>= 9), | ||
cmake, | ||
libogre-1.9-dev, | ||
libboost1.54-dev, | ||
libsfml-dev, | ||
libois-dev, | ||
libcegui-0.8-dev, | ||
libopenal-dev, | ||
libboost-filesystem1.54-dev, | ||
libboost-locale1.54-dev, | ||
pkg-config | ||
Standards-Version: 3.9.5 | ||
Homepage: http://opendungeons.sourceforge.net/ | ||
|
||
Package: opendungeons | ||
Architecture: any | ||
Depends: ${shlibs:Depends}, | ||
${misc:Depends}, | ||
opendungeons-data (= ${source:Version}) | ||
Description: RTS game with elements from Dungeon Keeper and Evil Genius | ||
OpenDungeons is an open source, real time strategy game | ||
sharing game elements with the Dungeon Keeper series and | ||
Evil Genius. Players build an underground dungeon which is | ||
inhabited by creatures. Players fight each other for | ||
control of the underground by indirectly commanding their | ||
creatures, directly casting spells in combat, and luring | ||
enemies into sinister traps. | ||
|
||
Package: opendungeons-data | ||
Architecture: all | ||
Depends: ${misc:Depends} | ||
Description: RTS game with elements from Dungeon Keeper and Evil Genius (data package) | ||
OpenDungeons is an open source, real time strategy game | ||
sharing game elements with the Dungeon Keeper series and | ||
Evil Genius. Players build an underground dungeon which is | ||
inhabited by creatures. Players fight each other for | ||
control of the underground by indirectly commanding their | ||
creatures, directly casting spells in combat, and luring | ||
enemies into sinister traps. | ||
. | ||
(This package contains the data files). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
Upstream-Name: opendungeons | ||
Source: http://opendungeons.sourceforge.net/#downloads | ||
|
||
Files: * | ||
Copyright: 2014 Bertram | ||
Danimal | ||
Dm3d | ||
Elvano | ||
eugeneloza | ||
hwoarangmy | ||
oln | ||
paul424 | ||
Rémi Verschelde (Akien) | ||
License: GPL-3.0+ | ||
|
||
Files: debian/* | ||
Copyright: 2015 Christoph Korn <christoph.korn@getdeb.net> | ||
License: GPL-3.0+ | ||
|
||
License: GPL-3.0+ | ||
This program is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
. | ||
This package is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
. | ||
You should have received a copy of the GNU General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
. | ||
On Debian systems, the complete text of the GNU General | ||
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
usr/share/games |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
usr/games | ||
usr/share/applications | ||
usr/share/doc | ||
usr/share/icons | ||
usr/share/man | ||
usr/lib/games/opendungeons |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
usr/lib/games/opendungeons/plugins.cfg usr/share/games/opendungeons/plugins.cfg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Put plugins.cfg into /usr/lib/games because it contains an arch-dep path. | ||
Index: opendungeons-0.4.9/CMakeLists.txt | ||
=================================================================== | ||
--- opendungeons-0.4.9.orig/CMakeLists.txt 2014-12-22 22:32:10.000000000 +0100 | ||
+++ opendungeons-0.4.9/CMakeLists.txt 2015-01-30 23:40:39.279073574 +0100 | ||
@@ -32,6 +32,7 @@ | ||
# Set binary and data install locations if we want to use the installer | ||
set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory") | ||
set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory") | ||
+ set(OD_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game lib directory") | ||
set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)") | ||
endif() | ||
|
||
@@ -591,8 +592,9 @@ | ||
################################## | ||
|
||
if(UNIX) | ||
- set(OD_CONFIGFILES ${CMAKE_BINARY_DIR}/plugins.cfg | ||
- ${CMAKE_BINARY_DIR}/resources.cfg) | ||
+ set(OD_CONFIGFILES ${CMAKE_BINARY_DIR}/resources.cfg) | ||
+ | ||
+ set(OD_ARCH_CONFIGFILES ${CMAKE_BINARY_DIR}/plugins.cfg) | ||
|
||
set(OD_RESOURCES ${CMAKE_SOURCE_DIR}/config | ||
${CMAKE_SOURCE_DIR}/gui | ||
@@ -613,6 +615,8 @@ | ||
PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) | ||
install(FILES ${OD_CONFIGFILES} | ||
DESTINATION ${OD_DATA_PATH}) | ||
+ install(FILES ${OD_ARCH_CONFIGFILES} | ||
+ DESTINATION ${OD_LIB_PATH}) | ||
install(DIRECTORY ${OD_RESOURCES} | ||
DESTINATION ${OD_DATA_PATH}) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
# fix finding the plugin folder | ||
# https://bugs.launchpad.net/getdeb.net/+bug/1415604 | ||
Index: opendungeons-0.4.9/cmake/modules/FindOGRE.cmake | ||
=================================================================== | ||
--- opendungeons-0.4.9.orig/cmake/modules/FindOGRE.cmake 2014-12-22 22:32:10.000000000 +0100 | ||
+++ opendungeons-0.4.9/cmake/modules/FindOGRE.cmake 2015-01-30 21:31:34.447303962 +0100 | ||
@@ -119,7 +119,11 @@ | ||
endforeach(dir) | ||
foreach(dir ${OGRE_PREFIX_BUILD}) | ||
set(OGRE_INC_SEARCH_PATH ${dir}/include ${OGRE_INC_SEARCH_PATH}) | ||
- set(OGRE_LIB_SEARCH_PATH ${dir}/lib ${OGRE_LIB_SEARCH_PATH}) | ||
+ if(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS) | ||
+ set(OGRE_LIB_SEARCH_PATH ${dir}/lib/macosx ${OGRE_LIB_SEARCH_PATH}) | ||
+ else() | ||
+ set(OGRE_LIB_SEARCH_PATH ${dir}/lib ${OGRE_LIB_SEARCH_PATH}) | ||
+ endif() | ||
|
||
if (OGRE_BUILD_PLATFORM_APPLE_IOS) | ||
set(OGRE_LIB_SEARCH_PATH ${dir}/lib/iphoneos ${dir}/lib/iphonesimulator ${OGRE_LIB_SEARCH_PATH}) | ||
@@ -150,7 +154,7 @@ | ||
RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GL3Plus RenderSystem_GLES RenderSystem_GLES2) | ||
set(OGRE_RESET_VARS | ||
OGRE_CONFIG_INCLUDE_DIR OGRE_INCLUDE_DIR | ||
- OGRE_LIBRARY_FWK OGRE_LIBRARY_REL OGRE_LIBRARY_DBG | ||
+ OGRE_FRAMEWORK_INCLUDES OGRE_FRAMEWORK_PATH OGRE_LIBRARY_FWK OGRE_LIBRARY_REL OGRE_LIBRARY_DBG | ||
OGRE_PLUGIN_DIR_DBG OGRE_PLUGIN_DIR_REL OGRE_MEDIA_DIR) | ||
foreach (comp ${OGRE_COMPONENTS}) | ||
set(OGRE_RESET_VARS ${OGRE_RESET_VARS} | ||
@@ -165,8 +169,16 @@ | ||
# try to locate Ogre via pkg-config | ||
use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}") | ||
|
||
- # try to find framework on OSX | ||
- findpkg_framework(Ogre) | ||
+ # Set the framework search path for OS X | ||
+ set(OGRE_FRAMEWORK_SEARCH_PATH | ||
+ ${CMAKE_FRAMEWORK_PATH} | ||
+ ~/Library/Frameworks | ||
+ /Library/Frameworks | ||
+ /System/Library/Frameworks | ||
+ /Network/Library/Frameworks | ||
+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/Release | ||
+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/Debug | ||
+ ) | ||
else() | ||
set(OGRE_LIBRARY_FWK "") | ||
endif() | ||
@@ -219,27 +231,19 @@ | ||
set(OGRE_INCOMPATIBLE FALSE) | ||
endif () | ||
|
||
-if (NOT OGRE_SOURCE) # If using ogre sources, use the target names instead of library files to link. | ||
- find_library(OGRE_LIBRARY_REL NAMES ${OGRE_LIBRARY_NAMES} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel") | ||
- find_library(OGRE_LIBRARY_DBG NAMES ${OGRE_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Debug") | ||
-else() | ||
- if( NOT OGRE_LIBRARIES OR OGRE_LIBRARIES STREQUAL "" ) | ||
- message( FATAL_ERROR "When using Ogre from sources, please specify target names in OGRE_LIBRARIES!" ) | ||
- else() | ||
- message( "Using Ogre source instead of binary libraries - skipping library files search." ) | ||
- endif() | ||
-endif() | ||
+find_library(OGRE_LIBRARY_REL NAMES ${OGRE_LIBRARY_NAMES} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel") | ||
+find_library(OGRE_LIBRARY_DBG NAMES ${OGRE_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Debug") | ||
|
||
make_library_set(OGRE_LIBRARY) | ||
|
||
-if(APPLE) | ||
- set(OGRE_LIBRARY_DBG ${OGRE_LIB_SEARCH_PATH}) | ||
-endif() | ||
if (OGRE_INCOMPATIBLE) | ||
set(OGRE_LIBRARY "NOTFOUND") | ||
endif () | ||
|
||
-set(OGRE_INCLUDE_DIR ${OGRE_CONFIG_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}) | ||
+if("${OGRE_FRAMEWORK_INCLUDES}" STREQUAL NOTFOUND) | ||
+ unset(OGRE_FRAMEWORK_INCLUDES CACHE) | ||
+endif() | ||
+set(OGRE_INCLUDE_DIR ${OGRE_CONFIG_INCLUDE_DIR} ${OGRE_INCLUDE_DIR} ${OGRE_FRAMEWORK_INCLUDES}) | ||
list(REMOVE_DUPLICATES OGRE_INCLUDE_DIR) | ||
findpkg_finish(OGRE) | ||
add_parent_dir(OGRE_INCLUDE_DIRS OGRE_INCLUDE_DIR) | ||
@@ -384,12 +388,13 @@ | ||
) | ||
|
||
macro(ogre_find_component COMPONENT HEADER) | ||
+ set(OGRE_${COMPONENT}_FIND_QUIETLY ${OGRE_FIND_QUIETLY}) | ||
findpkg_begin(OGRE_${COMPONENT}) | ||
find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${COMPONENT} OGRE/${COMPONENT} Components/${COMPONENT}/include) | ||
set(OGRE_${COMPONENT}_LIBRARY_NAMES "Ogre${COMPONENT}${OGRE_LIB_SUFFIX}") | ||
get_debug_names(OGRE_${COMPONENT}_LIBRARY_NAMES) | ||
- find_library(OGRE_${COMPONENT}_LIBRARY_REL NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES} HINTS ${OGRE_LIBRARY_DIR_REL} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel") | ||
- find_library(OGRE_${COMPONENT}_LIBRARY_DBG NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIBRARY_DIR_DBG} PATH_SUFFIXES "" "Debug") | ||
+ find_library(OGRE_${COMPONENT}_LIBRARY_REL NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES} HINTS ${OGRE_LIBRARY_DIR_REL} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel") | ||
+ find_library(OGRE_${COMPONENT}_LIBRARY_DBG NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIBRARY_DIR_DBG} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Debug") | ||
make_library_set(OGRE_${COMPONENT}_LIBRARY) | ||
findpkg_finish(OGRE_${COMPONENT}) | ||
if (OGRE_${COMPONENT}_FOUND) | ||
@@ -402,6 +407,7 @@ | ||
mark_as_advanced(OGRE_${COMPONENT}_BINARY_REL OGRE_${COMPONENT}_BINARY_DBG) | ||
endif() | ||
endif() | ||
+ unset(OGRE_${COMPONENT}_FIND_QUIETLY) | ||
endmacro() | ||
|
||
# look for Paging component | ||
@@ -443,9 +449,9 @@ | ||
get_debug_names(OGRE_${PLUGIN}_LIBRARY_NAMES) | ||
set(OGRE_${PLUGIN}_LIBRARY_FWK ${OGRE_LIBRARY_FWK}) | ||
find_library(OGRE_${PLUGIN}_LIBRARY_REL NAMES ${OGRE_${PLUGIN}_LIBRARY_NAMES} | ||
- HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} PATH_SUFFIXES "" OGRE opt Release Release/opt RelWithDebInfo RelWithDebInfo/opt MinSizeRel MinSizeRel/opt) | ||
+ HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" OGRE OGRE-${OGRE_VERSION} opt Release Release/opt RelWithDebInfo RelWithDebInfo/opt MinSizeRel MinSizeRel/opt) | ||
find_library(OGRE_${PLUGIN}_LIBRARY_DBG NAMES ${OGRE_${PLUGIN}_LIBRARY_NAMES_DBG} | ||
- HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} PATH_SUFFIXES "" OGRE opt Debug Debug/opt) | ||
+ HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" OGRE OGRE-${OGRE_VERSION} opt Debug Debug/opt) | ||
make_library_set(OGRE_${PLUGIN}_LIBRARY) | ||
|
||
if (OGRE_${PLUGIN}_LIBRARY OR OGRE_${PLUGIN}_INCLUDE_DIR) | ||
@@ -582,3 +588,4 @@ | ||
find_path(OGRE_MEDIA_DIR NAMES packs/cubemapsJS.zip HINTS ${OGRE_MEDIA_SEARCH_PATH} | ||
PATHS ${OGRE_PREFIX_PATH} PATH_SUFFIXES ${OGRE_MEDIA_SEARCH_SUFFIX}) | ||
|
||
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ogre.patch | ||
cmake.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#!/usr/bin/make -f | ||
%: | ||
dh $@ --parallel | ||
|
||
override_dh_install: | ||
dh_install --list-missing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
3.0 (quilt) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
version=3 | ||
http://sf.net/opendungeons/opendungeons-([\d\.]+)\.tar\.(?:xz|bz2|gz) |