--- deng-1.9.0-beta6.9+dfsg1.orig/doomsday/CMakeLists.txt +++ deng-1.9.0-beta6.9+dfsg1/doomsday/CMakeLists.txt @@ -1,4 +1,4 @@ -## Copyright (c) 2006 - 2008 Jamie Jones +## Copyright (c) 2006 - 2011 Jamie Jones ## Copyright (c) 2007 - 2008 Daniel Swanson ## Copyright (c) 2008 - 2009 Jaakko Keränen ## @@ -133,21 +133,21 @@ ## easy transition for package maintainers (like me when I'm not hacking here) SET (bindir - ${CMAKE_INSTALL_PREFIX}/bin + /usr/games CACHE PATH "install location for executables" ) SET (libdir - ${CMAKE_INSTALL_PREFIX}/lib + /usr/lib/deng CACHE PATH "install location for libraries" ) SET (datadir - ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} + /usr/share/deng CACHE PATH "install location for data files" @@ -277,6 +277,13 @@ INCLUDE(TestBigEndian) +IF (UNIX) + IF (NOT APPLE) + FIND_PACKAGE(libm REQUIRED) + ENDIF (NOT APPLE) +ENDIF (UNIX) + + ################################################################################ ######################## Cpack - Generate packages and source tarballs ######## @@ -647,7 +654,7 @@ IF (NOT WIN32) TARGET_LINK_LIBRARIES (doomsday dl) IF (NOT APPLE) - TARGET_LINK_LIBRARIES (doomsday ${X11_LIBRARIES}) + TARGET_LINK_LIBRARIES (doomsday ${X11_LIBRARIES} ${LIBM_LIBRARIES}) ENDIF (NOT APPLE) ENDIF (NOT WIN32) ENDIF (UNIX) --- deng-1.9.0-beta6.9+dfsg1.orig/doomsday/engine/portable/src/dd_zone.c +++ deng-1.9.0-beta6.9+dfsg1/doomsday/engine/portable/src/dd_zone.c @@ -71,6 +71,8 @@ #define MINFRAGMENT (sizeof(memblock_t)+32) +#define ALIGNED(x) (((x) + sizeof(void*) - 1)&(~(sizeof(void*) - 1))) + // TYPES ------------------------------------------------------------------- /** @@ -344,6 +346,9 @@ return NULL; } + // Align to pointer size. + size = ALIGNED(size); + // Account for size of block header. size += sizeof(memblock_t); @@ -716,7 +721,7 @@ { void *ptr = Z_Malloc(size, tag, user); - memset(ptr, 0, size); + memset(ptr, 0, ALIGNED(size)); return ptr; } --- deng-1.9.0-beta6.9+dfsg1.orig/doomsday/build/cmake/Findlibm.cmake +++ deng-1.9.0-beta6.9+dfsg1/doomsday/build/cmake/Findlibm.cmake @@ -0,0 +1,67 @@ +# - Try to find LIBM +# Once done this will define +# +# LIBM_FOUND - system has LIBM +# LIBM_INCLUDE_DIRS - the LIBM include directory +# LIBM_LIBRARIES - Link these to use LIBM +# LIBM_DEFINITIONS - Compiler switches required for using LIBM +# +# Copyright (c) 2011 Jamie Jones +# +# Redistribution and use is allowed according to the terms of the +# GNU GPL v3 +# + + +if (LIBM_LIBRARIES AND LIBM_INCLUDE_DIRS) + # in cache already + set(LIBM_FOUND TRUE) +else (LIBM_LIBRARIES AND LIBM_INCLUDE_DIRS) + find_path(LIBM_INCLUDE_DIR + NAMES + math.h + PATHS + $ENV{LIBMDIR}/include + /usr/include + /usr/local/include + /opt/local/include + /sw/include + ) + + find_library(LIBM_LIBRARY + NAMES + m + PATHS + $ENV{LIBMDIR}/libs + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + set(LIBM_INCLUDE_DIRS + ${LIBM_INCLUDE_DIR} + ) + set(LIBM_LIBRARIES + ${LIBM_LIBRARY} +) + + if (LIBM_INCLUDE_DIRS AND LIBM_LIBRARIES) + set(LIBM_FOUND TRUE) + endif (LIBM_INCLUDE_DIRS AND LIBM_LIBRARIES) + + if (LIBM_FOUND) + if (NOT LIBM_FIND_QUIETLY) + message(STATUS "Found LIBM: ${LIBM_LIBRARIES}") + endif (NOT LIBM_FIND_QUIETLY) + else (LIBM_FOUND) + if (LIBM_FIND_REQUIRED) + message(FATAL_ERROR "Could not find LIBM") + endif (LIBM_FIND_REQUIRED) + endif (LIBM_FOUND) + + # show the LIBM_INCLUDE_DIRS and LIBM_LIBRARIES variables only in the advanced view + mark_as_advanced(LIBM_INCLUDE_DIRS LIBM_LIBRARIES) + +endif (LIBM_LIBRARIES AND LIBM_INCLUDE_DIRS) + --- deng-1.9.0-beta6.9+dfsg1.orig/debian/docs +++ deng-1.9.0-beta6.9+dfsg1/debian/docs @@ -0,0 +1,2 @@ +doomsday/engine/doc/dhistory.txt +doomsday/engine/doc/network.txt --- deng-1.9.0-beta6.9+dfsg1.orig/debian/manpages +++ deng-1.9.0-beta6.9+dfsg1/debian/manpages @@ -0,0 +1 @@ +debian/doomsday.6 --- deng-1.9.0-beta6.9+dfsg1.orig/debian/changelog +++ deng-1.9.0-beta6.9+dfsg1/debian/changelog @@ -0,0 +1,34 @@ +deng (1.9.0-beta6.9+dfsg1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Moving doom-wad from Recommends: to Suggests: (Closes: #661329). + + -- Thomas Goirand Sun, 29 Apr 2012 04:34:41 +0000 + +deng (1.9.0-beta6.9+dfsg1-2) unstable; urgency=low + + * Add a patch from Jamie Jones to fix a FTBFS. Closes: #622583. + * Include the following changes from -1, which were + accidentally omitted: + * Patched dd_zone.c file as needed + * Fixed paths in CMakeLists.txt file in order to reflect Debian policies. + * Adjust debian/copyright to not trigger lintian warning about templates. + * Split build into build arch/indep (more work to do here) + * Bump standards version. + * Tweak description to avoid description-synopsis-starts-with-article. + + -- Jon Dowland Mon, 26 Sep 2011 20:13:49 +0100 + +deng (1.9.0-beta6.9+dfsg1-1) unstable; urgency=low + + [ Kees Meijs ] + * Initial release. Closes: #463002. + * Patched dd_zone.c file as needed, mentioned on: + http://dengine.net/dew/index.php?title=User_talk:Yagisan#svn_4165_dd_zone.c. + * Fixed paths in CMakeLists.txt file in order to reflect Debian policies. + * Cleaned up original sources (see README.source). + + [ Jon Dowland ] + * add dversionmangle to watch file, to remove dfsg suffix + + -- Jon Dowland Tue, 08 Mar 2011 22:05:24 +0000 --- deng-1.9.0-beta6.9+dfsg1.orig/debian/rules +++ deng-1.9.0-beta6.9+dfsg1/debian/rules @@ -0,0 +1,78 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + mkdir doomsdaybuild + cd doomsdaybuild && cmake -DCMAKE_INSTALL_PREFIX=/usr $(CURDIR)/doomsday + + touch configure-stamp + +build: build-arch build-indep + +build-indep: + +build-arch: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + cd doomsdaybuild && $(MAKE) + xsltproc --nonet \ + --param make.year.ranges 1 \ + --param make.single.year.ranges 1 \ + --param man.charmap.use.subset 0 \ + -o debian/ \ + /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \ + doomsday/engine/doc/manpage.xml + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + rm -f debian/doomsday.6 + rm -rf doomsdaybuild + rm -rf debian/doomsday + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + make -C doomsdaybuild install DESTDIR=$(CURDIR)/debian/doomsday install + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- deng-1.9.0-beta6.9+dfsg1.orig/debian/copyright +++ deng-1.9.0-beta6.9+dfsg1/debian/copyright @@ -0,0 +1,45 @@ +This work was packaged for Debian by: + + Kees Meijs on Tue, 30 Nov 2010 20:12:41 +0100 + +It was downloaded from: + + http://sourceforge.net/projects/deng/ + +Upstream Authors: + + Jaakko Keränen + Daniel Swanson + +Copyright: + + Copyright (C) 2006 - 2008 Jamie Jones + Copyright (C) 2007 - 2008 Daniel Swanson + Copyright (C) 2008 - 2009 Jaakko Keränen + +License: + + This package 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 2 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 + +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +The Debian packaging is: + + Copyright (C) 2010 Kees Meijs + +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 2 of the License, or +(at your option) any later version. --- deng-1.9.0-beta6.9+dfsg1.orig/debian/README.source +++ deng-1.9.0-beta6.9+dfsg1/debian/README.source @@ -0,0 +1,6 @@ +deng for Debian +--------------- +Sources below md2tool, snowberry and texc aren't used in this package +(and thus removed). The library sources libcurl, libpng, zlib were +removed as well in order to not conflict with existing Debian +library packages. --- deng-1.9.0-beta6.9+dfsg1.orig/debian/watch +++ deng-1.9.0-beta6.9+dfsg1/debian/watch @@ -0,0 +1,6 @@ +# Compulsory line, this is a version 3 file +version=3 + +# Find new files on sourceforge, for devscripts >= 2.9 +opts=dversionmangle=s/\+dfsg1// \ +http://sf.net/deng/deng-(.*)\.tar\.gz --- deng-1.9.0-beta6.9+dfsg1.orig/debian/control +++ deng-1.9.0-beta6.9+dfsg1/debian/control @@ -0,0 +1,22 @@ +Source: deng +Section: games +Priority: optional +Maintainer: Kees Meijs +Uploaders: Jon Dowland +Build-Depends: debhelper (>= 7.0.50~), docbook-xsl, docbook-xml, xsltproc, cmake, graphviz, doxygen, libncurses5-dev, libcurl3-openssl-dev, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libpng-dev, python, zlib1g-dev +Standards-Version: 3.9.2 +Homepage: http://www.dengine.net/ + +Package: doomsday +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: timidity +Suggests: game-data-packager, doom-wad +Description: enhanced version of the legendary DOOM game + The purpose of the Doomsday Engine project is to create versions of DOOM, + Heretic and Hexen that feel the same as the original games but are implemented + using modern techniques such as 3D graphics and client/server networking. A + lot of emphasis is placed on good-looking graphics. + . + Doomsday Engine (or deng for short) requires an IWAD to play. You can install + your commercial IWADs using game-data-packager. --- deng-1.9.0-beta6.9+dfsg1.orig/debian/compat +++ deng-1.9.0-beta6.9+dfsg1/debian/compat @@ -0,0 +1 @@ +7 --- deng-1.9.0-beta6.9+dfsg1.orig/debian/source/format +++ deng-1.9.0-beta6.9+dfsg1/debian/source/format @@ -0,0 +1 @@ +1.0