I have uploaded a NMU to DELAYED/3. debdiff is attached.
diff -Nru chroma-1.19/debian/changelog chroma-1.19/debian/changelog
--- chroma-1.19/debian/changelog 2021-10-27 19:51:17.000000000 +0200
+++ chroma-1.19/debian/changelog 2022-12-10 15:43:07.000000000 +0100
@@ -1,3 +1,11 @@
+chroma (1.19-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix Debian revision.
+ * Convert to 3.0 source format. (Closes: #1007426)
+
+ -- Bastian Germann <b...@debian.org> Sat, 10 Dec 2022 15:43:07 +0100
+
chroma (1.19-1ubuntu1) unstable; urgency=low
* Fix build process to isolate inkscape from $HOME and the GUI.
diff -Nru chroma-1.19/debian/control chroma-1.19/debian/control
--- chroma-1.19/debian/control 2021-10-27 19:51:17.000000000 +0200
+++ chroma-1.19/debian/control 2022-12-10 15:43:07.000000000 +0100
@@ -7,7 +7,7 @@
imagemagick,
inkscape,
libfreetype-dev,
- libncurses5-dev,
+ libncurses-dev,
librsvg2-bin,
libsdl1.2-dev,
libsdl-image1.2-dev,
diff -Nru chroma-1.19/debian/.gitignore chroma-1.19/debian/.gitignore
--- chroma-1.19/debian/.gitignore 2021-10-27 19:51:17.000000000 +0200
+++ chroma-1.19/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-/.debhelper
-/tmp
-/chroma-curses
-/chroma-data
-/chroma
-*.debhelper.log
-*.substvars
-/autoreconf.before
-/autoreconf.after
-/files
-/debhelper-build-stamp
diff -Nru chroma-1.19/debian/patches/debian.patch
chroma-1.19/debian/patches/debian.patch
--- chroma-1.19/debian/patches/debian.patch 1970-01-01 01:00:00.000000000
+0100
+++ chroma-1.19/debian/patches/debian.patch 2022-12-10 15:43:07.000000000
+0100
@@ -0,0 +1,151 @@
+--- chroma-1.19.orig/Makefile.in
++++ chroma-1.19/Makefile.in
+@@ -41,7 +41,7 @@ install: @TARGETSINSTALL@
+ done
+ for datafile in colours/* help/* levels/* levels/*/* locale/*
locale/*/* locale/*/*/*; do \
+ if [ -f $$datafile ]; then \
+- ${INSTALL} $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
++ ${INSTALL} -m 0644 $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
+ fi; \
+ done
+
+@@ -59,6 +59,6 @@ install-sdl:
+ done
+ for datafile in graphics/* graphics/*/*; do \
+ if [ -f $$datafile ]; then \
+- ${INSTALL} $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
++ ${INSTALL} -m 0644 $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile;
\
+ fi; \
+ done
+--- /dev/null
++++ chroma-1.19/resources/inkscape_export.pm
+@@ -0,0 +1,13 @@
++our $inkscape_export_option = undef;
++
++sub inkscape_export {
++ my ($opts, $width, $height, $outfile, $infile) = @_;
++ unless (defined $inkscape_export_option) {
++ my $ver = `inkscape --version`;
++ $inkscape_export_option = ($ver =~ /Inkscape 0\./) ? "-e" : "-o";
++ }
++
++ system "inkscape $opts -w $width -h $height $inkscape_export_option
$outfile $infile";
++}
++
++1;
+--- chroma-1.19.orig/resources/make-base-marble.pl
++++ chroma-1.19/resources/make-base-marble.pl
+@@ -21,6 +21,8 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
++require './inkscape_export.pm';
++
+ if($#ARGV != 1)
+ {
+ print STDERR "Usage: make-base-marble.pl <file.svg> <directory>\n";
+@@ -69,5 +71,5 @@ sub make_pieces
+ $background = "";
+
+ # Use Inkscape to convert the SVG to a PNG
+- system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
++ inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+ }
+--- chroma-1.19.orig/resources/make-pieces-marble.pl
++++ chroma-1.19/resources/make-pieces-marble.pl
+@@ -21,6 +21,8 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
++require './inkscape_export.pm';
++
+ if($#ARGV != 1)
+ {
+ print STDERR "Usage: make-pieces-marble.pl <pieces.svg> <directory>\n";
+@@ -88,7 +90,7 @@ sub make_pieces
+ $background = "-b \"#000000\"" if($partial);
+
+ # Use Inkscape to convert the SVG to a PNG
+- system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
++ inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+
+ for($piece = 0; $piece < $rows * $columns; $piece ++)
+ {
+--- chroma-1.19.orig/resources/make-pieces-neon.pl
++++ chroma-1.19/resources/make-pieces-neon.pl
+@@ -34,6 +34,8 @@
+ # Use blur-full for most pieces, blur-half for earth and earth_double, and
+ # blur-quarter for earth_directional, maps and teleport.
+
++require './inkscape_export.pm';
++
+ if($#ARGV != 0)
+ {
+ print STDERR "Usage: make-pieces-neon.pl <directory>\n";
+@@ -96,13 +98,13 @@ sub make_pieces
+ $height_png = $height * ($columns * 2 + 1);
+
+ $file_png_base = "/tmp/chroma-pieces-base-$$.png";
+- system("inkscape -w $width_png -h $height_png -e $file_png_base
$file_svg_base");
++ inkscape_export("", $width_png, $height_png, $file_png_base,
$file_svg_base);
+
+ $file_png_overlay = "/tmp/chroma-pieces-overlay-$$.png";
+- system("inkscape -w $width_png -h $height_png -e $file_png_overlay
$file_svg_overlay");
++ inkscape_export("", $width_png, $height_png, $file_png_overlay,
$file_svg_overlay);
+
+ $file_png_overlay_double = "/tmp/chroma-pieces-double-$$.png";
+- system("inkscape -w $width_png -h $height_png -e $file_png_overlay_double
$file_svg_overlay_double");
++ inkscape_export("", $width_png, $height_png, $file_png_overlay_double,
$file_svg_overlay_double);
+
+ $file_png_partial = "/tmp/chroma-pieces-partial-$$.png";
+ system("convert -compose overlay -composite $file_png_base
$file_png_overlay $file_png_partial");
+--- chroma-1.19.orig/resources/make-pieces-zen.pl
++++ chroma-1.19/resources/make-pieces-zen.pl
+@@ -21,6 +21,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
++require './inkscape_export.pm';
+
+ if($#ARGV != 1)
+ {
+@@ -85,7 +86,7 @@ sub make_pieces
+ $background = "-b \"#000000\"" if($partial);
+
+ # Use Inkscape to convert the SVG to a PNG
+- system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
++ inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+
+ for($piece = 0; $piece < $rows * $columns; $piece ++)
+ {
+--- chroma-1.19.orig/resources/make-wall-marble.pl
++++ chroma-1.19/resources/make-wall-marble.pl
+@@ -21,6 +21,8 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
++require './inkscape_export.pm';
++
+ if($#ARGV != 1)
+ {
+ print STDERR "Usage: make-wall-marble.pl <pieces.svg> <directory>\n";
+@@ -69,5 +71,5 @@ sub make_pieces
+ $background = "";
+
+ # Use Inkscape to convert the SVG to a PNG
+- system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
++ inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+ }
+--- chroma-1.19.orig/sdlfont.c
++++ chroma-1.19/sdlfont.c
+@@ -114,9 +114,7 @@ void font_init()
+ char filename[FILENAME_MAX];
+ FT_Error error;
+
+- getfilename("graphics", directory, 0, LOCATION_SYSTEM);
+-
+- sprintf(filename, "%s/font.ttf", directory);
++ sprintf(filename, "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf");
+
+ if((error = FT_Init_FreeType(&font_library)) != 0)
+ {
diff -Nru chroma-1.19/debian/patches/series chroma-1.19/debian/patches/series
--- chroma-1.19/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ chroma-1.19/debian/patches/series 2022-12-10 15:43:07.000000000 +0100
@@ -0,0 +1 @@
+debian.patch
diff -Nru chroma-1.19/debian/source/format chroma-1.19/debian/source/format
--- chroma-1.19/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ chroma-1.19/debian/source/format 2022-12-10 15:43:07.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru chroma-1.19/.gitignore chroma-1.19/.gitignore
--- chroma-1.19/.gitignore 2021-10-27 19:51:17.000000000 +0200
+++ chroma-1.19/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-# Downstream .gitignore added for Debian packaging repository
-/autom4te.cache
-/config.log
-/config.status
-/chroma
-/chroma-curses
-/resources/icon.png
-/resources/icon.svg
-/Makefile
-*.o
diff -Nru chroma-1.19/Makefile.in chroma-1.19/Makefile.in
--- chroma-1.19/Makefile.in 2021-10-27 19:51:17.000000000 +0200
+++ chroma-1.19/Makefile.in 2021-10-26 08:07:00.000000000 +0200
@@ -41,7 +41,7 @@
done
for datafile in colours/* help/* levels/* levels/*/* locale/*
locale/*/* locale/*/*/*; do \
if [ -f $$datafile ]; then \
- ${INSTALL} -m 0644 $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
+ ${INSTALL} $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
fi; \
done
@@ -59,6 +59,6 @@
done
for datafile in graphics/* graphics/*/*; do \
if [ -f $$datafile ]; then \
- ${INSTALL} -m 0644 $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
+ ${INSTALL} $$datafile $(DESTDIR)$(datadir)/chroma/$$datafile; \
fi; \
done
diff -Nru chroma-1.19/resources/inkscape_export.pm
chroma-1.19/resources/inkscape_export.pm
--- chroma-1.19/resources/inkscape_export.pm 2021-10-27 19:51:17.000000000
+0200
+++ chroma-1.19/resources/inkscape_export.pm 1970-01-01 01:00:00.000000000
+0100
@@ -1,13 +0,0 @@
-our $inkscape_export_option = undef;
-
-sub inkscape_export {
- my ($opts, $width, $height, $outfile, $infile) = @_;
- unless (defined $inkscape_export_option) {
- my $ver = `inkscape --version`;
- $inkscape_export_option = ($ver =~ /Inkscape 0\./) ? "-e" : "-o";
- }
-
- system "inkscape $opts -w $width -h $height $inkscape_export_option
$outfile $infile";
-}
-
-1;
diff -Nru chroma-1.19/resources/make-base-marble.pl
chroma-1.19/resources/make-base-marble.pl
--- chroma-1.19/resources/make-base-marble.pl 2021-10-27 19:51:17.000000000
+0200
+++ chroma-1.19/resources/make-base-marble.pl 2021-10-26 08:07:00.000000000
+0200
@@ -21,8 +21,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-require './inkscape_export.pm';
-
if($#ARGV != 1)
{
print STDERR "Usage: make-base-marble.pl <file.svg> <directory>\n";
@@ -71,5 +69,5 @@
$background = "";
# Use Inkscape to convert the SVG to a PNG
- inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+ system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
}
diff -Nru chroma-1.19/resources/make-pieces-marble.pl
chroma-1.19/resources/make-pieces-marble.pl
--- chroma-1.19/resources/make-pieces-marble.pl 2021-10-27 19:51:17.000000000
+0200
+++ chroma-1.19/resources/make-pieces-marble.pl 2021-10-26 08:07:00.000000000
+0200
@@ -21,8 +21,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-require './inkscape_export.pm';
-
if($#ARGV != 1)
{
print STDERR "Usage: make-pieces-marble.pl <pieces.svg> <directory>\n";
@@ -90,7 +88,7 @@
$background = "-b \"#000000\"" if($partial);
# Use Inkscape to convert the SVG to a PNG
- inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+ system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
for($piece = 0; $piece < $rows * $columns; $piece ++)
{
diff -Nru chroma-1.19/resources/make-pieces-neon.pl
chroma-1.19/resources/make-pieces-neon.pl
--- chroma-1.19/resources/make-pieces-neon.pl 2021-10-27 19:51:17.000000000
+0200
+++ chroma-1.19/resources/make-pieces-neon.pl 2021-10-26 08:07:00.000000000
+0200
@@ -34,8 +34,6 @@
# Use blur-full for most pieces, blur-half for earth and earth_double, and
# blur-quarter for earth_directional, maps and teleport.
-require './inkscape_export.pm';
-
if($#ARGV != 0)
{
print STDERR "Usage: make-pieces-neon.pl <directory>\n";
@@ -98,13 +96,13 @@
$height_png = $height * ($columns * 2 + 1);
$file_png_base = "/tmp/chroma-pieces-base-$$.png";
- inkscape_export("", $width_png, $height_png, $file_png_base,
$file_svg_base);
+ system("inkscape -w $width_png -h $height_png -e $file_png_base
$file_svg_base");
$file_png_overlay = "/tmp/chroma-pieces-overlay-$$.png";
- inkscape_export("", $width_png, $height_png, $file_png_overlay,
$file_svg_overlay);
+ system("inkscape -w $width_png -h $height_png -e $file_png_overlay
$file_svg_overlay");
$file_png_overlay_double = "/tmp/chroma-pieces-double-$$.png";
- inkscape_export("", $width_png, $height_png, $file_png_overlay_double,
$file_svg_overlay_double);
+ system("inkscape -w $width_png -h $height_png -e $file_png_overlay_double
$file_svg_overlay_double");
$file_png_partial = "/tmp/chroma-pieces-partial-$$.png";
system("convert -compose overlay -composite $file_png_base
$file_png_overlay $file_png_partial");
diff -Nru chroma-1.19/resources/make-pieces-zen.pl
chroma-1.19/resources/make-pieces-zen.pl
--- chroma-1.19/resources/make-pieces-zen.pl 2021-10-27 19:51:17.000000000
+0200
+++ chroma-1.19/resources/make-pieces-zen.pl 2021-10-26 08:07:00.000000000
+0200
@@ -21,7 +21,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-require './inkscape_export.pm';
if($#ARGV != 1)
{
@@ -86,7 +85,7 @@
$background = "-b \"#000000\"" if($partial);
# Use Inkscape to convert the SVG to a PNG
- inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+ system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
for($piece = 0; $piece < $rows * $columns; $piece ++)
{
diff -Nru chroma-1.19/resources/make-wall-marble.pl
chroma-1.19/resources/make-wall-marble.pl
--- chroma-1.19/resources/make-wall-marble.pl 2021-10-27 19:51:17.000000000
+0200
+++ chroma-1.19/resources/make-wall-marble.pl 2021-10-26 08:07:00.000000000
+0200
@@ -21,8 +21,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-require './inkscape_export.pm';
-
if($#ARGV != 1)
{
print STDERR "Usage: make-wall-marble.pl <pieces.svg> <directory>\n";
@@ -71,5 +69,5 @@
$background = "";
# Use Inkscape to convert the SVG to a PNG
- inkscape_export($background, $width_png, $height_png, $file_png,
$file_svg);
+ system("inkscape $background -w $width_png -h $height_png -e $file_png
$file_svg");
}
diff -Nru chroma-1.19/sdlfont.c chroma-1.19/sdlfont.c
--- chroma-1.19/sdlfont.c 2021-10-27 19:51:17.000000000 +0200
+++ chroma-1.19/sdlfont.c 2021-10-26 08:07:00.000000000 +0200
@@ -114,7 +114,9 @@
char filename[FILENAME_MAX];
FT_Error error;
- sprintf(filename, "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf");
+ getfilename("graphics", directory, 0, LOCATION_SYSTEM);
+
+ sprintf(filename, "%s/font.ttf", directory);
if((error = FT_Init_FreeType(&font_library)) != 0)
{
