diff options
Diffstat (limited to 'debian')
-rw-r--r--[-rwxr-xr-x] | debian/Tome.sh | 0 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 6 | ||||
-rw-r--r-- | debian/patches/0001-debcherry-fixup-patch.patch | 80 | ||||
-rw-r--r-- | debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch | 58 | ||||
-rw-r--r-- | debian/patches/0003-debian-cmake-fixes-Change-install-paths-to-FHS-compl.patch | 63 | ||||
-rw-r--r-- | debian/patches/series | 4 | ||||
-rwxr-xr-x | debian/rules | 8 | ||||
-rw-r--r-- | debian/source/format | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/tome.postinst (renamed from debian/postinst) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/tome.postrm (renamed from debian/postrm) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/tome.preinst (renamed from debian/preinst) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/tome.prerm (renamed from debian/prerm) | 0 | ||||
-rw-r--r-- | debian/watch | 5 |
14 files changed, 16 insertions, 218 deletions
diff --git a/debian/Tome.sh b/debian/Tome.sh index 1db52c3d..1db52c3d 100755..100644 --- a/debian/Tome.sh +++ b/debian/Tome.sh diff --git a/debian/changelog b/debian/changelog index 22735270..0c64929e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tome (2.3.11-ah-3) unstable; urgency=low + + * Update standards version to 3.9.6. No changes needed + * Update the VCS-* fields in the control file to use https + * Move to source format 1.0 and use dgit to release + + -- Manoj Srivastava <srivasta@debian.org> Wed, 27 Jan 2016 10:43:27 -0800 + tome (2.3.11-ah-2) unstable; urgency=low * Modified the install paths to deploy to the FHS compliant diff --git a/debian/control b/debian/control index 65950528..73401acc 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: tome -VCS-Git: git://anonscm.debian.org/users/srivasta/debian/tome.git -VCS-Browser: http://anonscm.debian.org/gitweb/?p=users/srivasta/debian/tome.git;a=summary +VCS-Git: https://anonscm.debian.org/git/users/srivasta/debian/tome.git +VCS-Browser: https://anonscm.debian.org/gitweb/?p=users/srivasta/debian/tome.git;a=summary Section: non-free/games Priority: optional Maintainer: Manoj Srivastava <srivasta@debian.org> @@ -9,7 +9,7 @@ Build-Depends: libxaw7-dev, debhelper (>= 9.0.0), libsdl1.2-dev | libsdl-dev, libsdl-mixer1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-net1.2-dev, dpkg-dev (>= 1.16.0), cmake -Standards-Version: 3.9.5.0 +Standards-Version: 3.9.6 Package: tome Architecture: any diff --git a/debian/patches/0001-debcherry-fixup-patch.patch b/debian/patches/0001-debcherry-fixup-patch.patch deleted file mode 100644 index 28c45ba4..00000000 --- a/debian/patches/0001-debcherry-fixup-patch.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c1f79e5b7f2dc335983ba7df981b5d45170295fb Mon Sep 17 00:00:00 2001 -From: Manoj Srivastava <srivasta@golden-gryphon.com> -Date: Wed, 14 May 2014 23:48:09 -0700 -Subject: [PATCH 1/3] debcherry fixup patch - -32318ec [master]: New upstream release - - no changes against upstream or conflicts -786d26c [master]: New upstream release - - extra changes or conflicts -36e907c [topic--debian]: FTBFS due to binutils-gold - - extra changes or conflicts -1021e15 [master]: First phase of a ove to a new build system using dh. - - no changes against upstream or conflicts -23433b4 Added the debian submodule. - - extra changes or conflicts -b15c77f Reduce divergence from upstream, and move to sdl variant - - extra changes or conflicts -815d966 Set the maintainewr address to be a debian role address - - no changes against upstream or conflicts -a83a04d Fix typo in man page - - extra changes or conflicts -a3d690b Revert the -m32 flags; use linux32 instead at run-time - - extra changes or conflicts -79cab02 Build in 32bit mode - - extra changes or conflicts -de0507e Fix initialization of directory for loading/saving games. - - extra changes or conflicts -ae5a5b4 Really synch with upstream - - extra changes or conflicts -a2f1a5c Added a manual page - - extra changes or conflicts -18bd448 Changes to integrate tome into Debian - - extra changes or conflicts ---- - src/config.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/config.h b/src/config.h -index 7c1cf1d..c9f460e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -89,7 +89,7 @@ - /* - * OPTION: Include "ncurses.h" instead of "curses.h" in "main-gcu.c" - */ --/* #define USE_NCURSES */ -+#define USE_NCURSES - - - /* -@@ -226,7 +226,7 @@ - * that file. - */ - #ifndef DEFAULT_PATH --# define DEFAULT_PATH "./lib/" -+# define DEFAULT_PATH "/var/games/tome" - #endif - - -@@ -261,7 +261,7 @@ - /* - * OPTION: Person to bother if something goes wrong. - */ --#define MAINTAINER "darkgod@t-o-m-e.net" -+#define MAINTAINER "tome@packages.debian.org" - - - /* -@@ -282,7 +282,7 @@ - /* ToME options: */ - - /* Should the player know his / her starting life rate? */ --/* #define SHOW_LIFE_RATE */ -+#define SHOW_LIFE_RATE - - /* Allow hordes of 'similar' monsters */ - #define MONSTER_HORDES --- -2.0.0.rc2 - diff --git a/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch b/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch deleted file mode 100644 index 3cc54503..00000000 --- a/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 448e655d55608b18ed6e8e387d5f9c86356900c8 Mon Sep 17 00:00:00 2001 -From: Manoj Srivastava <srivasta@debian.org> -Date: Tue, 21 Oct 2008 08:25:47 -0500 -Subject: [PATCH 2/3] Fix code which needed a 32 bit int to not use int/long - -On amd64, but not on i386, tome produces LUA errors at various -times. The errors occur at savefile load, when wileding a weapon, -unweilding a weapon, and for other events. The same homedir, same -savefiles, same config, same etc., does not produce errors in the -32bit build of the package. - -The error seems to be that the type Number needs to be a 32bit wide -integer; and seems to be defined by default as an long, with an option -to define it as an int for amd64. However, for the 11 arches Debian -supports, this would lead to a morass of selecting architectures in -the makefile to override the type; a better solution is to use -stdint.h and use a type which is 32 bits wide by design: int32_t. - -This fixes the LUA errors, and Closes: Bug#419825 - -Signed-off-by: Manoj Srivastava <srivasta@debian.org> ---- - src/lua/llimits.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/lua/llimits.h b/src/lua/llimits.h -index 4b12450..39a1e0d 100644 ---- a/src/lua/llimits.h -+++ b/src/lua/llimits.h -@@ -10,6 +10,7 @@ - - #include <limits.h> - #include <stddef.h> -+#include <stdint.h> - - - -@@ -36,7 +37,7 @@ - ** GREP LUA_NUMBER to change that - */ - #ifndef LUA_NUM_TYPE --#define LUA_NUM_TYPE long -+#define LUA_NUM_TYPE int32_t - #endif - - typedef LUA_NUM_TYPE Number; -@@ -50,7 +51,7 @@ typedef LUA_NUM_TYPE Number; - - - --typedef unsigned long lint32; /* unsigned int with at least 32 bits */ -+typedef int_least32_t lint32; /* unsigned int with at least 32 bits */ - - - #define MAX_SIZET ((size_t)(~(size_t)0)-2) --- -2.0.0.rc2 - diff --git a/debian/patches/0003-debian-cmake-fixes-Change-install-paths-to-FHS-compl.patch b/debian/patches/0003-debian-cmake-fixes-Change-install-paths-to-FHS-compl.patch deleted file mode 100644 index ab1799f1..00000000 --- a/debian/patches/0003-debian-cmake-fixes-Change-install-paths-to-FHS-compl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 1212be6727cfaa14760f0130cdea635c38fb523b Mon Sep 17 00:00:00 2001 -From: Manoj Srivastava <srivasta@golden-gryphon.com> -Date: Wed, 14 May 2014 23:46:05 -0700 -Subject: [PATCH 3/3] [debian-cmake-fixes]: Change install paths to FHS - compliant games - -So the binary lives in /usr/games/tome, instead of /usr/bin/tome - -Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com> ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 91512a6..72cd53e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,7 @@ endif(WIN32) - # Set the path for loading the library bits. - # - IF(SYSTEM_INSTALL) -- SET(DEFAULT_PATH "${CMAKE_INSTALL_PREFIX}/lib/tome") -+ SET(DEFAULT_PATH "/var/games/tome") - ELSE() - SET(DEFAULT_PATH "./lib") - ENDIF() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e2e6264..932fef4 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,9 +4,9 @@ ADD_SUBDIRECTORY(lua) - SET(SRCS - main-gcu.c main-x11.c main-xaw.c main-sdl.c main-gtk2.c - z-rand.c z-util.c z-form.c z-virt.c z-term.c -- variable.c tables.c plots.c util.c cave.c dungeon.c -- melee1.c melee2.c modules.c -- object1.c object2.c randart.c squeltch.c traps.c -+ variable.c tables.c plots.c util.c cave.c dungeon.c -+ melee1.c melee2.c modules.c -+ object1.c object2.c randart.c squeltch.c traps.c - monster1.c monster2.c monster3.c - xtra1.c xtra2.c skills.c powers.c gods.c - spells1.c spells2.c -@@ -15,7 +15,7 @@ SET(SRCS - help.c - generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c - cmovie.c -- wizard2.c init2.c birth.c wizard1.c init1.c main.c -+ wizard2.c init2.c birth.c wizard1.c init1.c main.c - # Lua bits: - lua_bind.c script.c w_mnster.c w_player.c w_play_c.c w_z_pack.c - w_obj.c w_util.c w_spells.c w_quest.c w_dun.c -@@ -68,5 +68,5 @@ TARGET_LINK_LIBRARIES(tome lua ${LIBS}) - - # Installation - INSTALL(TARGETS tome -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION games - ) --- -2.0.0.rc2 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index bb1818e2..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -# exported from git by git-debcherry -0001-debcherry-fixup-patch.patch -0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch -0003-debian-cmake-fixes-Change-install-paths-to-FHS-compl.patch diff --git a/debian/rules b/debian/rules index 7e771906..c31c20b0 100755 --- a/debian/rules +++ b/debian/rules @@ -44,10 +44,10 @@ override_dh_auto_configure: dh_auto_configure -- -DSYSTEM_INSTALL:BOOL=true override_dh_auto_build: - bash -n debian/postinst - bash -n debian/postrm - bash -n debian/prerm - bash -n debian/preinst + bash -n debian/tome.postinst + bash -n debian/tome.postrm + bash -n debian/tome.prerm + bash -n debian/tome.preinst bash -n debian/Tome.sh override_dh_install: diff --git a/debian/source/format b/debian/source/format index 163aaf8d..d3827e75 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 diff --git a/debian/postinst b/debian/tome.postinst index 50a53dec..50a53dec 100755..100644 --- a/debian/postinst +++ b/debian/tome.postinst diff --git a/debian/postrm b/debian/tome.postrm index f813beec..f813beec 100755..100644 --- a/debian/postrm +++ b/debian/tome.postrm diff --git a/debian/preinst b/debian/tome.preinst index 482380f0..482380f0 100755..100644 --- a/debian/preinst +++ b/debian/tome.preinst diff --git a/debian/prerm b/debian/tome.prerm index d6b5bd27..d6b5bd27 100755..100644 --- a/debian/prerm +++ b/debian/tome.prerm diff --git a/debian/watch b/debian/watch deleted file mode 100644 index bbfe26ba..00000000 --- a/debian/watch +++ /dev/null @@ -1,5 +0,0 @@ -# format version number, currently 2; this line is compulsory! -version=3 - -opts="uversionmangle=s/(\d)(\d)(\d)/$1.$2.$3/g" http://t-o-m-e.net/dl/src/tome-(2.*)-src.tar.bz2 - |