Author: vincentc-guest Date: 2012-03-05 08:14:40 +0000 (Mon, 05 Mar 2012) New Revision: 13358
Added: packages/trunk/supertux/debian/manpages Removed: packages/trunk/supertux/debian/README.source packages/trunk/supertux/debian/patches/debian-changes-0.3.3-1 packages/trunk/supertux/debian/patches/fix-curl.patch packages/trunk/supertux/debian/patches/gcc-4.6 packages/trunk/supertux/debian/supertux.6 Modified: packages/trunk/supertux/debian/changelog packages/trunk/supertux/debian/compat packages/trunk/supertux/debian/control packages/trunk/supertux/debian/patches/series packages/trunk/supertux/debian/rules packages/trunk/supertux/debian/supertux.lintian-overrides Log: supertux: update to version 0.3.3-4 Deleted: packages/trunk/supertux/debian/README.source =================================================================== --- packages/trunk/supertux/debian/README.source 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/README.source 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,13 +0,0 @@ -Task: apply debian patches -Tools: quilt -Command: quilt push -a -Description: - Please read /usr/share/doc/quilt/README.source how to use quilt for - managing Debian patches. - . - This might not be needed for there are not always patches. The steps - outlined above should always work nonetheless. If you want to see if - there are patches, check if there are files in debian/patches apart - from the one called «series» - - -- Christoph Egger <[email protected]>, Sun, 30 Aug 2009 22:39:52 +0200 Modified: packages/trunk/supertux/debian/changelog =================================================================== --- packages/trunk/supertux/debian/changelog 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/changelog 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,3 +1,22 @@ +supertux (0.3.3-4) experimental; urgency=low + + * Team upload. + - Add myself to Uploaders. + * Bump standards version from 3.8.4 to 3.9.3. + * Bump debian compat level from 7 to 9. + * Remove explicit b-d on quilt; also remove --with-quilt call in + debian/rules and unneeded debian/README.source. + * Add DEP-3 headers to included patches. + * Add debian/patches/fix-{desktop_file,spelling_errors}.patch to fix + minor issues found by lintian. + * Split debian-changes patch into separate patches. + * Update Vcs-Browser link. + * Update package descriptions with version in unstable. + * Tighten dependency on supertux-data. (Closes: #577223) + * Remove redundant debian/supertux.6; upstream already includes a manpage. + + -- Vincent Cheng <[email protected]> Sun, 04 Mar 2012 00:52:54 -0800 + supertux (0.3.3-3) experimental; urgency=low * Import patch by Ilya Barygin <[email protected]> to fix building Modified: packages/trunk/supertux/debian/compat =================================================================== --- packages/trunk/supertux/debian/compat 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/compat 2012-03-05 08:14:40 UTC (rev 13358) @@ -1 +1 @@ -7 +9 Modified: packages/trunk/supertux/debian/control =================================================================== --- packages/trunk/supertux/debian/control 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/control 2012-03-05 08:14:40 UTC (rev 13358) @@ -4,8 +4,9 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: Bartosz Fenski <[email protected]>, Christoph Egger <[email protected]>, - Alexander Reichle-Schmehl <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), + Alexander Reichle-Schmehl <[email protected]>, + Vincent Cheng <[email protected]> +Build-Depends: debhelper (>= 9), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, @@ -13,28 +14,30 @@ cmake, libopenal-dev, autotools-dev, - quilt (>= 0.46-7~), libboost-dev, libglew-dev, libcurl4-gnutls-dev Build-Conflicts: nvidia-glx, nvidia-glx-legacy -Standards-Version: 3.8.4 +Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/supertux/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/supertux/?op=log +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/supertux/ Homepage: http://supertux.lethargik.org/ Package: supertux Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, supertux-data (>= 0.3.0~dfsg-1) +Depends: ${shlibs:Depends}, ${misc:Depends}, supertux-data (= ${source:Version}) Description: Classic 2D jump 'n run sidescroller with Tux SuperTux is a classic 2D jump 'n run sidescroller game in a similar - style like the original SuperMario games. - . - As of 0.3.0, OpenGL is needed and SDL is no longer supported by upstream. + style like the original SuperMario games. You play the role of Tux the + Penguin, who must rescue Penny from the hands of the evil Nolok. Package: supertux-data Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Levels for classic 2D jump 'n run sidescroller with Tux +Suggests: supertux +Description: Classic 2D jump 'n run sidescroller with Tux (data files) SuperTux is a classic 2D jump 'n run sidescroller game in a similar - style like the original SuperMario games. This is the game data. + style like the original SuperMario games. You play the role of Tux the + Penguin, who must rescue Penny from the hands of the evil Nolok. + . + This package contains the data files required by SuperTux. Added: packages/trunk/supertux/debian/manpages =================================================================== --- packages/trunk/supertux/debian/manpages (rev 0) +++ packages/trunk/supertux/debian/manpages 2012-03-05 08:14:40 UTC (rev 13358) @@ -0,0 +1 @@ +man/man6/supertux2.6 Deleted: packages/trunk/supertux/debian/patches/debian-changes-0.3.3-1 =================================================================== --- packages/trunk/supertux/debian/patches/debian-changes-0.3.3-1 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/patches/debian-changes-0.3.3-1 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,78 +0,0 @@ -Description: Upstream changes introduced in version 0.3.3-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - supertux (0.3.3-1) experimental; urgency=low - . - [ Jon Dowland ] - * update menu section to "Games/Action" for menu policy transition. - Thanks Linas Žvirblis. - . - [ Cyril Brulebois ] - * Added Vcs-Svn and Vcs-Browser fields in the control file. - * Dropped Gürkan Sengün from Uploaders since he doesn't want to package this - game anymore. Thanks for the initial effort. - . - [ Jon Dowland ] - * add Homepage: control field to source stanza - . - [ Ansgar Burchardt ] - * Remove Homepage semi-field from description - . - [ Peter De Wachter ] - * Added watch file. - . - [ Christoph Egger ] - * Drop Cyril Brulebois from uploaders on his request - * Clean up build system using dh7 autofoo - * Bump compat to 7 - * Add quilt patch system - * Adopt build system to upstream supertux -> supertux2 rename - * New upstream Release - * Update yopright - * Adopting by the Debian Games Team (Closes: #535147) - * Add myself to Uploaders - * Bump Standards Version from 3.7.2 to 3.8.4 - * Add README.source - * Wrap Uploaders - * Update Homepage field - . - The person named in the Author field signed this changelog entry. -Author: Christoph Egger <[email protected]> -Bug-Debian: http://bugs.debian.org/535147 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- supertux-0.3.3.orig/CMakeLists.txt -+++ supertux-0.3.3/CMakeLists.txt -@@ -153,7 +153,7 @@ ADD_SUBDIRECTORY(external/squirrel) - - ## Add squirrel lib dir to search path - --LINK_DIRECTORIES(external/squirrel) -+#LINK_DIRECTORIES(external/squirrel) - - ## Some additional include paths - ---- supertux-0.3.3.orig/man/man6/supertux2.6 -+++ supertux-0.3.3/man/man6/supertux2.6 -@@ -123,7 +123,7 @@ archive. - .nf - levels/sample_collection/info - levels/sample_collection/level01.stl --... -+ ... - .fi - .SH BUGS - This is a development version, so expect plenty of bugs. Deleted: packages/trunk/supertux/debian/patches/fix-curl.patch =================================================================== --- packages/trunk/supertux/debian/patches/fix-curl.patch 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/patches/fix-curl.patch 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,13 +0,0 @@ -Index: supertux-0.3.3/src/addon/addon_manager.cpp -=================================================================== ---- supertux-0.3.3.orig/src/addon/addon_manager.cpp 2011-10-11 22:51:04.644921887 +0200 -+++ supertux-0.3.3/src/addon/addon_manager.cpp 2011-10-11 22:51:36.693078566 +0200 -@@ -28,8 +28,6 @@ - - #ifdef HAVE_LIBCURL - # include <curl/curl.h> --# include <curl/easy.h> --# include <curl/types.h> - #endif - - #include "addon/addon.hpp" Deleted: packages/trunk/supertux/debian/patches/gcc-4.6 =================================================================== --- packages/trunk/supertux/debian/patches/gcc-4.6 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/patches/gcc-4.6 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,12 +0,0 @@ -Description: Add missing header. Fixes FTBFS with gcc 4.6. -Author: Ilya Barygin <[email protected]> -Bug-Ubuntu: https://launchpad.net/bugs/832874 ---- supertux-0.3.3.orig/src/supertux/screen_manager.hpp -+++ supertux-0.3.3/src/supertux/screen_manager.hpp -@@ -18,6 +18,7 @@ - #define HEADER_SUPERTUX_SUPERTUX_MAINLOOP_HPP - - #include <memory> -+#include <cstring> - - #include "scripting/thread_queue.hpp" Modified: packages/trunk/supertux/debian/patches/series =================================================================== --- packages/trunk/supertux/debian/patches/series 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/patches/series 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,3 +1,6 @@ -debian-changes-0.3.3-1 -gcc-4.6 -fix-curl.patch +fix_gcc4.6_ftbfs.patch +fix_curl_ftbfs.patch +embedded_libsquirrel.patch +fix_desktop_file.patch +fix_spelling_errors.patch +fix_man_page.patch Modified: packages/trunk/supertux/debian/rules =================================================================== --- packages/trunk/supertux/debian/rules 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/rules 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,14 +1,10 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - %: - dh --with quilt $@ + dh $@ override_dh_install: - rm -f debian/tmp/usr/share/doc/supertux2/COPYING - dh_install --list-missing \ No newline at end of file + dh_install --exclude=COPYING --list-missing + +override_dh_installchangelogs: + dh_installchangelogs WHATSNEW.txt Deleted: packages/trunk/supertux/debian/supertux.6 =================================================================== --- packages/trunk/supertux/debian/supertux.6 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/supertux.6 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,65 +0,0 @@ -.TH SUPERTUX "6" "January 2007" -.SH NAME -supertux \- a classic 2D jump 'n run sidescroller game -.SH SYNOPSIS -.B supertux -[\fIOPTIONS\fR] [\fILEVELFILE\fR] -.br -.SH DESCRIPTION -This manual page documents briefly the -.B supertux -command. -This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBsupertux\fP is a classic 2D jump'n run sidescroller game in a similar -style like the original SuperMario games. -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -.TP -\fB\-f\fR, \fB\-\-fullscreen\fR -Run in fullscreen mode -.TP -\fB\-w\fR, \fB\-\-window\fR -Run in window mode -.TP -\fB\-g\fR, \fB\-\-geometry\fR WIDTHxHEIGHT -Run SuperTux in given resolution -.TP -\fB\-\-disable\-sfx\fR -Disable sound effects -.TP -\fB\-\-disable\-music\fR -Disable music -.TP -\fB\-\-help\fR -Show this help message -.TP -\fB\-\-version\fR -Display SuperTux version and quit -.TP -\fB\-\-console\fR -Enable ingame scripting console -.TP -\fB\-\-show\-fps\fR -Display framerate in levels -.TP -\fB\-\-record\-demo\fR FILE LEVEL -Record a demo to FILE -.TP -\fB\-\-play\-demo\fR FILE LEVEL -Play a recorded demo -.SH KNOWN BUGS -Please have a look at the following thread of the -<[email protected]> list: -http://lists.debian.org/debian-devel-games/2007/01/msg00000.html before -reporting any bug. -.SH AUTHOR -This manual page was originally written by G\(:urkan Seng\(:un -for the Debian project (but may be used by others). It was updated by Cyril -Brulebois for the 0.3.0 version. Modified: packages/trunk/supertux/debian/supertux.lintian-overrides =================================================================== --- packages/trunk/supertux/debian/supertux.lintian-overrides 2012-03-04 06:54:51 UTC (rev 13357) +++ packages/trunk/supertux/debian/supertux.lintian-overrides 2012-03-05 08:14:40 UTC (rev 13358) @@ -1,2 +1,2 @@ -# The Icon is shipped in the -data package. As this package depends on -data it's not a problem -supertux: menu-icon-missing /usr/share/games/supertux2/images/engine/icons/supertux.xpm +# Icon can be found inside the supertux-data package, which supertux depends on +supertux: menu-icon-missing usr/share/games/supertux2/images/engine/icons/supertux.xpm _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
