This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository tuxfootball.
commit c9ee483fc03c984534a67f6bf7856794d71e584a Author: Markus Koschany <[email protected]> Date: Sat Oct 7 20:33:07 2017 +0200 Import Debian changes 0.3.1-5 tuxfootball (0.3.1-5) unstable; urgency=medium * Team upload. * Switch to compat level 10. * Declare compliance with Debian Policy 4.1.1. * Use https for Format field. * Use https for Vcs fields. * Fix wrong instruction in manpage. -f runs Tux Football in fullscreen mode. * Add fullscreen-mode.patch and correct the wrong fullscreen mode switch. Thanks to Andrej Mernik for the report. (Closes: #876481) * Drop deprecated menu file. --- debian/changelog | 14 ++++++++++++++ debian/compat | 2 +- debian/control | 7 +++---- debian/copyright | 2 +- debian/menu | 1 - debian/patches/fix_ftbfs_menu_h | 15 ++++++++++++--- debian/patches/fullscreen-mode.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- debian/tuxfootball.6 | 2 +- 10 files changed, 59 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index e233b1d..ff0fe49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +tuxfootball (0.3.1-5) unstable; urgency=medium + + * Team upload. + * Switch to compat level 10. + * Declare compliance with Debian Policy 4.1.1. + * Use https for Format field. + * Use https for Vcs fields. + * Fix wrong instruction in manpage. -f runs Tux Football in fullscreen mode. + * Add fullscreen-mode.patch and correct the wrong fullscreen mode switch. + Thanks to Andrej Mernik for the report. (Closes: #876481) + * Drop deprecated menu file. + + -- Markus Koschany <[email protected]> Sat, 07 Oct 2017 20:33:07 +0200 + tuxfootball (0.3.1-4) unstable; urgency=medium * Team upload. diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 9bec7e4..0223167 100644 --- a/debian/control +++ b/debian/control @@ -5,17 +5,16 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: TANIGUCHI Takaki <[email protected]> Build-Depends: - autotools-dev, - debhelper (>= 9), + debhelper (>= 10), dpkg-dev (>= 1.16.1~), intltool, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, pkg-config -Standards-Version: 3.9.6 +Standards-Version: 4.1.1 Homepage: http://tuxfootball.sourceforge.net/ -Vcs-Git: git://anonscm.debian.org/pkg-games/tuxfootball.git +Vcs-Git: https://anonscm.debian.org/git/pkg-games/tuxfootball.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/tuxfootball.git Package: tuxfootball diff --git a/debian/copyright b/debian/copyright index 6c19aaf..bb8d228 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Tux Football Upstream-Contact: Jason Wood <[email protected]> Christoph Brill <[email protected]> diff --git a/debian/menu b/debian/menu deleted file mode 100644 index b00fa73..0000000 --- a/debian/menu +++ /dev/null @@ -1 +0,0 @@ -?package(tuxfootball):needs="x11" section="Games/Action" title="tuxfootball" longtitle="Tux Football" description="great 2D soccer (sometimes called football) game" command="/usr/games/tuxfootball" diff --git a/debian/patches/fix_ftbfs_menu_h b/debian/patches/fix_ftbfs_menu_h index 15cd4a5..2282405 100644 --- a/debian/patches/fix_ftbfs_menu_h +++ b/debian/patches/fix_ftbfs_menu_h @@ -1,7 +1,16 @@ -Index: tuxfootball/src/menu/elements/menulabel.cpp +From: Debian Games Team <[email protected]> +Date: Sat, 7 Oct 2017 20:30:01 +0200 +Subject: fix_ftbfs_menu_h + =================================================================== ---- tuxfootball.orig/src/menu/elements/menulabel.cpp 2012-04-13 09:58:36.280112312 +0900 -+++ tuxfootball/src/menu/elements/menulabel.cpp 2012-04-13 10:15:00.384923357 +0900 +--- + src/menu/elements/menulabel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/menu/elements/menulabel.cpp b/src/menu/elements/menulabel.cpp +index 1aa7780..c8eba9f 100644 +--- a/src/menu/elements/menulabel.cpp ++++ b/src/menu/elements/menulabel.cpp @@ -27,7 +27,7 @@ #include <iostream> diff --git a/debian/patches/fullscreen-mode.patch b/debian/patches/fullscreen-mode.patch new file mode 100644 index 0000000..eeab3c7 --- /dev/null +++ b/debian/patches/fullscreen-mode.patch @@ -0,0 +1,25 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 7 Oct 2017 20:30:19 +0200 +Subject: fullscreen mode + +Correct wrong fullscreen mode switch. + +Debian-Bug: https://bugs.debian.org/876481 +Forwarded: no +--- + src/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.cpp b/src/main.cpp +index b23f6e2..cc29f64 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -67,7 +67,7 @@ int main(int argc, char *argv[]) + switch(argv[i][1]) { + default: + case 'h': +- printf("\nTux Football [-switch]\n\nswitch can be:\n\n-h\tprint this help\n-w\trun Tux Football in windowed mode (default)\n-w\trun Tux Football in fullscreen mode\n-d\tEnable debug logging\n\n"); ++ printf("\nTux Football [-switch]\n\nswitch can be:\n\n-h\tprint this help\n-w\trun Tux Football in windowed mode (default)\n-f\trun Tux Football in fullscreen mode\n-d\tEnable debug logging\n\n"); + return 0; + case 'w': + fullscreen = false; diff --git a/debian/patches/series b/debian/patches/series index 7f1a4f9..c807044 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ fix_ftbfs_menu_h desktop-file.patch +fullscreen-mode.patch diff --git a/debian/rules b/debian/rules index e2bc1c1..4de4387 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk %: - dh $@ --with autotools_dev + dh $@ --with autotools_dev --without autoreconf override_dh_auto_configure: dh_auto_configure -- \ diff --git a/debian/tuxfootball.6 b/debian/tuxfootball.6 index 0881fe8..7853276 100644 --- a/debian/tuxfootball.6 +++ b/debian/tuxfootball.6 @@ -24,7 +24,7 @@ makes it dip towards the ground. .TP \fB\-w\fR run Tux Football in windowed mode (default) .TP -\fB\-w\fR run Tux Football in fullscreen mode +\fB\-f\fR run Tux Football in fullscreen mode .TP \fB\-d\fR Enable debug logging -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tuxfootball.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
