I am uploading a NMU to DELAYED/10 in order to fix this.
diff -Nru tome-2.41-ah~0.git.20200131/CMakeLists.txt
tome-2.41-ah~0.git.20200131/CMakeLists.txt
--- tome-2.41-ah~0.git.20200131/CMakeLists.txt 2023-11-08 21:43:48.000000000
+0100
+++ tome-2.41-ah~0.git.20200131/CMakeLists.txt 2020-02-02 13:00:22.000000000
+0100
@@ -28,7 +28,7 @@
#
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
SET(CMAKE_C_FLAGS_RELEASE "-O2")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${SANITIZER_FLAGS}")
#
# C++ Compiler Flags
@@ -36,7 +36,7 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSONCONS_NO_DEPRECATED")
SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_GLIBCXX_DEBUG
-D_GLIBCXX_DEBUG_PEDANTIC")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${SANITIZER_FLAGS} -D_GLIBCXX_DEBUG
-D_GLIBCXX_DEBUG_PEDANTIC")
#
# GCC Flags
@@ -100,7 +100,7 @@
# Set the path for loading the library bits.
#
IF(SYSTEM_INSTALL)
- SET(DEFAULT_PATH "/var/games/tome")
+ SET(DEFAULT_PATH "${CMAKE_INSTALL_PREFIX}/lib/tome")
ELSE()
SET(DEFAULT_PATH "./lib")
ENDIF()
diff -Nru tome-2.41-ah~0.git.20200131/debian/changelog
tome-2.41-ah~0.git.20200131/debian/changelog
--- tome-2.41-ah~0.git.20200131/debian/changelog 2023-11-08
21:43:48.000000000 +0100
+++ tome-2.41-ah~0.git.20200131/debian/changelog 2023-11-08
21:30:58.000000000 +0100
@@ -1,3 +1,11 @@
+tome (2.41-ah~0.git.20200131-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop GTK 2 binary (Closes: #967779).
+ * Convert to source format 3.0 (Closes: #1055609).
+
+ -- Bastian Germann <b...@debian.org> Wed, 08 Nov 2023 21:30:58 +0100
+
tome (2.41-ah~0.git.20200131-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru tome-2.41-ah~0.git.20200131/debian/control
tome-2.41-ah~0.git.20200131/debian/control
--- tome-2.41-ah~0.git.20200131/debian/control 2023-11-08 21:43:48.000000000
+0100
+++ tome-2.41-ah~0.git.20200131/debian/control 2023-11-08 21:30:43.000000000
+0100
@@ -7,7 +7,7 @@
Homepage: https://github.com/tome2/tome2
Build-Depends: debhelper-compat (= 12), libjansson-dev, cmake,
libncurses5-dev | libncurses-dev | ncurses-dev, libboost-all-dev,
- libx11-dev, libgtk2.0-dev, dpkg-dev (>= 1.16.0)
+ libx11-dev, dpkg-dev (>= 1.16.0)
XS-Autobuild: yes
Standards-Version: 4.3.0
diff -Nru tome-2.41-ah~0.git.20200131/debian/patches/debian.patch
tome-2.41-ah~0.git.20200131/debian/patches/debian.patch
--- tome-2.41-ah~0.git.20200131/debian/patches/debian.patch 1970-01-01
01:00:00.000000000 +0100
+++ tome-2.41-ah~0.git.20200131/debian/patches/debian.patch 2023-11-08
21:30:58.000000000 +0100
@@ -0,0 +1,126 @@
+--- tome-2.41-ah~0.git.20200131.orig/CMakeLists.txt
++++ tome-2.41-ah~0.git.20200131/CMakeLists.txt
+@@ -28,7 +28,7 @@ SET(SANITIZER_FLAGS "-fsanitize=undefine
+ #
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
+ SET(CMAKE_C_FLAGS_RELEASE "-O2")
+-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${SANITIZER_FLAGS}")
++SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+ #
+ # C++ Compiler Flags
+@@ -36,7 +36,7 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${SA
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSONCONS_NO_DEPRECATED")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${SANITIZER_FLAGS} -D_GLIBCXX_DEBUG
-D_GLIBCXX_DEBUG_PEDANTIC")
++SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_GLIBCXX_DEBUG
-D_GLIBCXX_DEBUG_PEDANTIC")
+
+ #
+ # GCC Flags
+@@ -100,7 +100,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()
+--- tome-2.41-ah~0.git.20200131.orig/src/CMakeLists.txt
++++ tome-2.41-ah~0.git.20200131/src/CMakeLists.txt
+@@ -166,21 +166,21 @@ IF(X11_FOUND)
+ INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+ ADD_EXECUTABLE(tome-x11 main-x11.cc)
+ TARGET_LINK_LIBRARIES(tome-x11 game_main game squelch ${LIBS}
${X11_LIBRARIES})
+- INSTALL(TARGETS tome-x11 RUNTIME DESTINATION bin)
++ INSTALL(TARGETS tome-x11 RUNTIME DESTINATION games)
+ ENDIF()
+
+ IF(CURSES_FOUND)
+ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
+ ADD_EXECUTABLE(tome-gcu main-gcu.cc)
+ TARGET_LINK_LIBRARIES(tome-gcu game_main game squelch ${LIBS}
${CURSES_LIBRARIES})
+- INSTALL(TARGETS tome-gcu RUNTIME DESTINATION bin)
++ INSTALL(TARGETS tome-gcu RUNTIME DESTINATION games)
+ ENDIF()
+
+ IF(GTK2_FOUND)
+ INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
+ ADD_EXECUTABLE(tome-gtk2 main-gtk2.cc)
+ TARGET_LINK_LIBRARIES(tome-gtk2 game_main game squelch ${LIBS}
${GTK2_LIBRARIES})
+- INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION bin)
++ INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION games)
+ ENDIF()
+
+ # test harness executable
+--- tome-2.41-ah~0.git.20200131.orig/src/config.hpp
++++ tome-2.41-ah~0.git.20200131/src/config.hpp
+@@ -58,7 +58,7 @@
+ /*
+ * OPTION: Include "ncurses.h" instead of "curses.h" in "main-gcu.c"
+ */
+-/* #define USE_NCURSES */
++#define USE_NCURSES
+
+
+
+@@ -68,6 +68,34 @@
+ #define MONSTER_FLOW_DEPTH 32
+
+
++
++
++/*
++ * OPTION: Set the "default" path to the angband "lib" directory.
++ *
++ * See "main.c" for usage, and note that this value is only used on
++ * certain machines, primarily Unix machines. If this value is used,
++ * it will be over-ridden by the "ANGBAND_PATH" environment variable,
++ * if that variable is defined and accessable. The final slash is
++ * optional, but it may eventually be required.
++ *
++ * Using the value "./lib/" below tells Angband that, by default,
++ * the user will run "angband" from the same directory that contains
++ * the "lib" directory. This is a reasonable (but imperfect) default.
++ *
++ * If at all possible, you should change this value to refer to the
++ * actual location of the "lib" folder, for example, "/tmp/angband/lib/"
++ * or "/usr/games/lib/angband/", or "/pkg/angband/lib".
++ *
++ * Additional note -- if you are planning to use makefile.org, don't bother
++ * setting this variable, as it is overridden by a value set near the top of
++ * that file.
++ */
++#ifndef DEFAULT_PATH
++# define DEFAULT_PATH "/var/games/tome"
++#endif
++
++
+ /*
+ * Where to put the user's files.
+ */
+@@ -75,6 +103,12 @@
+
+
+ /*
++ * OPTION: Person to bother if something goes wrong.
++ */
++#define MAINTAINER "t...@packages.debian.org"
++
++
++/*
+ * OPTION: Default font (when using X11).
+ */
+ #define DEFAULT_X11_FONT "9x15"
+--- tome-2.41-ah~0.git.20200131.orig/src/init1.hpp
++++ tome-2.41-ah~0.git.20200131/src/init1.hpp
+@@ -3,6 +3,8 @@
+ #include "h-basic.hpp"
+ #include "dungeon_flag_set.hpp"
+
++#include <cstdio>
++
+ int color_char_to_attr(char c);
+ extern byte conv_color[16];
+ errr init_player_info_txt(FILE *fp);
diff -Nru tome-2.41-ah~0.git.20200131/debian/patches/series
tome-2.41-ah~0.git.20200131/debian/patches/series
--- tome-2.41-ah~0.git.20200131/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ tome-2.41-ah~0.git.20200131/debian/patches/series 2023-11-08
21:30:58.000000000 +0100
@@ -0,0 +1 @@
+debian.patch
diff -Nru tome-2.41-ah~0.git.20200131/debian/source/format
tome-2.41-ah~0.git.20200131/debian/source/format
--- tome-2.41-ah~0.git.20200131/debian/source/format 2023-11-08
21:43:48.000000000 +0100
+++ tome-2.41-ah~0.git.20200131/debian/source/format 2023-11-08
21:30:58.000000000 +0100
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru tome-2.41-ah~0.git.20200131/src/CMakeLists.txt
tome-2.41-ah~0.git.20200131/src/CMakeLists.txt
--- tome-2.41-ah~0.git.20200131/src/CMakeLists.txt 2023-11-08
21:43:48.000000000 +0100
+++ tome-2.41-ah~0.git.20200131/src/CMakeLists.txt 2020-02-02
13:00:22.000000000 +0100
@@ -166,21 +166,21 @@
INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
ADD_EXECUTABLE(tome-x11 main-x11.cc)
TARGET_LINK_LIBRARIES(tome-x11 game_main game squelch ${LIBS}
${X11_LIBRARIES})
- INSTALL(TARGETS tome-x11 RUNTIME DESTINATION games)
+ INSTALL(TARGETS tome-x11 RUNTIME DESTINATION bin)
ENDIF()
IF(CURSES_FOUND)
INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
ADD_EXECUTABLE(tome-gcu main-gcu.cc)
TARGET_LINK_LIBRARIES(tome-gcu game_main game squelch ${LIBS}
${CURSES_LIBRARIES})
- INSTALL(TARGETS tome-gcu RUNTIME DESTINATION games)
+ INSTALL(TARGETS tome-gcu RUNTIME DESTINATION bin)
ENDIF()
IF(GTK2_FOUND)
INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
ADD_EXECUTABLE(tome-gtk2 main-gtk2.cc)
TARGET_LINK_LIBRARIES(tome-gtk2 game_main game squelch ${LIBS}
${GTK2_LIBRARIES})
- INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION games)
+ INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION bin)
ENDIF()
# test harness executable
diff -Nru tome-2.41-ah~0.git.20200131/src/config.hpp
tome-2.41-ah~0.git.20200131/src/config.hpp
--- tome-2.41-ah~0.git.20200131/src/config.hpp 2023-11-08 21:43:48.000000000
+0100
+++ tome-2.41-ah~0.git.20200131/src/config.hpp 2020-02-02 13:00:22.000000000
+0100
@@ -58,7 +58,7 @@
/*
* OPTION: Include "ncurses.h" instead of "curses.h" in "main-gcu.c"
*/
-#define USE_NCURSES
+/* #define USE_NCURSES */
@@ -68,34 +68,6 @@
#define MONSTER_FLOW_DEPTH 32
-
-
-/*
- * OPTION: Set the "default" path to the angband "lib" directory.
- *
- * See "main.c" for usage, and note that this value is only used on
- * certain machines, primarily Unix machines. If this value is used,
- * it will be over-ridden by the "ANGBAND_PATH" environment variable,
- * if that variable is defined and accessable. The final slash is
- * optional, but it may eventually be required.
- *
- * Using the value "./lib/" below tells Angband that, by default,
- * the user will run "angband" from the same directory that contains
- * the "lib" directory. This is a reasonable (but imperfect) default.
- *
- * If at all possible, you should change this value to refer to the
- * actual location of the "lib" folder, for example, "/tmp/angband/lib/"
- * or "/usr/games/lib/angband/", or "/pkg/angband/lib".
- *
- * Additional note -- if you are planning to use makefile.org, don't bother
- * setting this variable, as it is overridden by a value set near the top of
- * that file.
- */
-#ifndef DEFAULT_PATH
-# define DEFAULT_PATH "/var/games/tome"
-#endif
-
-
/*
* Where to put the user's files.
*/
@@ -103,12 +75,6 @@
/*
- * OPTION: Person to bother if something goes wrong.
- */
-#define MAINTAINER "t...@packages.debian.org"
-
-
-/*
* OPTION: Default font (when using X11).
*/
#define DEFAULT_X11_FONT "9x15"
diff -Nru tome-2.41-ah~0.git.20200131/src/init1.hpp
tome-2.41-ah~0.git.20200131/src/init1.hpp
--- tome-2.41-ah~0.git.20200131/src/init1.hpp 2023-11-08 21:43:48.000000000
+0100
+++ tome-2.41-ah~0.git.20200131/src/init1.hpp 2020-02-02 13:00:22.000000000
+0100
@@ -3,8 +3,6 @@
#include "h-basic.hpp"
#include "dungeon_flag_set.hpp"
-#include <cstdio>
-
int color_char_to_attr(char c);
extern byte conv_color[16];
errr init_player_info_txt(FILE *fp);
