I am handing in a NMU based on
https://salsa.debian.org/tux4kids-pkg-team/tuxtype/-/merge_requests/2.
debdiff attached.
diff -Nru tuxtype-1.8.3/debian/changelog tuxtype-1.8.3/debian/changelog
--- tuxtype-1.8.3/debian/changelog 2022-12-03 13:06:06.000000000 +0100
+++ tuxtype-1.8.3/debian/changelog 2022-12-03 12:55:55.000000000 +0100
@@ -1,3 +1,15 @@
+tuxtype (1.8.3-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * d/copyright: Fix source (Closes: #921461).
+
+ [ Debian Janitor ]
+ * Upgrade to newer source format.
+ * Update standards version to 4.4.1, no changes needed.
+ * Add missing colon in closes line.
+
+ -- Bastian Germann <b...@debian.org> Sat, 03 Dec 2022 12:55:55 +0100
+
tuxtype (1.8.3-5) unstable; urgency=medium
* d/control:
@@ -398,7 +410,7 @@
tuxtype (0.5.2-3) unstable; urgency=low
- * tuxtype/images/Makefile.am fix, closes #84446
+ * tuxtype/images/Makefile.am fix, closes: #84446
-- Laurence J. Lane <ljl...@debian.org> Fri, 2 Feb 2001 20:11:09 -0500
diff -Nru tuxtype-1.8.3/debian/control tuxtype-1.8.3/debian/control
--- tuxtype-1.8.3/debian/control 2022-12-03 13:06:06.000000000 +0100
+++ tuxtype-1.8.3/debian/control 2022-12-03 12:54:46.000000000 +0100
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Holger Levsen <hol...@debian.org>
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
Build-Depends: debhelper-compat (=12),
libsdl-mixer1.2-dev,
libsdl-image1.2-dev,
diff -Nru tuxtype-1.8.3/debian/copyright tuxtype-1.8.3/debian/copyright
--- tuxtype-1.8.3/debian/copyright 2022-12-03 13:06:06.000000000 +0100
+++ tuxtype-1.8.3/debian/copyright 2022-12-03 12:55:55.000000000 +0100
@@ -5,13 +5,9 @@
--------------------------------------------------------------------------------------------
-The upstream GIT is available here:
- http://anonscm.debian.org/gitweb/?p=tux4kids/tuxtype.git
+Source: https://github.com/tux4kids/tuxtype/tags
-Releases are available here:
- http://tux4kids.alioth.debian.org
-
-Upstream Authors: Sam Hart <h...@geekcomix.com>, Jesse D. Andrews
<jdan...@uky.edu>,
+Upstream-Contact: Sam Hart <h...@geekcomix.com>, Jesse D. Andrews
<jdan...@uky.edu>,
David Bruce <dbr...@tampabay.rr.com> and others
diff -Nru tuxtype-1.8.3/debian/patches/debian-changes
tuxtype-1.8.3/debian/patches/debian-changes
--- tuxtype-1.8.3/debian/patches/debian-changes 1970-01-01 01:00:00.000000000
+0100
+++ tuxtype-1.8.3/debian/patches/debian-changes 2022-12-03 12:55:55.000000000
+0100
@@ -0,0 +1,188 @@
+This is an autogenerated patch header for a single-debian-patch file. The
+delta against upstream is either kept as a single patch, or maintained
+in some VCS, and exported as a single patch instead of more manageable
+atomic patches.
+
+--- tuxtype-1.8.3.orig/po/nl.po
++++ tuxtype-1.8.3/po/nl.po
+@@ -1,21 +1,22 @@
+ # Translation of tuxtype.po to Dutch.
+ # This file is distributed under the same license as the PACKAGE package.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-# Mobin M <mobinmo...@gmail.com>, 2008
+ #
+-#, fuzzy
++# Mobin M <mobinmo...@gmail.com>, 2008.
++# Simon Oosthoek <s.oosth...@xs4all.nl>, 2015.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: Tuxtype\n"
+ "Report-Msgid-Bugs-To: tux4kids-tuxtype-...@lists.alioth.debian.org\n"
+ "POT-Creation-Date: 2012-02-02 20:16-0600\n"
+-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"PO-Revision-Date: 2015-01-06 16:45+0100\n"
++"Last-Translator: Simon Oosthoek <s.oosth...@xs4all.nl>\n"
+ "Language-Team: LANGUAGE <l...@li.org>\n"
+ "Language: nl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Lokalize 1.5\n"
+
+ #: src/loaders.c:98 src/main.c:161 src/playgame.c:654
+ msgid "Fish"
+@@ -38,12 +39,10 @@ msgid "Paused!"
+ msgstr "Pauze!"
+
+ #: src/pause.c:328
+-#, fuzzy
+ msgid "Press escape again to return to menu"
+ msgstr "terug naar het menu? druk op escape"
+
+ #: src/pause.c:337
+-#, fuzzy
+ msgid "Press space bar to return to game"
+ msgstr "terug naar het spel? druk op spatiebalk"
+
+@@ -71,11 +70,11 @@ msgstr "Echt Moeilijk"
+ # general stuff
+ #: src/playgame.c:659
+ msgid "Practice"
+-msgstr "Vingeroefeningen"
++msgstr "Oefenen"
+
+ #: src/playgame.c:670
+ msgid "Congratulations"
+-msgstr "Gefeliciteerd !"
++msgstr "Gefeliciteerd!"
+
+ #: src/playgame.c:674
+ msgid "Oh No!"
+@@ -83,31 +82,31 @@ msgstr "Oh Nee!"
+
+ #: src/practice.c:626
+ msgid "sec"
+-msgstr ""
++msgstr "sec"
+
+ #: src/practice.c:1440
+ msgid "Time"
+-msgstr ""
++msgstr "Tijd"
+
+ #: src/practice.c:1444
+ msgid "Chars"
+-msgstr ""
++msgstr "Tekens"
+
+ #: src/practice.c:1448
+ msgid "CPM"
+-msgstr ""
++msgstr "TPM"
+
+ #: src/practice.c:1452
+ msgid "WPM"
+-msgstr ""
++msgstr "WPM"
+
+ #: src/practice.c:1456
+ msgid "Errors"
+-msgstr ""
++msgstr "Fouten"
+
+ #: src/practice.c:1460
+ msgid "Accuracy"
+-msgstr ""
++msgstr "Precisie"
+
+ #: src/titlescreen.c:99
+ msgid "Fish Cascade"
+@@ -116,7 +115,7 @@ msgstr "Vallende Vissen"
+ # "Space Cadet" is level 1 in comet zap
+ #: src/titlescreen.c:99
+ msgid "Space Cadet"
+-msgstr "Leerling-vlieger"
++msgstr "Leerling-piloot"
+
+ #: src/titlescreen.c:99
+ msgid "Edit Word Lists"
+@@ -125,16 +124,16 @@ msgstr "Bewerk de woordenlijsten"
+ # types of games
+ #: src/titlescreen.c:100
+ msgid "Comet Zap"
+-msgstr "Inslaande Kometen"
++msgstr "Kometen zappen"
+
+ # "Pilot" is level 2 in comet zap
+ #: src/titlescreen.c:100
+ msgid "Pilot"
+-msgstr "Ruimtepiloot"
++msgstr "Piloot"
+
+ #: src/titlescreen.c:100
+ msgid "Phrase Typing"
+-msgstr ""
++msgstr "Zinnen typen"
+
+ #: src/titlescreen.c:101
+ msgid "Lessons"
+@@ -143,11 +142,11 @@ msgstr "Lessen"
+ # "Ace" is level 3 in comet zap
+ #: src/titlescreen.c:101
+ msgid "Ace"
+-msgstr "Luitenant-Meteoor"
++msgstr "Gevorderd piloot"
+
+ #: src/titlescreen.c:101
+ msgid "Project Info"
+-msgstr ""
++msgstr "Project info"
+
+ #: src/titlescreen.c:102
+ msgid "Options"
+@@ -160,7 +159,7 @@ msgstr "Instructies"
+ # "Commander" is level 4 in comet zap
+ #: src/titlescreen.c:102
+ msgid "Commander"
+-msgstr "Opperbevelhebber"
++msgstr "Expert"
+
+ #: src/titlescreen.c:102
+ msgid "Setup Language"
+@@ -180,18 +179,14 @@ msgid "Work In Progress!"
+ msgstr "Werk In Uitvoering!"
+
+ #: src/titlescreen.c:1130
+-#, fuzzy
+ msgid "This feature is not ready yet"
+-msgstr "dit onderdeel is nog niet klaar"
++msgstr "Dit onderdeel is nog niet klaar"
+
+ #: src/titlescreen.c:1131
+ msgid "Discuss the future of TuxTyping at"
+ msgstr "Bespreek de toekomst van TuxTyping op"
+
+ # general stuff
+-#, fuzzy
+-#~ msgid "Phrase Practice"
+-#~ msgstr "Vingeroefeningen"
+
+ #~ msgid "Alphabet"
+ #~ msgstr "Alfabet"
+--- tuxtype-1.8.3.orig/src/titlescreen.c
++++ tuxtype-1.8.3/src/titlescreen.c
+@@ -322,10 +322,12 @@ void TitleScreen(void)
+ {
+ MusicUnload();
+ settings.menu_music = 0;
++ settings.sys_sound = 0;
+ }
+ else
+ {
+ settings.menu_music = 1;
++ settings.sys_sound = 1;
+ MusicLoad("tuxi.ogg", -1);
+ }
+ redraw = 1;
diff -Nru tuxtype-1.8.3/debian/patches/series
tuxtype-1.8.3/debian/patches/series
--- tuxtype-1.8.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ tuxtype-1.8.3/debian/patches/series 2022-12-03 12:55:55.000000000 +0100
@@ -0,0 +1 @@
+debian-changes
diff -Nru tuxtype-1.8.3/debian/source/format tuxtype-1.8.3/debian/source/format
--- tuxtype-1.8.3/debian/source/format 2022-12-03 13:06:06.000000000 +0100
+++ tuxtype-1.8.3/debian/source/format 2022-12-03 12:54:46.000000000 +0100
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru tuxtype-1.8.3/debian/source/options
tuxtype-1.8.3/debian/source/options
--- tuxtype-1.8.3/debian/source/options 1970-01-01 01:00:00.000000000 +0100
+++ tuxtype-1.8.3/debian/source/options 2022-12-03 12:54:46.000000000 +0100
@@ -0,0 +1,2 @@
+single-debian-patch
+auto-commit
diff -Nru tuxtype-1.8.3/po/nl.po tuxtype-1.8.3/po/nl.po
--- tuxtype-1.8.3/po/nl.po 2022-12-03 13:06:06.000000000 +0100
+++ tuxtype-1.8.3/po/nl.po 2014-08-20 05:55:27.000000000 +0200
@@ -1,22 +1,21 @@
# Translation of tuxtype.po to Dutch.
# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Mobin M <mobinmo...@gmail.com>, 2008
#
-# Mobin M <mobinmo...@gmail.com>, 2008.
-# Simon Oosthoek <s.oosth...@xs4all.nl>, 2015.
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-...@lists.alioth.debian.org\n"
"POT-Creation-Date: 2012-02-02 20:16-0600\n"
-"PO-Revision-Date: 2015-01-06 16:45+0100\n"
-"Last-Translator: Simon Oosthoek <s.oosth...@xs4all.nl>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
#: src/loaders.c:98 src/main.c:161 src/playgame.c:654
msgid "Fish"
@@ -39,10 +38,12 @@
msgstr "Pauze!"
#: src/pause.c:328
+#, fuzzy
msgid "Press escape again to return to menu"
msgstr "terug naar het menu? druk op escape"
#: src/pause.c:337
+#, fuzzy
msgid "Press space bar to return to game"
msgstr "terug naar het spel? druk op spatiebalk"
@@ -70,11 +71,11 @@
# general stuff
#: src/playgame.c:659
msgid "Practice"
-msgstr "Oefenen"
+msgstr "Vingeroefeningen"
#: src/playgame.c:670
msgid "Congratulations"
-msgstr "Gefeliciteerd!"
+msgstr "Gefeliciteerd !"
#: src/playgame.c:674
msgid "Oh No!"
@@ -82,31 +83,31 @@
#: src/practice.c:626
msgid "sec"
-msgstr "sec"
+msgstr ""
#: src/practice.c:1440
msgid "Time"
-msgstr "Tijd"
+msgstr ""
#: src/practice.c:1444
msgid "Chars"
-msgstr "Tekens"
+msgstr ""
#: src/practice.c:1448
msgid "CPM"
-msgstr "TPM"
+msgstr ""
#: src/practice.c:1452
msgid "WPM"
-msgstr "WPM"
+msgstr ""
#: src/practice.c:1456
msgid "Errors"
-msgstr "Fouten"
+msgstr ""
#: src/practice.c:1460
msgid "Accuracy"
-msgstr "Precisie"
+msgstr ""
#: src/titlescreen.c:99
msgid "Fish Cascade"
@@ -115,7 +116,7 @@
# "Space Cadet" is level 1 in comet zap
#: src/titlescreen.c:99
msgid "Space Cadet"
-msgstr "Leerling-piloot"
+msgstr "Leerling-vlieger"
#: src/titlescreen.c:99
msgid "Edit Word Lists"
@@ -124,16 +125,16 @@
# types of games
#: src/titlescreen.c:100
msgid "Comet Zap"
-msgstr "Kometen zappen"
+msgstr "Inslaande Kometen"
# "Pilot" is level 2 in comet zap
#: src/titlescreen.c:100
msgid "Pilot"
-msgstr "Piloot"
+msgstr "Ruimtepiloot"
#: src/titlescreen.c:100
msgid "Phrase Typing"
-msgstr "Zinnen typen"
+msgstr ""
#: src/titlescreen.c:101
msgid "Lessons"
@@ -142,11 +143,11 @@
# "Ace" is level 3 in comet zap
#: src/titlescreen.c:101
msgid "Ace"
-msgstr "Gevorderd piloot"
+msgstr "Luitenant-Meteoor"
#: src/titlescreen.c:101
msgid "Project Info"
-msgstr "Project info"
+msgstr ""
#: src/titlescreen.c:102
msgid "Options"
@@ -159,7 +160,7 @@
# "Commander" is level 4 in comet zap
#: src/titlescreen.c:102
msgid "Commander"
-msgstr "Expert"
+msgstr "Opperbevelhebber"
#: src/titlescreen.c:102
msgid "Setup Language"
@@ -179,14 +180,18 @@
msgstr "Werk In Uitvoering!"
#: src/titlescreen.c:1130
+#, fuzzy
msgid "This feature is not ready yet"
-msgstr "Dit onderdeel is nog niet klaar"
+msgstr "dit onderdeel is nog niet klaar"
#: src/titlescreen.c:1131
msgid "Discuss the future of TuxTyping at"
msgstr "Bespreek de toekomst van TuxTyping op"
# general stuff
+#, fuzzy
+#~ msgid "Phrase Practice"
+#~ msgstr "Vingeroefeningen"
#~ msgid "Alphabet"
#~ msgstr "Alfabet"
diff -Nru tuxtype-1.8.3/src/titlescreen.c tuxtype-1.8.3/src/titlescreen.c
--- tuxtype-1.8.3/src/titlescreen.c 2022-12-03 13:06:06.000000000 +0100
+++ tuxtype-1.8.3/src/titlescreen.c 2014-08-20 05:55:27.000000000 +0200
@@ -322,12 +322,10 @@
{
MusicUnload();
settings.menu_music = 0;
- settings.sys_sound = 0;
}
else
{
settings.menu_music = 1;
- settings.sys_sound = 1;
MusicLoad("tuxi.ogg", -1);
}
redraw = 1;
