r14503 - in packages/trunk/dccnitghtmare/debian: . patches
Vincent Prat
vivicoder-guest at alioth.debian.org
Sat Aug 17 22:37:35 UTC 2013
Author: vivicoder-guest
Date: 2013-08-17 22:37:35 +0000 (Sat, 17 Aug 2013)
New Revision: 14503
Added:
packages/trunk/dccnitghtmare/debian/dccnitghtmare-tools.install
packages/trunk/dccnitghtmare/debian/patches/tools
Modified:
packages/trunk/dccnitghtmare/debian/control
packages/trunk/dccnitghtmare/debian/dccnitghtmare.install
packages/trunk/dccnitghtmare/debian/patches/name_change
packages/trunk/dccnitghtmare/debian/patches/series
Log:
Package containing map and particle editors added
Modified: packages/trunk/dccnitghtmare/debian/control
===================================================================
--- packages/trunk/dccnitghtmare/debian/control 2013-08-17 18:47:13 UTC (rev 14502)
+++ packages/trunk/dccnitghtmare/debian/control 2013-08-17 22:37:35 UTC (rev 14503)
@@ -39,3 +39,12 @@
3D single player RPG in a satirical post-apocalyptical world.
.
This package contains the game data.
+
+Package: dccnitghtmare-tools
+Architecture: any
+Depends: dccnitghtmare-data (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: 3D single player RPG in a satirical post-apocalyptical world
+ DccNiTghtmare (aka DNT) is a project to make a Free (as in free speech)
+ 3D single player RPG in a satirical post-apocalyptical world.
+ .
+ This package contains editors for the game data.
Added: packages/trunk/dccnitghtmare/debian/dccnitghtmare-tools.install
===================================================================
--- packages/trunk/dccnitghtmare/debian/dccnitghtmare-tools.install (rev 0)
+++ packages/trunk/dccnitghtmare/debian/dccnitghtmare-tools.install 2013-08-17 22:37:35 UTC (rev 14503)
@@ -0,0 +1 @@
+debian/tmp/usr/local/bin/dnt-* usr/games/
Modified: packages/trunk/dccnitghtmare/debian/dccnitghtmare.install
===================================================================
--- packages/trunk/dccnitghtmare/debian/dccnitghtmare.install 2013-08-17 18:47:13 UTC (rev 14502)
+++ packages/trunk/dccnitghtmare/debian/dccnitghtmare.install 2013-08-17 22:37:35 UTC (rev 14503)
@@ -1,4 +1,4 @@
debian/*.png usr/share/pixmaps/
debian/*.xpm usr/share/pixmaps/
debian/*.desktop usr/share/applications/
-debian/tmp/usr/local/bin/* usr/games/
+debian/tmp/usr/local/bin/dccnitghtmare usr/games/
Modified: packages/trunk/dccnitghtmare/debian/patches/name_change
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/name_change 2013-08-17 18:47:13 UTC (rev 14502)
+++ packages/trunk/dccnitghtmare/debian/patches/name_change 2013-08-17 22:37:35 UTC (rev 14503)
@@ -20,30 +20,16 @@
# Some Options
option(DEBUG_ASTAR "Enable A* Visual Debug" OFF)
-@@ -124,7 +124,7 @@
- set(DNT_SOURCES ${DNT_SOURCES} ${OSX_ICON_FILES})
-
- # Create the executable as BUNDLE
-- add_executable(dnt MACOSX_BUNDLE ${DNT_SOURCES} ${DNT_HEADERS} )
-+ add_executable(dccnitghtmare MACOSX_BUNDLE ${DNT_SOURCES} ${DNT_HEADERS} )
-
- # Search for bundle libraries
- find_library(IOKIT_LIBRARY IOKit)
-@@ -148,20 +148,20 @@
+@@ -148,7 +148,7 @@
dntlib farso)
# configure CMake to use a custom Info.plist
- set_target_properties(dnt PROPERTIES MACOSX_BUNDLE_INFO_PLIST
-+ set_target_properties(dccnitghtmare PROPERTIES MACOSX_BUNDLE_INFO_PLIST
++ set_target_properties(dnt PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${PROJECT_SOURCE_DIR}/macosx/DNT-Info.plist)
# Add data files to resources
- add_custom_target(dntData COMMAND cp -R ${PROJECT_SOURCE_DIR}/data
- ${CMAKE_BINARY_DIR}/bin/dnt.app/Contents/Resources)
-- add_dependencies(dnt dntData)
-+ add_dependencies(dccnitghtmare dntData)
-
-
+@@ -160,25 +160,25 @@
ELSE(${CREATE_BUNDLE} STREQUAL "ON")
# Make Binaries
@@ -54,6 +40,27 @@
${OPENAL_LIBRARY}
${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY}
${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY}
+ ${OGG_LIBRARY} ${CAL3D_LIBRARY} m
+ ${LIBINTL_LIBRARIES} pthread)
+
+- add_executable(dntMapEditor WIN32
++ add_executable(dnt-map-editor WIN32
+ ${DNT_MAP_EDITOR_SOURCES} ${DNT_MAP_EDITOR_HEADERS})
+- target_link_libraries(dntMapEditor dntlib farso ${OPENGL_LIBRARY}
++ target_link_libraries(dnt-map-editor dntlib farso ${OPENGL_LIBRARY}
+ ${OPENAL_LIBRARY}
+ ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY}
+ ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY}
+ ${OGG_LIBRARY} m ${CAL3D_LIBRARY}
+ ${LIBINTL_LIBRARIES} pthread)
+- add_executable(dntPartEditor WIN32
++ add_executable(dnt-part-editor WIN32
+ ${DNT_PART_EDITOR_SOURCES} ${DNT_PART_EDITOR_HEADERS})
+- target_link_libraries(dntPartEditor dntlib farso ${OPENGL_LIBRARY}
++ target_link_libraries(dnt-part-editor dntlib farso ${OPENGL_LIBRARY}
+ ${OPENAL_LIBRARY}
+ ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY}
+ ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY}
@@ -267,7 +267,7 @@
if(NOT (${CREATE_BUNDLE} STREQUAL "ON"))
Modified: packages/trunk/dccnitghtmare/debian/patches/series
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/series 2013-08-17 18:47:13 UTC (rev 14502)
+++ packages/trunk/dccnitghtmare/debian/patches/series 2013-08-17 22:37:35 UTC (rev 14503)
@@ -1,3 +1,4 @@
name_change
data_path
debug
+tools
Added: packages/trunk/dccnitghtmare/debian/patches/tools
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/tools (rev 0)
+++ packages/trunk/dccnitghtmare/debian/patches/tools 2013-08-17 22:37:35 UTC (rev 14503)
@@ -0,0 +1,35 @@
+Author: Vincent Prat <vinceprat at free.fr>
+Description: Adding map and part editors
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -269,6 +269,8 @@
+ if(NOT (${CREATE_BUNDLE} STREQUAL "ON"))
+ # Install files
+ install(TARGETS dccnitghtmare DESTINATION bin)
++ install(TARGETS dnt-map-editor DESTINATION bin)
++ install(TARGETS dnt-part-editor DESTINATION bin)
+ install(DIRECTORY ./data DESTINATION share/${PACKAGE})
+ endif(NOT (${CREATE_BUNDLE} STREQUAL "ON"))
+
+--- a/src/app/partEditor/editor.cpp
++++ b/src/app/partEditor/editor.cpp
+@@ -202,7 +202,7 @@
+ fileLoading = load;
+ fileWindow = gui->insertWindow(200,100,460,285,"File");
+ fileSelector = fileWindow->getObjectsList()->insertFileSel(5,18,load,
+- "../data/particles/");
++ "/usr/share/dccnitghtmare/data/particles/");
+ fileSelector->setFilter(".par");
+ if( (!fileLoading) && (!curFileName.empty()) )
+ {
+--- a/src/app/partEditor/partwindow.cpp
++++ b/src/app/partEditor/partwindow.cpp
+@@ -58,7 +58,7 @@
+
+ textureWindow = gui->insertWindow(200,100,460,285,"File");
+ fileSelector = textureWindow->getObjectsList()->insertFileSel(5,18, true,
+- "../data/particles/");
++ "/usr/share/dccnitghtmare/data/particles/");
+ fileSelector->setFilter(".png");
+ /*fileSelector->setFileName(part->getTextureFileName());*/
+ textureWindow->setAttributes(false,true,false,false);
More information about the Pkg-games-commits
mailing list