r14499 - in packages/trunk/dccnitghtmare/debian: . patches

Vincent Prat vivicoder-guest at alioth.debian.org
Sat Aug 17 17:36:48 UTC 2013


Author: vivicoder-guest
Date: 2013-08-17 17:36:47 +0000 (Sat, 17 Aug 2013)
New Revision: 14499

Added:
   packages/trunk/dccnitghtmare/debian/clean
   packages/trunk/dccnitghtmare/debian/dccnitghtmare-data.install
   packages/trunk/dccnitghtmare/debian/patches/data_path
   packages/trunk/dccnitghtmare/debian/patches/debug
   packages/trunk/dccnitghtmare/debian/patches/name_change
Removed:
   packages/trunk/dccnitghtmare/debian/patches/build
Modified:
   packages/trunk/dccnitghtmare/debian/changelog
   packages/trunk/dccnitghtmare/debian/control
   packages/trunk/dccnitghtmare/debian/dccnitghtmare.install
   packages/trunk/dccnitghtmare/debian/patches/series
   packages/trunk/dccnitghtmare/debian/rules
Log:
New upstream release: 0.10


Modified: packages/trunk/dccnitghtmare/debian/changelog
===================================================================
--- packages/trunk/dccnitghtmare/debian/changelog	2013-08-16 18:37:09 UTC (rev 14498)
+++ packages/trunk/dccnitghtmare/debian/changelog	2013-08-17 17:36:47 UTC (rev 14499)
@@ -1,4 +1,4 @@
-dccnitghtmare (0.9-1) UNRELEASED; urgency=low
+dccnitghtmare (0.10-1) UNRELEASED; urgency=low
 
   [ Miriam Ruiz ]
   * Initial release. Closes: #610875
@@ -6,4 +6,7 @@
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 27 May 2012 22:30:33 +0200
+  [ Vincent Prat ]
+  * New upstream release
+
+ -- Vincent Prat <vinceprat at free.fr>  Sat, 17 Aug 2013 19:21:31 +0200

Added: packages/trunk/dccnitghtmare/debian/clean
===================================================================
--- packages/trunk/dccnitghtmare/debian/clean	                        (rev 0)
+++ packages/trunk/dccnitghtmare/debian/clean	2013-08-17 17:36:47 UTC (rev 14499)
@@ -0,0 +1,8 @@
+CMakeCache.txt
+Doxyfile
+Makefile
+cmake_install.cmake
+install_manifest.txt
+po/cmake_install.cmake
+po/Makefile
+src/config.h

Modified: packages/trunk/dccnitghtmare/debian/control
===================================================================
--- packages/trunk/dccnitghtmare/debian/control	2013-08-16 18:37:09 UTC (rev 14498)
+++ packages/trunk/dccnitghtmare/debian/control	2013-08-17 17:36:47 UTC (rev 14499)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, autotools-dev,
+Build-Depends: debhelper (>= 7), quilt, cmake,
  libcal3d12-dev, libopenal-dev, libsdl1.2-dev, libsdl-image1.2-dev,
  libsdl-ttf2.0-dev, libvorbis-dev, libgl1-mesa-dev
 Standards-Version: 3.9.3

