Author: apo-guest Date: 2013-05-23 18:21:13 +0000 (Thu, 23 May 2013) New Revision: 14130
Added: packages/trunk/neverball/debian/neverball.docs packages/trunk/neverball/debian/neverputt.docs packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch packages/trunk/neverball/debian/patches/reset-video-mode.patch packages/trunk/neverball/debian/patches/sepperate-data-and-bin.patch packages/trunk/neverball/debian/source/ packages/trunk/neverball/debian/source/format packages/trunk/neverball/debian/source/local-options Removed: packages/trunk/neverball/debian/NEWS packages/trunk/neverball/debian/README.source packages/trunk/neverball/debian/patches/fix-build-gold-linker packages/trunk/neverball/debian/patches/reset-video-mode packages/trunk/neverball/debian/patches/sepperate-data-and-bin Modified: packages/trunk/neverball/debian/changelog packages/trunk/neverball/debian/compat packages/trunk/neverball/debian/control packages/trunk/neverball/debian/copyright packages/trunk/neverball/debian/neverball-data.install packages/trunk/neverball/debian/neverball.install packages/trunk/neverball/debian/neverball.menu packages/trunk/neverball/debian/neverputt-data.install packages/trunk/neverball/debian/neverputt.install packages/trunk/neverball/debian/neverputt.menu packages/trunk/neverball/debian/patches/series packages/trunk/neverball/debian/rules packages/trunk/neverball/debian/watch Log: New release 1.5.4-6. Switch to source format 1.0. compat 9, debhelper 9 dh sequencer copyright format 1.0 DEP-3 headers wrap-and-sort-s Drop Conflicts in debian/control See also changelog Deleted: packages/trunk/neverball/debian/NEWS =================================================================== --- packages/trunk/neverball/debian/NEWS 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/NEWS 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,10 +0,0 @@ -neverball (1.5.0-1) unstable; urgency=low - - * Incompatible configuration, score and replay files - - This version of Neverball is part of the 1.5.x series, which isn't - compatible with 1.4.0, the previous stable release. Older scores, replays - and configuration files from 1.4.0 won't work with 1.5.x, and Neverball - will overwrite some of these files. - - -- Jordà Polo <[email protected]> Sun, 08 Feb 2009 22:46:38 +0100 Deleted: packages/trunk/neverball/debian/README.source =================================================================== --- packages/trunk/neverball/debian/README.source 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/README.source 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,2 +0,0 @@ -This package uses quilt for patch management, for more information see -the file /usr/share/doc/quilt/README.source in the quilt package. Modified: packages/trunk/neverball/debian/changelog =================================================================== --- packages/trunk/neverball/debian/changelog 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/changelog 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,18 +1,41 @@ -neverball (1.5.4-6) unstable; urgency=low +neverball (1.5.4-6) UNRELEASED; urgency=low + [ Juhani Numminen ] * Team upload * libpng15 transition: Build-depend on libpng-dev instead of - libpng12-dev (Closes: #662445) + libpng12-dev. (Closes: #662445) * Fix neverball not launching if previously used video mode is - not available (Closes: #677409) - Thanks to Fabian Greffrath for patch. - * Bump Standards-Version to 3.9.3, no changes needed + not available by adding reset-video-mode.patch. (Closes: #677409) + Thanks to Fabian Greffrath for the patch. * Fix non-working Vcs-Browser field in control (400 Bad Request) - with a working one - * Implement hardening + with a working one. + * Implement hardening by using dpkg-buildflags in debian/rules to export all + necessary build flags. - -- Juhani Numminen <[email protected]> Sat, 15 Sep 2012 12:19:46 +0300 + [ Markus Koschany ] + * Bump compat level to 9 and require debhelper >= 9. + * Bump Standards-Version to 3.9.4, no changes needed. + * Switch to source format 3.0 (quilt). + * Update debian/copyright to copyright format 1.0. + * Update the watch file and make the extension regex more flexible. + * Add longtitle to menu files. + * Drop build-dependency on quilt because source format 3.0 uses quilt by + default and remove README.source. + * debian/control: + - Drop old Conflicts relationships. Older packages of neverball and + neverputt (Lenny and earlier) are no longer supported. + - Use fonts-dejavu-core instead of the deprecated ttf-dejavu-core package. + - data-packages: Suggest neverball and neverputt. + * Rewrite and simplify debian/rules by using dh sequencer. + * Build with --parallel. + * Drop NEWS file. Users who upgrade from Squeeze or Wheezy are not affected. + Upgrading directly from Lenny to Jessie is not supported. + * Add DEP-3 headers to all patches. + * Install all debugging symbols correctly and make neverball-dbg useful again. + (Closes: #651180) + -- Markus Koschany <[email protected]> Thu, 23 May 2013 20:05:25 +0200 + neverball (1.5.4-5) unstable; urgency=medium * libjpeg transition: Build-depend on libjpeg-dev instead of @@ -291,7 +314,7 @@ respect his opinion, means the data files will be arch dependant, thus we'll eliminate the endianness problem, but this implies more CPU and space. (closes: #244780) - * rebuild against the libsdl-ttf2.0[-dev] because the libsdl-ttf1.2 + * rebuild against the libsdl-ttf2.0[-dev] because the libsdl-ttf1.2 is now deprecated (closes: #245063), and put this into the control file as build dependency (closes: #244598). Modified: packages/trunk/neverball/debian/compat =================================================================== --- packages/trunk/neverball/debian/compat 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/compat 2013-05-23 18:21:13 UTC (rev 14130) @@ -1 +1 @@ -5 +9 Modified: packages/trunk/neverball/debian/control =================================================================== --- packages/trunk/neverball/debian/control 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/control 2013-05-23 18:21:13 UTC (rev 14130) @@ -2,19 +2,29 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Alexander Reichle-Schmehl <[email protected]>, - Jordà Polo <[email protected]>, Tamas SZERB <[email protected]> -Build-Depends: debhelper (>= 5), libsdl1.2-dev, libsdl-ttf2.0-dev, - libvorbis-dev, libpng-dev, libjpeg-dev, libphysfs-dev, quilt -Standards-Version: 3.9.3 +Uploaders: + Alexander Reichle-Schmehl <[email protected]>, + Jordà Polo <[email protected]>, + Tamas SZERB <[email protected]> +Build-Depends: + debhelper (>= 9), + libjpeg-dev, + libphysfs-dev, + libpng-dev, + libsdl-ttf2.0-dev, + libsdl1.2-dev, + libvorbis-dev +Standards-Version: 3.9.4 Homepage: http://neverball.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/neverball/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/neverball/?view=log +Vcs-Svn: svn://anonscm.debian.org/svn/pkg-games/packages/trunk/neverball/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/neverball/ Package: neverball Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - neverball-data (= ${source:Version}) +Depends: + neverball-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} Suggests: neverputt Description: 3D floor-tilting game In the grand tradition of Marble Madness and Super Monkey Ball, Neverball @@ -26,9 +36,7 @@ Package: neverball-data Architecture: all Depends: neverball-common (= ${source:Version}), ${misc:Depends} -Recommends: neverball -Conflicts: neverdata, neverball (<< 1.4.0+svn2527-1) -Replaces: neverdata +Suggests: neverball Description: data files for Neverball In the grand tradition of Marble Madness and Super Monkey Ball, Neverball has you guide a rolling ball through dangerous territory. Balance on narrow @@ -40,11 +48,8 @@ Package: neverball-common Architecture: all -Depends: ttf-dejavu-core, ${misc:Depends} +Depends: fonts-dejavu-core, ${misc:Depends} Suggests: ttf-wqy-zenhei (>= 0.8.38-1) -Conflicts: neverdata, neverball-data (<< 1.4.0+svn2527-1), - neverball (<< 1.4.0+svn2527-1), neverputt (<< 1.4.0+svn2527-1) -Replaces: neverdata, neverball-data (<< 1.4.0+svn2527-1) Description: data files for Neverball and Neverputt The engine of the floor-tilting game Neverball is also used by its spin-off, a miniature golf game known as Neverputt. @@ -53,8 +58,10 @@ Package: neverputt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - neverputt-data (= ${source:Version}) +Depends: + neverputt-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} Suggests: neverball Description: 3D miniature golf game Neverputt is a hot-seat multi-player miniature golf game for 1 to 4 players. @@ -66,9 +73,7 @@ Package: neverputt-data Architecture: all Depends: neverball-common (= ${source:Version}), ${misc:Depends} -Recommends: neverputt (>= 1.4.0+svn2527-1) -Conflicts: neverdata, neverputt (<< 1.4.0+svn2527-1) -Replaces: neverdata, neverputt (<< 1.4.0+svn2527-1) +Suggests: neverputt Description: data files for Neverputt Neverputt is a hot-seat multi-player miniature golf game for 1 to 4 players. The 18-hole course takes advantage of all the elements that challenge @@ -82,7 +87,9 @@ Section: debug Priority: extra Architecture: any -Depends: neverball (= ${binary:Version}) | neverputt (= ${binary:Version}), ${misc:Depends} +Depends: + neverball (= ${binary:Version}) | neverputt (= ${binary:Version}), + ${misc:Depends} Description: debugging information for Neverball and Neverputt In the grand tradition of Marble Madness and Super Monkey Ball, Neverball has you guide a rolling ball through dangerous territory. Balance on narrow Modified: packages/trunk/neverball/debian/copyright =================================================================== --- packages/trunk/neverball/debian/copyright 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/copyright 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,66 +1,62 @@ -This package was debianized by Tamas SZERB <[email protected]> on -Sun, 11 Apr 2004 19:45:29 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Neverball +Source: http://neverball.org/download.php -It was downloaded from <http://icculus.org/neverball/> +Files: * +Copyright: 2003-2007, Robert Kooima <[email protected]> + 2006, Jean Privat + 2007,2009 Neverball contributors +License: GPL-2+ +Comment: + For a complete list of contributors to Neverball and Neverputt, please refer + to the AUTHORS file. -Upstream Authors: +Files: share/fs_jpg.c +Copyright: 1994-1996, Thomas G. Lane +License: JPEG-License - Robert Kooima - Jean Privat - Pasi Kallinen - Mehdi Yousfi Monod - Michael Middleton - Florian Priester +Files: debian/* +Copyright: 2004-2008, Tamas SZERB <[email protected]> + 2007-2009, Jordà Polo <[email protected]> + 2009-2011, Alexander Reichle-Schmehl <[email protected]> + 2012, Juhani Numminen <[email protected]> + 2013, Markus Koschany <[email protected]> +License: GPL-2+ -Copyright Holders: - Copyright © 2003-2007 Robert Kooima <[email protected]> - Copyright © 2006 Jean Privat - Copyright © 2007,2009 Neverball contributors - Copyright © 2008 Jānis Rūcis <[email protected]> +License: GPL-2+ + NEVERBALL is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian GNU/Linux systems, the complete text of the GNU General Public + License version 2 can be found in `/usr/share/common-licenses/GPL-2'. -License: - - NEVERBALL is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - -On Debian GNU/Linux systems, the complete text of the GNU General Public -License version 2 can be found in `/usr/share/common-licenses/GPL-2'. - -Neverball also includes JPEG decompression routines (share/fs_jpg.c) -with the following copyright and license: - - Copyright © 1994-1996, Thomas G. Lane - - Permission is hereby granted to use, copy, modify, and distribute this - software (or portions thereof) for any purpose, without fee, subject - to these conditions: - (1) If any part of the source code for this software is distributed, - then this README file must be included, with this copyright and - no-warranty notice unaltered; and any additions, deletions, or changes - to the original files must be clearly indicated in accompanying - documentation. - (2) If only executable code is distributed, then the accompanying - documentation must state that "this software is based in part on the - work of the Independent JPEG Group". - (3) Permission for use of this software is granted only if the user - accepts full responsibility for any undesirable consequences; the - authors accept NO LIABILITY for damages of any kind. - -The routines are almost the same as libjpeg62's jdatasrc.c, only minor -changes have been made to use a custom data source based on PhysicsFS. -Neverball's file type (fs_type) and read routine (fs_read), are used -instead of FILE and JFREAD. - -The Debian packaging is licensed under the same license (GPL version 2 or -later, see `/usr/share/common-licenses/GPL-2'), and is copyrighted by: - - Copyright © 2004 Tamas SZERB <[email protected]> - Copyright © 2007-2009 Jordà Polo <[email protected]> +License: JPEG-License + Copyright © 1994-1996, Thomas G. Lane + . + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject + to these conditions: + (1) If any part of the source code for this software is distributed, + then this README file must be included, with this copyright and + no-warranty notice unaltered; and any additions, deletions, or changes + to the original files must be clearly indicated in accompanying + documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the + work of the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user + accepts full responsibility for any undesirable consequences; the + authors accept NO LIABILITY for damages of any kind. +Comment: + The routines are almost the same as libjpeg62's jdatasrc.c, only minor + changes have been made to use a custom data source based on PhysicsFS. + Neverball's file type (fs_type) and read routine (fs_read), are used + instead of FILE and JFREAD. Modified: packages/trunk/neverball/debian/neverball-data.install =================================================================== --- packages/trunk/neverball/debian/neverball-data.install 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/neverball-data.install 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,14 +1,14 @@ data/map-easy/*.sol usr/share/games/neverball/map-easy data/map-fwp/*.sol usr/share/games/neverball/map-fwp +data/map-hard/*.sol usr/share/games/neverball/map-hard data/map-medium/*.sol usr/share/games/neverball/map-medium -data/map-hard/*.sol usr/share/games/neverball/map-hard data/map-mym/*.sol usr/share/games/neverball/map-mym data/map-mym2/*.sol usr/share/games/neverball/map-mym2 +data/set-* usr/share/games/neverball +data/sets.txt usr/share/games/neverball data/shot-easy/* usr/share/games/neverball/shot-easy data/shot-fwp/* usr/share/games/neverball/shot-fwp +data/shot-hard/* usr/share/games/neverball/shot-hard data/shot-medium/* usr/share/games/neverball/shot-medium -data/shot-hard/* usr/share/games/neverball/shot-hard data/shot-mym/* usr/share/games/neverball/shot-mym data/shot-mym2/* usr/share/games/neverball/shot-mym2 -data/set-* usr/share/games/neverball -data/sets.txt usr/share/games/neverball Added: packages/trunk/neverball/debian/neverball.docs =================================================================== --- packages/trunk/neverball/debian/neverball.docs (rev 0) +++ packages/trunk/neverball/debian/neverball.docs 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1,3 @@ +README +doc/AUTHORS +doc/MANUAL Modified: packages/trunk/neverball/debian/neverball.install =================================================================== --- packages/trunk/neverball/debian/neverball.install 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/neverball.install 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,5 +1,5 @@ -neverball usr/games -mapc usr/games debian/neverball.xpm usr/share/pixmaps +dist/neverball.desktop usr/share/applications dist/neverball.png usr/share/pixmaps -dist/neverball.desktop usr/share/applications +mapc usr/games +neverball usr/games Modified: packages/trunk/neverball/debian/neverball.menu =================================================================== --- packages/trunk/neverball/debian/neverball.menu 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/neverball.menu 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,3 +1,6 @@ -?package(neverball): needs="X11" section="Games/Action" \ - title="Neverball" command="/usr/games/neverball" \ +?package(neverball): needs="X11" \ + section="Games/Action" \ + title="Neverball" \ + longtitle="Neverball - 3D floor-tilting game" \ + command="/usr/games/neverball" \ icon="/usr/share/pixmaps/neverball.xpm" Modified: packages/trunk/neverball/debian/neverputt-data.install =================================================================== --- packages/trunk/neverball/debian/neverputt-data.install 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/neverputt-data.install 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,9 +1,9 @@ -data/map-putt/*.sol usr/share/games/neverball/map-putt +data/courses.txt usr/share/games/neverball +data/holes-* usr/share/games/neverball +data/map-ckk/*.sol usr/share/games/neverball/map-ckk data/map-paxed/*.sol usr/share/games/neverball/map-paxed data/map-paxed2/*.sol usr/share/games/neverball/map-paxed2 data/map-paxed3/*.sol usr/share/games/neverball/map-paxed3 +data/map-putt/*.sol usr/share/games/neverball/map-putt data/map-slippi/*.sol usr/share/games/neverball/map-slippi -data/map-ckk/*.sol usr/share/games/neverball/map-ckk data/shot-putt/* usr/share/games/neverball/shot-putt -data/holes-* usr/share/games/neverball -data/courses.txt usr/share/games/neverball Added: packages/trunk/neverball/debian/neverputt.docs =================================================================== --- packages/trunk/neverball/debian/neverputt.docs (rev 0) +++ packages/trunk/neverball/debian/neverputt.docs 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1,3 @@ +README +doc/AUTHORS +doc/MANUAL Modified: packages/trunk/neverball/debian/neverputt.install =================================================================== --- packages/trunk/neverball/debian/neverputt.install 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/neverputt.install 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,4 +1,4 @@ -neverputt usr/games debian/neverputt.xpm usr/share/pixmaps +dist/neverputt.desktop usr/share/applications dist/neverputt.png usr/share/pixmaps -dist/neverputt.desktop usr/share/applications +neverputt usr/games Modified: packages/trunk/neverball/debian/neverputt.menu =================================================================== --- packages/trunk/neverball/debian/neverputt.menu 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/neverputt.menu 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,3 +1,6 @@ -?package(neverputt): needs="X11" section="Games/Action" \ - title="Neverputt" command="/usr/games/neverputt" \ +?package(neverputt): needs="X11" \ + section="Games/Action" \ + title="Neverputt" \ + longtitle="Neverputt - 3D miniature golf game" \ + command="/usr/games/neverputt" \ icon="/usr/share/pixmaps/neverputt.xpm" Deleted: packages/trunk/neverball/debian/patches/fix-build-gold-linker =================================================================== --- packages/trunk/neverball/debian/patches/fix-build-gold-linker 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/patches/fix-build-gold-linker 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,19 +0,0 @@ ---- a/Makefile 2009-09-20 12:06:00.000000000 +0200 -+++ b/Makefile 2010-10-18 13:30:28.167540948 +0200 -@@ -131,14 +131,14 @@ - OGL_LIBS := -framework OpenGL - endif - --BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm - - ifdef DARWIN - BASE_LIBS += -L/opt/local/lib - endif - - ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ -- -lvorbisfile $(OGL_LIBS) -+ -lvorbisfile $(OGL_LIBS) -lX11 - - #------------------------------------------------------------------------------ - Added: packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch =================================================================== --- packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch (rev 0) +++ packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1,33 @@ +From: Felix Geyer <[email protected]> +Date: Wed, 22 May 2013 18:44:34 +0200 +Subject: fix-build-gold-linker + +Build with GNU binutils-gold. + +Bug: http://bugs.debian.org/556916 + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 8184f33..4b45439 100644 +--- a/Makefile ++++ b/Makefile +@@ -131,14 +131,14 @@ ifdef DARWIN + OGL_LIBS := -framework OpenGL + endif + +-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) ++BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm + + ifdef DARWIN + BASE_LIBS += -L/opt/local/lib + endif + + ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ +- -lvorbisfile $(OGL_LIBS) ++ -lvorbisfile $(OGL_LIBS) -lX11 + + #------------------------------------------------------------------------------ + Deleted: packages/trunk/neverball/debian/patches/reset-video-mode =================================================================== --- packages/trunk/neverball/debian/patches/reset-video-mode 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/patches/reset-video-mode 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,22 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Subject: Reset video mode if the one remembered in the - configuration file no longer works. -Bug-Debian: bugs.debian.org/cgi-bin/bugreport.cgi?bug=677409 - ---- a/share/video.c -+++ b/share/video.c -@@ -40,8 +40,12 @@ - config_get_d(CONFIG_WIDTH), - config_get_d(CONFIG_HEIGHT))) - { -- fprintf(stderr, "%s\n", SDL_GetError()); -- return 0; -+ fprintf(stderr, "%s\nReset video mode to default\n", SDL_GetError()); -+ if (!video_mode(0, 800, 600)) -+ { -+ fprintf(stderr, "%s\n", SDL_GetError()); -+ return 0; -+ } - } - - /* ...and this has to happen after it. */ Added: packages/trunk/neverball/debian/patches/reset-video-mode.patch =================================================================== --- packages/trunk/neverball/debian/patches/reset-video-mode.patch (rev 0) +++ packages/trunk/neverball/debian/patches/reset-video-mode.patch 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1,32 @@ +From: Fabian Greffrath <[email protected]> +Date: Wed, 22 May 2013 18:44:34 +0200 +Subject: reset video mode + +Fall back to an available video mode if the one remembered in the configuration +file no longer works. + +Bug: http://bugs.debian.org/677409 + +--- + share/video.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/share/video.c b/share/video.c +index 0e970d7..581f4ca 100644 +--- a/share/video.c ++++ b/share/video.c +@@ -40,8 +40,12 @@ int video_init(const char *title, const char *icon) + config_get_d(CONFIG_WIDTH), + config_get_d(CONFIG_HEIGHT))) + { +- fprintf(stderr, "%s\n", SDL_GetError()); +- return 0; ++ fprintf(stderr, "%s\nReset video mode to default\n", SDL_GetError()); ++ if (!video_mode(0, 800, 600)) ++ { ++ fprintf(stderr, "%s\n", SDL_GetError()); ++ return 0; ++ } + } + + /* ...and this has to happen after it. */ Deleted: packages/trunk/neverball/debian/patches/sepperate-data-and-bin =================================================================== --- packages/trunk/neverball/debian/patches/sepperate-data-and-bin 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/patches/sepperate-data-and-bin 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,13 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -311,6 +311,10 @@ DESKTOPS := $(basename $(wildcard dist/* - - all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales desktops - -+data : sols locales -+ -+executables: $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) desktops -+ - $(BALL_TARG) : $(BALL_OBJS) - $(CC) $(ALL_CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS) - Added: packages/trunk/neverball/debian/patches/sepperate-data-and-bin.patch =================================================================== --- packages/trunk/neverball/debian/patches/sepperate-data-and-bin.patch (rev 0) +++ packages/trunk/neverball/debian/patches/sepperate-data-and-bin.patch 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1,27 @@ +From: Alexander Reichle-Schmehl <[email protected]> +Date: Wed, 22 May 2013 18:44:34 +0200 +Subject: sepperate-data-and-bin + +Fix FTBFS on buildd. + +Bug: http://bugs.debian.org/598614 + +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index a22fed1..8184f33 100644 +--- a/Makefile ++++ b/Makefile +@@ -311,6 +311,10 @@ DESKTOPS := $(basename $(wildcard dist/*.desktop.in)) + + all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales desktops + ++data : sols locales ++ ++executables: $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) desktops ++ + $(BALL_TARG) : $(BALL_OBJS) + $(CC) $(ALL_CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS) + Modified: packages/trunk/neverball/debian/patches/series =================================================================== --- packages/trunk/neverball/debian/patches/series 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/patches/series 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,3 +1,3 @@ -reset-video-mode -sepperate-data-and-bin -fix-build-gold-linker +reset-video-mode.patch +sepperate-data-and-bin.patch +fix-build-gold-linker.patch Modified: packages/trunk/neverball/debian/rules =================================================================== --- packages/trunk/neverball/debian/rules 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/rules 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,113 +1,41 @@ #!/usr/bin/make -f -# Based on the sample rules file written by Joey Hess. - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make +%: + dh $@ --parallel -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: patch - dh_testdir +override_dh_auto_build-arch: # Set HOME to an existent directory as a workaround for #544835. Note that # HOME isn't actually used, but some buildds set it to a non-existent # directory, and PhysicsFS currently fails if the directory doesn't exist # (see #553174). $(MAKE) $(shell dpkg-buildflags --export=configure) \ - DATADIR=/usr/share/games/neverball LOCALEDIR=/usr/share/locale \ - HOME=$(CURDIR) executables + DATADIR=/usr/share/games/neverball \ + LOCALEDIR=/usr/share/locale \ + HOME=$(CURDIR) executables # Rename icons for .desktop files. - cp dist/neverball_128.png dist/neverball.png - cp dist/neverputt_128.png dist/neverputt.png - touch $@ + cp $(CURDIR)/dist/neverball_128.png $(CURDIR)/dist/neverball.png + cp $(CURDIR)/dist/neverputt_128.png $(CURDIR)/dist/neverputt.png -build-indep: build-indep-stamp -build-indep-stamp: patch - dh_testdir - # we build in binary-indep, as "dpkg-buildpackage -B" insist on - # calling the general build target - touch $@ +override_dh_auto_build-indep: + $(MAKE) \ + DATADIR=/usr/share/games/neverball \ + LOCALEDIR=/usr/share/locale \ + HOME=$(CURDIR) data -clean: unpatch - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp +override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) clean - rm -f dist/neverball.png dist/neverputt.png - dh_clean + rm -f $(CURDIR)/dist/neverball.png $(CURDIR)/dist/neverputt.png -install: install-arch +override_dh_auto_test: + # Disable dh_auto_test to prevent FTBFS because of Initialization error. + # DirectFB/Core: Could not initialize 'system_core' core! -install-arch: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs -a - dh_install -a +override_dh_auto_install: + # The Makefile does not provide an install target thus do nothing here. -# Build architecture-independent files here. -binary-indep: build-indep - dh_testdir -i - dh_testroot -i - # Set HOME to an existent directory as a workaround for #544835. Note that - # HOME isn't actually used, but some buildds set it to a non-existent - # directory, and PhysicsFS currently fails if the directory doesn't exist - # (see #553174). - $(MAKE) DATADIR=/usr/share/games/neverball LOCALEDIR=/usr/share/locale \ - HOME=$(CURDIR) data - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs -i - dh_install -i - dh_installchangelogs -i CHANGES - dh_installdocs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +override_dh_installchangelogs: + dh_installchangelogs CHANGES -# Build architecture-dependent files here. -binary-arch: build-arch install-arch - dh_testdir -a - dh_testroot -a - dh_installchangelogs -a CHANGES - dh_installdocs -a -A README doc/AUTHORS doc/MANUAL debian/README.Debian - dh_installman -a - dh_installmenu -a - dh_strip -a --dbg-package=neverball-dbg - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -get-orig-source: - URL="https://s.snth.net/svn/neverball/trunk"; && \ - REV=$$(svn info $$URL | grep Revision: | cut -d\ -f2) && \ - DIR="neverball-1.5.3+svn$$REV" && \ - svn export $$URL $$DIR && \ - tar czf neverball_1.5.3+svn$$REV.orig.tar.gz $$DIR && \ - rm -rf $$DIR - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install get-orig-source +override_dh_strip: + dh_strip --dbg-package=neverball-dbg Added: packages/trunk/neverball/debian/source/format =================================================================== --- packages/trunk/neverball/debian/source/format (rev 0) +++ packages/trunk/neverball/debian/source/format 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1 @@ +3.0 (quilt) Added: packages/trunk/neverball/debian/source/local-options =================================================================== --- packages/trunk/neverball/debian/source/local-options (rev 0) +++ packages/trunk/neverball/debian/source/local-options 2013-05-23 18:21:13 UTC (rev 14130) @@ -0,0 +1 @@ +unapply-patches Modified: packages/trunk/neverball/debian/watch =================================================================== --- packages/trunk/neverball/debian/watch 2013-05-23 10:05:12 UTC (rev 14129) +++ packages/trunk/neverball/debian/watch 2013-05-23 18:21:13 UTC (rev 14130) @@ -1,2 +1,2 @@ version=3 -http://neverball.org/download.php neverball-(.*)\.tar\.gz +http://neverball.org/download.php neverball-(.*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