Added: packages/trunk/dccnitghtmare/debian/dccnitghtmare-data.install
===================================================================
--- packages/trunk/dccnitghtmare/debian/dccnitghtmare-data.install	                        (rev 0)
+++ packages/trunk/dccnitghtmare/debian/dccnitghtmare-data.install	2013-08-17 17:36:47 UTC (rev 14499)
@@ -0,0 +1 @@
+debian/tmp/usr/local/share/dccnitghtmare/data/* usr/share/dccnitghtmare/data/

Modified: packages/trunk/dccnitghtmare/debian/dccnitghtmare.install
===================================================================
--- packages/trunk/dccnitghtmare/debian/dccnitghtmare.install	2013-08-16 18:37:09 UTC (rev 14498)
+++ packages/trunk/dccnitghtmare/debian/dccnitghtmare.install	2013-08-17 17:36:47 UTC (rev 14499)
@@ -1,3 +1,4 @@
 debian/*.png usr/share/pixmaps/
 debian/*.xpm usr/share/pixmaps/
 debian/*.desktop usr/share/applications/
+debian/tmp/usr/local/bin/* usr/games/

Deleted: packages/trunk/dccnitghtmare/debian/patches/build
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/build	2013-08-16 18:37:09 UTC (rev 14498)
+++ packages/trunk/dccnitghtmare/debian/patches/build	2013-08-17 17:36:47 UTC (rev 14499)
@@ -1,34 +0,0 @@
---- dccnitghtmare.orig/Makefile.in
-+++ dccnitghtmare/Makefile.in
-@@ -43,23 +43,23 @@
- 	@cd ./src && ${MAKE} clean;
- 	@cd ./po && ${MAKE} clean > make_po.log ;
- 
--install: $(BIN)dccnitghtmare
-+install: $(BIN)dnt
- 	@printf "Installing DccNiTghtmare bin files... "
--	@mkdir -p $(bindir)
--	@$(INSTALL) -c -m 755 $(BIN)dccnitghtmare $(bindir)/
-+	@mkdir -p $(DESTDIR)/$(bindir)
-+	@$(INSTALL) -c -m 755 $(BIN)dccnitghtmare $(DESTDIR)/$(bindir)/
- 	@printf "\e[0;32mDone.\e[0;0m\n"
- 	@printf "Installing DccNiTghtmare data files... "
--	@sh install.sh $(datadir) $(PACKAGE) $(INSTALL)
--	@$(INSTALL) -c -m 644 $(BIN)dcc.opc $(datadir)/$(PACKAGE)
-+	@sh install.sh $(DATADIR)/$(datadir) $(PACKAGE) $(INSTALL)
-+	@$(INSTALL) -c -m 644 $(BIN)dcc.opc $(DATADIR)/$(datadir)/$(PACKAGE)
- 	@printf "\e[0;32mDone.\e[0;0m\n"
- 	@printf "Installing DccNiTghtmare Language files... "
--	@cd ./po && ${MAKE} install > /dev/null ;
-+	@cd ./po && ${MAKE} install ;
- 	@printf "\e[0;32mDone.\e[0;0m\n"
- 
- uninstall:
- 	@printf "Uninstalling DccNiTghtmare files... "
--	@rm -f $(bindir)/dccnitghtmare
--	@rm -rf $(datadir)/$(PACKAGE)
-+	@rm -f $(DESTDIR)/$(bindir)/dccnitghtmare
-+	@rm -rf $(DATADIR)/$(datadir)/$(PACKAGE)
- 	@printf "\e[0;32mDone.\e[0;0m\n"
- 	
- 

Added: packages/trunk/dccnitghtmare/debian/patches/data_path
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/data_path	                        (rev 0)
+++ packages/trunk/dccnitghtmare/debian/patches/data_path	2013-08-17 17:36:47 UTC (rev 14499)
@@ -0,0 +1,12 @@
+Author: Vincent Prat <vinceprat at free.fr>
+Description: Modification of the CMAKE_INSTALL_PREFIX so that the executable finds the data directory
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,7 @@
+ endif(${VERSION_PATCH})
+ 
+ # Set directories
++set(CMAKE_INSTALL_PREFIX /usr)
+ set(DATADIR ${CMAKE_INSTALL_PREFIX}/share)
+ set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
+ set(LOCALE_DIR share/locale)

Added: packages/trunk/dccnitghtmare/debian/patches/debug
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/debug	                        (rev 0)
+++ packages/trunk/dccnitghtmare/debian/patches/debug	2013-08-17 17:36:47 UTC (rev 14499)
@@ -0,0 +1,13 @@
+Author: Vincent Prat <vinceprat at free.fr>
+Description: Enables debugging by adding the -g compilation flag
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,7 +55,7 @@
+ 
+ # Some compiler options
+ if(UNIX)
+-   add_definitions(-Wall)
++   add_definitions(-g -Wall)
+ endif(UNIX)
+ 
+ 

Added: packages/trunk/dccnitghtmare/debian/patches/name_change
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/name_change	                        (rev 0)
+++ packages/trunk/dccnitghtmare/debian/patches/name_change	2013-08-17 17:36:47 UTC (rev 14499)
@@ -0,0 +1,65 @@
+Author: Vincent Prat <vinceprat at free.fr>
+Description: Changes the name dnt to dccnitghtmare
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ 
+ cmake_minimum_required(VERSION 2.8)
+ 
+-set(PACKAGE dnt)
++set(PACKAGE dccnitghtmare)
+ 
+ # Set Version number
+ set(VERSION_MAJOR 0)
+@@ -43,7 +43,7 @@
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BIN_DIR})
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ./CMakeFiles)
+ 
+-project(dnt)
++project(dccnitghtmare)
+ 
+ # 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 @@
+                  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
+          ${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)
+ 
+ 
+ ELSE(${CREATE_BUNDLE} STREQUAL "ON")
+ 
+    # Make Binaries
+-   add_executable(dnt WIN32 ${DNT_SOURCES} ${DNT_HEADERS} )
+-   target_link_libraries(dnt dntlib farso ${OPENGL_LIBRARY} 
++   add_executable(dccnitghtmare WIN32 ${DNT_SOURCES} ${DNT_HEADERS} )
++   target_link_libraries(dccnitghtmare 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"))
+    # Install files
+-   install(TARGETS dnt DESTINATION bin)
++   install(TARGETS dccnitghtmare DESTINATION bin)
+    install(DIRECTORY ./data DESTINATION share/${PACKAGE})
+ endif(NOT (${CREATE_BUNDLE} STREQUAL "ON"))
+ 

Modified: packages/trunk/dccnitghtmare/debian/patches/series
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/series	2013-08-16 18:37:09 UTC (rev 14498)
+++ packages/trunk/dccnitghtmare/debian/patches/series	2013-08-17 17:36:47 UTC (rev 14499)
@@ -1 +1,3 @@
-build
+name_change
+data_path
+debug

Modified: packages/trunk/dccnitghtmare/debian/rules
===================================================================
--- packages/trunk/dccnitghtmare/debian/rules	2013-08-16 18:37:09 UTC (rev 14498)
+++ packages/trunk/dccnitghtmare/debian/rules	2013-08-17 17:36:47 UTC (rev 14499)
@@ -3,84 +3,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_OPTIONS="nostrip noopt"
 
-#LDFLAGS=-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
+%:
+	dh $@ --parallel
 
-config: config-stamp
-config-stamp: 
-	dh_testdir
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure $(CROSS) \
-		--verbose \
-		--prefix=/usr \
-		--datarootdir=\$${prefix}/share \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		CFLAGS="$(CFLAGS)"
-	touch $@
+override_dh_auto_clean:
+	rm -rf CMakeFiles \
+		po/CMakeFiles \
+		bin
 
-build: build-stamp
-build-stamp: config
-	dh_testdir
-	$(MAKE)
-	touch $@
+override_dh_auto_configure:
+	cmake .
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -fv build-stamp config-stamp
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -fv config.sub config.guess config.cache config.log config.status
-	rm -fv `find . -name "Makefile"`
-	rm -fv Doxyfile po/make_po.log po/Makefile.in src/config.h
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/dccnitghtmare DATADIR=$(CURDIR)/debian/dccnitghtmare-data install
-
-# Build architecture-independent files here.
-binary-indep: install
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_install
-#	dh_installmenu
-	dh_installman
-	dh_link
+override_dh_strip:
 	dh_strip --dbg-package=dccnitghtmare-dbg
-	dh_compress
-	dh_fixperms
-	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install 




More information about the Pkg-games-commits mailing list