[tecnoballz] 43/56: Debian release 0.93.1-1
Markus Koschany
apo-guest at moszumanska.debian.org
Fri Jan 30 12:12:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository tecnoballz.
commit 539a93a6deb6c9333bf45c819a2dca855de47756
Author: Markus Koschany <apo at gambaru.de>
Date: Thu Oct 2 18:47:54 2014 +0000
Debian release 0.93.1-1
---
debian/README.Debian | 7 -
debian/changelog | 43 +++++
debian/clean | 7 +-
debian/control | 7 +-
debian/copyright | 45 ++++--
debian/patches/010_scorefile_path.diff | 19 ---
debian/patches/011_gcc-4.3-fixes.diff | 12 --
debian/patches/020_level_data.diff | 13 --
debian/patches/030_texts_dir.diff | 44 -----
debian/patches/031_honor_cxxflags.diff | 16 --
debian/patches/032_warnings.patch | 268 -------------------------------
debian/patches/Makefile-supervisor.patch | 35 ----
debian/patches/custom-CXXFLAGS.patch | 21 +++
debian/patches/disable-Werror.patch | 21 +++
debian/patches/manpage-window-mode.patch | 37 -----
debian/patches/manpage.patch | 35 ++++
debian/patches/series | 12 +-
debian/patches/system-tinyxml.diff | 96 -----------
debian/rules | 12 +-
debian/tecnoballz-data.install | 2 +-
debian/tecnoballz.dirs | 1 -
debian/tecnoballz.install | 8 +-
debian/tecnoballz.postinst | 26 +--
debian/tecnoballz.preinst | 20 ---
debian/watch | 2 -
25 files changed, 176 insertions(+), 633 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index b9fd0ca..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,7 +0,0 @@
-technoballz-0.91 for Debian
-----------------------------
-
-Note that everytime you install the tecnoballz package,
-scores will be overwritten (/var/games/tecnoballz/tecnoballz.hi).
-
- -- Alexis Sukrieh <sukria at sukria.net>, Thu, 11 Mar 2005 10:57:20 +0200
diff --git a/debian/changelog b/debian/changelog
index 09c37db..9f52067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+tecnoballz (0.93.1-1) unstable; urgency=medium
+
+ * Imported Upstream version 0.93.1.
+ - Fix a segfault caused by a wrong calculation of coordinates of sprites.
+ Thanks to Noel Duffy for the report. (Closes: #627482)
+ - Fix paddle movement restriction for "inversor malus" feature.
+ Thanks to Celelibi for the report and patch. (Closes: #510603)
+ - Fix the bug that sprites (balls and gems) are drawn on the right panel.
+ Thanks to Celelibi for the report and patch. (Closes: #510492)
+ - Fix collision check not accurate enough for fast balls.
+ Thanks to Celelibi for the report and patch! (Closes: #510770)
+ * Add myself to Uploaders.
+ * Declare compliance with Debian Policy 3.9.6.
+ * Drop all patches. They are merged or fixed upstream.
+ - Makefile-supervisor.patch
+ - system-tinyxml.diff
+ - 010_scorefile_path.diff
+ - 011_gcc-4.3-fixes.diff
+ - 020_level_data.diff
+ - 030_texts_dir.diff
+ - 031_honor_cxxflags.diff
+ - 032_warnings.patch
+ - manpage-window-mode.patch
+ * Add the following patches:
+ - custom-CXXFLAGS.patch: Allow the use of custom CXXFLAGS for Debian.
+ - disable-Werror.patch: disable the use of -Werror for production purposes
+ and to avoid possible future build failures due to simple warnings.
+ - manpage.patch: windowed mode is the default now.
+ * Remove dh_clean override. Do not remove Makefile.in files anymore.
+ * Adjust the clean file and add an override for dh_auto_clean. Ensure that
+ the game can be built twice in a row.
+ * Drop tecnoballz.dirs file. There is no need to create the doc directory
+ with this file.
+ * Drop tecnoballz.preinst because it is obsolete.
+ It refers to a version of tecnoballz which has been removed from Debian a
+ long time ago.
+ * tecnoballz.postinst: Remove all obsolete code related to a version of
+ TecnoballZ which is no longer present in the archive.
+ * Update debian/copyright for copyright format 1.0.
+ * Simplify install files by removing debian/tmp prefixes.
+
+ -- Markus Koschany <apo at gambaru.de> Wed, 01 Oct 2014 23:51:12 +0200
+
tecnoballz (0.92-6) unstable; urgency=medium
* Team upload.
diff --git a/debian/clean b/debian/clean
index 1c97e42..976f5e1 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,12 +1,15 @@
config.status config.log
config.sub config.guess
configure
-config.h.in
aclocal.m4
-INSTALL
autotools/config.sub
autotools/config.guess
autotools/depcomp
autotools/install-sh
autotools/missing
src/.deps
+Makefile.in
+src/*.o
+src/tecnoballz
+config.h
+stamp-h1
diff --git a/debian/control b/debian/control
index 4cde676..a69d2ee 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
- Barry deFreese <bdefreese at debian.org>
+ Barry deFreese <bdefreese at debian.org>,
+ Markus Koschany <apo at gambaru.de>
Build-Depends:
- dh-autoreconf,
debhelper (>= 9),
+ dh-autoreconf,
libmikmod-dev,
libogg-dev,
libsdl-image1.2-dev,
@@ -17,7 +18,7 @@ Build-Depends:
libxext-dev,
libxxf86dga-dev,
libxxf86vm-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://linux.tlk.fr/games/TecnoballZ/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/tecnoballz/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/tecnoballz/
diff --git a/debian/copyright b/debian/copyright
index 7076575..116325b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,34 @@
-This package was debianized by Alexis Sukrieh <sukria at sukria.net> on
-Thu, 14 Oct 2004 12:25:50 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: TecnoballZ
+Upstream-Contact: Bruno Ethvignot <bruno at tlk.biz>
+Source: http://linux.tlk.fr/games/TecnoballZ/download
-It was downloaded from http://linux.tlk.fr/games/TecnoballZ/download/
+Files: *
+Copyright: 1991-2014, TLK Games
+License: GPL-3+
-Copyright:
- TecnoballZ is Copyright (C) 1991-2005 TLK Games
+Files: debian/*
+Copyright: 2005-2007, Alexis Sukrieh <sukria at sukria.net>
+ 2006, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+ 2009, Barry deFreese <bdefreese at debian.org>
+ 2011, Peter Pentchev <roam at ringlet.net>
+ 2011, Ansgar Burchardt <ansgar at debian.org>
+ 2014, Markus Koschany <apo at gambaru.de>
+License: GPL-3+
-Upstream Authors:
- - TLK Games <http://linux.tlk.fr>
- - Bruno Ethvignot <bruno at tlk.fr>
-
-License:
- TecnoballZ is published under the terms of the GPL Licence.
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL-3
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License 3 as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/patches/010_scorefile_path.diff b/debian/patches/010_scorefile_path.diff
deleted file mode 100644
index 4ec5390..0000000
--- a/debian/patches/010_scorefile_path.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_hiscore.dpatch by Alexis Sukrieh <sukria at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The good path for a Debian system for the socrefile
-
- at DPATCH@
-diff -urNad tecnoballz-0.92~/src/handler_resources.cc tecnoballz-0.92/src/handler_resources.cc
---- tecnoballz-0.92~/src/handler_resources.cc 2007-11-21 23:43:55.000000000 +0100
-+++ tecnoballz-0.92/src/handler_resources.cc 2007-11-22 00:20:04.000000000 +0100
-@@ -36,7 +36,7 @@
- #endif
-
- #ifndef SCOREFILE
--#define SCOREFILE "/var/lib/games/tecnoballz.hi"
-+#define SCOREFILE "/var/games/tecnoballz/tecnoballz.hi"
- #endif
-
- #ifdef _WIN32
diff --git a/debian/patches/011_gcc-4.3-fixes.diff b/debian/patches/011_gcc-4.3-fixes.diff
deleted file mode 100644
index e7bd789..0000000
--- a/debian/patches/011_gcc-4.3-fixes.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-#Description: Fix call to get_pixel_data for gcc-4.3.
---- a/include/surface_sdl.h
-+++ b/include/surface_sdl.h
-@@ -46,7 +46,7 @@
- ~surface_sdl ();
- SDL_Surface* get_surface ();
- char* get_pixel_data ();
-- char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
-+ char* get_pixel_data (Uint32 coord_x1, Uint32 coord_x2);
- Uint32 get_row_size ();
- Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
- void clear (Uint32 color = 0);
diff --git a/debian/patches/020_level_data.diff b/debian/patches/020_level_data.diff
deleted file mode 100644
index b042abb..0000000
--- a/debian/patches/020_level_data.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-#Description: Include levels-data.xml file in build.
-Index: tecnoballz-0.92/src/TecnoballZ/Makefile.am
-===================================================================
---- tecnoballz-0.92.orig/src/TecnoballZ/Makefile.am 2009-04-16 14:41:28.000000000 -0400
-+++ tecnoballz-0.92/src/TecnoballZ/Makefile.am 2009-04-16 14:41:48.000000000 -0400
-@@ -6,6 +6,7 @@
- dist_pkgdata_DATA = \
- cosinus128.list \
- gard_lissa.list \
-+ levels-data.xml \
- min60map.png \
- tableau.data \
- tilemap-congratulation_20.data \
diff --git a/debian/patches/030_texts_dir.diff b/debian/patches/030_texts_dir.diff
deleted file mode 100644
index 21c2c76..0000000
--- a/debian/patches/030_texts_dir.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-#Description: Include the texts subdir in the build.
-Index: tecnoballz-0.92/configure.ac
-===================================================================
---- tecnoballz-0.92.orig/configure.ac 2009-04-16 15:35:02.000000000 -0400
-+++ tecnoballz-0.92/configure.ac 2009-04-16 15:35:33.000000000 -0400
-@@ -81,5 +81,5 @@
-
-
- dnl Output makefiles
--AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile)
-+AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile src/TecnoballZ/texts/Makefile)
-
-Index: tecnoballz-0.92/src/TecnoballZ/Makefile.am
-===================================================================
---- tecnoballz-0.92.orig/src/TecnoballZ/Makefile.am 2009-04-16 15:35:46.000000000 -0400
-+++ tecnoballz-0.92/src/TecnoballZ/Makefile.am 2009-04-16 15:36:10.000000000 -0400
-@@ -1,6 +1,6 @@
- NULL =
-
--SUBDIRS = lores hires textures sounds musics
-+SUBDIRS = lores hires textures sounds musics texts
-
- pkgdatadir = $(datadir)/tecnoballz
- dist_pkgdata_DATA = \
-Index: tecnoballz-0.92/src/TecnoballZ/texts/Makefile.am
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tecnoballz-0.92/src/TecnoballZ/texts/Makefile.am 2009-04-16 15:37:27.000000000 -0400
-@@ -0,0 +1,15 @@
-+NULL =
-+pkgdatadir = $(datadir)/tecnoballz/texts
-+dist_pkgdata_DATA = \
-+ main_menu_en.txt \
-+ main_menu_fr.txt \
-+ popup_menu_en.txt \
-+ popup_menu_fr.txt \
-+ scrolltext_en.txt \
-+ scrolltext_fr.txt \
-+ shop_en.txt \
-+ shop_fr.txt \
-+ short_info_messages_en.txt \
-+ short_info_messages_fr.txt \
-+ $(NULL)
-+
diff --git a/debian/patches/031_honor_cxxflags.diff b/debian/patches/031_honor_cxxflags.diff
deleted file mode 100644
index a0710e2..0000000
--- a/debian/patches/031_honor_cxxflags.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Honor the user-supplied CXXFLAGS.
-Forwarded: no
-Author: Peter Pentchev <roam at ringlet.net>
-Last-Update: 2011-02-17
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,7 +16,7 @@
-
- dnl Default flags
- #CXXFLAGS="-g -O3 -Wall"
--CXXFLAGS=" -O3 -Wall"
-+#CXXFLAGS=" -O3 -Wall"
-
- dnl Check for X
- AC_PATH_X
diff --git a/debian/patches/032_warnings.patch b/debian/patches/032_warnings.patch
deleted file mode 100644
index cb995a5..0000000
--- a/debian/patches/032_warnings.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-Description: Fix some compiler warnings.
- - constify a couple of char pointers to static strings
- - remove some unneeded declarations with mismatched types
- - add some parentheses to disambiguate operations' priority
- - initialize a loop index to avoid an array[-1] access
- - add some parentheses to fix a comparison's logic
- - check for write(2) errors
-Forwarded: no
-Author: Peter Pentchev <roam at ringlet.net>
-Last-Update: 2011-02-17
-
---- a/src/handler_audio.cc
-+++ b/src/handler_audio.cc
-@@ -234,7 +234,7 @@
- "Mix_QuerySpec return " << Mix_GetError () << std::endl;
- return;
- }
-- char *format = "Unknown";
-+ const char *format = "Unknown";
- switch (format_id)
- {
- case AUDIO_U8:
---- a/src/handler_popup_menu.cc
-+++ b/src/handler_popup_menu.cc
-@@ -424,7 +424,7 @@
- for (j = 0; j < num_of_columns; j++)
- {
- unsigned char pixel = cycling_table[color];
-- char a = *(p++) - 32;
-+ a = *(p++) - 32;
- if (a != 0)
- {
- b = c[a];
-@@ -509,7 +509,7 @@
- for (j = 0; j < num_of_columns; j++)
- {
- unsigned char pixel = cycling_table[color];
-- char a = *(p++) - 32;
-+ a = *(p++) - 32;
- if (a != 0)
- {
- b = c[a];
---- a/src/handler_resources.cc
-+++ b/src/handler_resources.cc
-@@ -45,7 +45,7 @@
- #endif
- #endif
-
--char * handler_resources::fnamescore = SCOREFILE;
-+const char * handler_resources::fnamescore = SCOREFILE;
- const char *
- handler_resources::folder_640 = "hires/";
- const char *
-@@ -621,7 +621,7 @@
- * @param fname filename specified by path
- */
- char *
--handler_resources::load_file (char *fname)
-+handler_resources::load_file (const char *fname)
- {
- return load_file (fname, &last_filesize_loaded);
- }
-@@ -633,7 +633,7 @@
- * return a pointer to the file data
- */
- char *
--handler_resources::load_file (char *fname, Uint32 * fsize)
-+handler_resources::load_file (const char *fname, Uint32 * fsize)
- {
- /* locate a file under one of the data directories */
- char *pname = locate_data_file (fname);
-@@ -759,6 +759,9 @@
- void
- handler_resources::save_high_score_file (char *buffer, Uint32 size)
- {
-+ size_t left;
-+ ssize_t n;
-+
- #ifdef WIN32
- /* set umask so that files are group-writable */
- _umask (0002);
-@@ -772,11 +775,23 @@
- "handler_resources::saveScores(): file:%s / error:%s\n",
- fnamescore, strerror (errno));
- }
-+ left = size;
-+ while (left > 0)
-+ {
- #ifdef WIN32
-- _write (fhand, buffer, size);
-+ n = _write (fhand, buffer + size - left, left);
- #else
-- write (fhand, buffer, size);
-+ n = write (fhand, buffer + size - left, left);
- #endif
-+ if (n == -1)
-+ {
-+ fprintf (stderr, "handler_resources::saveScores(): file: %s / error:%s\n",
-+ fnamescore, strerror(errno));
-+ close (fhand);
-+ return;
-+ }
-+ left -= n;
-+ }
- if (close (fhand) == -1)
- {
- fprintf (stderr,
---- a/include/handler_resources.h
-+++ b/include/handler_resources.h
-@@ -42,7 +42,7 @@
- static const char *folderdata;
- static const char *folder_320;
- static const char *folder_640;
-- static char *fnamescore;
-+ static const char *fnamescore;
- static char tmp_filename[512];
- static char pathstring[512];
- static const Uint32 TEXTS_OFFSET = 2048;
-@@ -118,8 +118,8 @@
-
- private:
- char *loadfile_with_lang (const char *const filename, Uint32 * const fsize);
-- char *load_file (char *fname);
-- char *load_file (char *fname, Uint32 * fsize);
-+ char *load_file (const char *fname);
-+ char *load_file (const char *fname, Uint32 * fsize);
- };
-
- #endif
---- a/src/lispreader.cc
-+++ b/src/lispreader.cc
-@@ -121,7 +121,7 @@
- static int
- _scan (lisp_stream_t *stream)
- {
-- static char *delims = "\"();";
-+ static const char *delims = "\"();";
-
- int c;
-
-@@ -549,7 +549,7 @@
- {
- struct
- {
-- char *name;
-+ const char *name;
- int type;
- }
- types[] =
---- a/src/sprite_display_menu.cc
-+++ b/src/sprite_display_menu.cc
-@@ -234,7 +234,7 @@
- for (j = 0; j < NUM_OF_COLUMNS; j++)
- {
- unsigned char pixel = color_cycling[color];
-- char a = *(p++) - 32;
-+ a = *(p++) - 32;
- if (a != 0)
- {
- b = c[a];
-@@ -335,7 +335,7 @@
- for (j = 0; j < NUM_OF_COLUMNS; j++)
- {
- unsigned char pixel = color_cycling[color];
-- char a = *(p++) - 32;
-+ a = *(p++) - 32;
- if (a != 0)
- {
- b = c[a];
---- a/src/sprite_gem.cc
-+++ b/src/sprite_gem.cc
-@@ -99,7 +99,7 @@
- paddle = pad;
- towards = paddle->get_paddle_number ();
- speed_of_moving = resolution;
-- Uint32 h = (random_counter >> 4 + rand_count++) & 7;
-+ Uint32 h = (random_counter >> (4 + rand_count++)) & 7;
- random_counter += xcoord;
- h = gem_random[h];
- gem_id = h;
---- a/src/supervisor_map_editor.cc
-+++ b/src/supervisor_map_editor.cc
-@@ -774,6 +774,8 @@
- //map_size = map_size * 2;
- Uint32
- bytes_size = map_size * sizeof (Uint16);
-+ size_t left;
-+ ssize_t n;
-
- /*
- Uint16 *map2 = new Uint16[map_size];
-@@ -832,7 +834,7 @@
- #else
- umask (0002);
- #endif
-- char *
-+ const char *
- filename = "edmap.data";
- Sint32
- handle = open (filename, O_WRONLY | O_CREAT, 00666);
-@@ -843,11 +845,24 @@
- delete[]filedata;
- return false;
- }
-+ left = bytes_size;
-+ while (left > 0)
-+ {
- #ifdef WIN32
-- _write (handle, filedata, bytes_size);
-+ n = _write (handle, filedata + bytes_size - left, left);
- #else
-- write (handle, filedata, bytes_size);
-+ n = write (handle, filedata + bytes_size - left, left);
- #endif
-+ if (n == -1)
-+ {
-+ std::cerr << "supervisor_map_editor::save_tilesmap() file " <<
-+ filename << "; error " << strerror (errno) << std::endl;
-+ close (handle);
-+ delete[]filedata;
-+ return false;
-+ }
-+ left -= n;
-+ }
- if (close (handle) == -1)
- {
- std::cerr << "supervisor_map_editor::save_tilesmap() file " <<
---- a/include/supervisor_shop.h
-+++ b/include/supervisor_shop.h
-@@ -164,7 +164,7 @@
- /** Prices of all the available options in the shop */
- static Uint32 options_prices[];
- /** Indexes of the texts used for sales confirmation messages */
-- static char led_index_to_text_index[];
-+ static unsigned char led_index_to_text_index[];
-
- public:
- supervisor_shop ();
---- a/src/supervisor_shop.cc
-+++ b/src/supervisor_shop.cc
-@@ -866,6 +866,7 @@
- }
- else
- {
-+ i = 0;
- while (available_options_id[i] != sprite_capsule::LEAVE_SHOP)
- {
- if (available_options_id[i] == drop_id)
-@@ -1081,7 +1082,7 @@
- /**
- * Indexes of the texts used for sales confirmation messages
- */
--char
-+unsigned char
- supervisor_shop::led_index_to_text_index[] =
- {
- /* S+/F1/F2/RW/B2/B3 */
---- a/src/tinyxmlparser.cc
-+++ b/src/tinyxmlparser.cc
-@@ -354,7 +354,7 @@
- }
- else
- {
-- while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )
-+ while ( *p && (IsWhiteSpace( *p ) || *p == '\n' || *p =='\r') )
- ++p;
- }
-
diff --git a/debian/patches/Makefile-supervisor.patch b/debian/patches/Makefile-supervisor.patch
deleted file mode 100644
index 507b09a..0000000
--- a/debian/patches/Makefile-supervisor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Thu, 26 Jun 2014 12:31:05 +0200
-Subject: Makefile supervisor
-
----
- src/Makefile.am | 2 +-
- src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bc54146..062ec34 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -71,7 +71,7 @@ SOURCES_MAIN = \
- sprite_projectile.cc \
- sprite_ship.cc \
- sprite_wall.cc \
-- supervisor.c \
-+ supervisor.cc \
- supervisor_bricks_level.cc \
- supervisor_main_menu.cc \
- supervisor_map_editor.cc \
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 53d8414..53b5e1e 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -324,7 +324,7 @@ SOURCES_MAIN = \
- sprite_projectile.cc \
- sprite_ship.cc \
- sprite_wall.cc \
-- supervisor.c \
-+ supervisor.cc \
- supervisor_bricks_level.cc \
- supervisor_main_menu.cc \
- supervisor_map_editor.cc \
diff --git a/debian/patches/custom-CXXFLAGS.patch b/debian/patches/custom-CXXFLAGS.patch
new file mode 100644
index 0000000..5f3d7eb
--- /dev/null
+++ b/debian/patches/custom-CXXFLAGS.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Thu, 2 Oct 2014 18:32:17 +0200
+Subject: custom CXXFLAGS
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 59e260e..93f3a3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,7 +65,7 @@ if test "x${enable_devel}" = "xyes"; then
+ AC_DEFINE(UNDER_DEVELOPMENT, 1, Define to enable development version)
+ CXXFLAGS="-Werror -O2 -Wall -pedantic -Wextra -std=gnu++98 -g"
+ else
+- CXXFLAGS="-O2 -Wall -pedantic -Wextra -std=gnu++98"
++ CXXFLAGS="-O2 -Wall -pedantic -Wextra -std=gnu++98 $CXXFLAGS"
+ fi
+
+ AC_OUTPUT(
diff --git a/debian/patches/disable-Werror.patch b/debian/patches/disable-Werror.patch
new file mode 100644
index 0000000..6544b62
--- /dev/null
+++ b/debian/patches/disable-Werror.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Thu, 2 Oct 2014 18:20:23 +0200
+Subject: disable -Werror
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67c7ec1..59e260e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,7 +65,7 @@ if test "x${enable_devel}" = "xyes"; then
+ AC_DEFINE(UNDER_DEVELOPMENT, 1, Define to enable development version)
+ CXXFLAGS="-Werror -O2 -Wall -pedantic -Wextra -std=gnu++98 -g"
+ else
+- CXXFLAGS="-O2 -Werror -Wall -pedantic -Wextra -std=gnu++98"
++ CXXFLAGS="-O2 -Wall -pedantic -Wextra -std=gnu++98"
+ fi
+
+ AC_OUTPUT(
diff --git a/debian/patches/manpage-window-mode.patch b/debian/patches/manpage-window-mode.patch
deleted file mode 100644
index 1008840..0000000
--- a/debian/patches/manpage-window-mode.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Thu, 26 Jun 2014 13:05:38 +0200
-Subject: manpage window mode
-
----
- man/tecnoballz.6 | 3 +++
- man/tecnoballz.fr.6 | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/man/tecnoballz.6 b/man/tecnoballz.6
-index e8a0857..fe36bd4 100644
---- a/man/tecnoballz.6
-+++ b/man/tecnoballz.6
-@@ -43,6 +43,9 @@ Print a lot of debuging information to stdout.
- .TP
- .B \--nosound
- Disable the sound.
-+.TP
-+.B \--window
-+Start the game in windowed mode.
- .SH COPYRIGHT
- .if n TecnoballZ is Copyright (C) 1992-2004 by the Tlk Games Company.
- .SH AUTHOR
-diff --git a/man/tecnoballz.fr.6 b/man/tecnoballz.fr.6
-index db1cf8b..0b66042 100644
---- a/man/tecnoballz.fr.6
-+++ b/man/tecnoballz.fr.6
-@@ -42,6 +42,9 @@ Affiche beaucoup de messages de debugging
- .TP
- .B \--nosound
- D�sactive le son.
-+.TP
-+.B \--window
-+Lance le jeu en mode fen�tre.
- .SH COPYRIGHT
- .if n TecnoballZ est sous Copyright (C) 1992-2004 de la soci�t� Tlk Games.
- .SH AUTHOR
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
new file mode 100644
index 0000000..9f4aa79
--- /dev/null
+++ b/debian/patches/manpage.patch
@@ -0,0 +1,35 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Thu, 2 Oct 2014 18:41:37 +0200
+Subject: manpage
+
+---
+ man/tecnoballz.6 | 2 +-
+ man/tecnoballz.fr.6 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/tecnoballz.6 b/man/tecnoballz.6
+index 6baec7f..99afe73 100644
+--- a/man/tecnoballz.6
++++ b/man/tecnoballz.6
+@@ -51,7 +51,7 @@ Display version number.
+ Start the game in fullscreen mode.
+ .TP
+ .B \--window
+-windowed mode (full screen by default)
++windowed mode (default)
+ .TP
+ .B \--320|--640
+ Force the game resolution to 320x200 or 640x480.
+diff --git a/man/tecnoballz.fr.6 b/man/tecnoballz.fr.6
+index 8b06054..842463d 100644
+--- a/man/tecnoballz.fr.6
++++ b/man/tecnoballz.fr.6
+@@ -50,7 +50,7 @@ Affiche le num
+ Lance le jeu en plein-�cran.
+ .TP
+ .B \--window
+-Mode fen�tr� (Plein �cran par d�faut)
++Mode fen�tr� (d�faut)
+ .TP
+ .B \--320|--640
+ Force la r�solution du jeu en 320x200 ou en 640x480.
diff --git a/debian/patches/series b/debian/patches/series
index d0e4337..4f67721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-010_scorefile_path.diff
-011_gcc-4.3-fixes.diff
-020_level_data.diff
-030_texts_dir.diff
-031_honor_cxxflags.diff
-032_warnings.patch
-system-tinyxml.diff
-Makefile-supervisor.patch
-manpage-window-mode.patch
+disable-Werror.patch
+custom-CXXFLAGS.patch
+manpage.patch
diff --git a/debian/patches/system-tinyxml.diff b/debian/patches/system-tinyxml.diff
deleted file mode 100644
index c521c29..0000000
--- a/debian/patches/system-tinyxml.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Sun, 14 Aug 2011 14:08:35 +0200
-Subject: Use tinyxml system library
-Origin: vendor
-
---- tecnoballz.orig/include/handler_levels.h
-+++ tecnoballz/include/handler_levels.h
-@@ -32,7 +32,7 @@
- class handler_levels;
-
- #include "../include/tecnoballz.h"
--#include "../include/tinyxml.h"
-+#include <tinyxml.h>
- #include <string.h>
-
- typedef struct
---- tecnoballz.orig/include/tinystr.h
-+++ tecnoballz/include/tinystr.h
-@@ -34,6 +34,8 @@
- * - added swap(), clear(), size(), capacity(), operator+().
- */
-
-+#error "Embedded copy of libtinyxml-dev should not be used."
-+
- #ifndef TIXML_USE_STL
-
- #ifndef TIXML_STRING_INCLUDED
---- tecnoballz.orig/include/tinyxml.h
-+++ tecnoballz/include/tinyxml.h
-@@ -22,6 +22,7 @@
- distribution.
- */
-
-+#error "Embedded copy of libtinyxml-dev should not be used."
-
- #ifndef TINYXML_INCLUDED
- #define TINYXML_INCLUDED
---- tecnoballz.orig/src/Makefile.am
-+++ tecnoballz/src/Makefile.am
-@@ -9,7 +9,7 @@
- games_PROGRAMS = tecnoballz
- tecnoballz_SOURCES = $(SOURCES_MAIN)
- tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@
--tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L.
-+tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -ltinyxml -L.
-
- SOURCES_MAIN = \
- bitmap_data.cc \
-@@ -81,9 +81,5 @@
- tecnoballz.cc \
- tiles_background.cc \
- tilesmap_scrolling.cc \
-- tinyxml.cc \
-- tinyxmlerror.cc \
-- tinyxmlparser.cc \
-- tinystr.cc
- $(NULL)
-
---- tecnoballz.orig/src/handler_levels.cc
-+++ tecnoballz/src/handler_levels.cc
-@@ -29,7 +29,7 @@
- using namespace std;
- #include "../include/handler_levels.h"
- #include "../include/handler_resources.h"
--#include "../include/tinyxml.h"
-+#include <tinyxml.h>
- #include <string.h>
- #include <sstream>
-
-@@ -143,7 +143,7 @@
- Sint32 type = parent->Type ();
- switch (type)
- {
-- case TiXmlNode::ELEMENT:
-+ case TiXmlNode::TINYXML_ELEMENT:
- {
- string element = parent->Value ();
- if (element == "level")
-@@ -221,7 +221,7 @@
- string name;
- switch (type)
- {
-- case TiXmlNode::ELEMENT:
-+ case TiXmlNode::TINYXML_ELEMENT:
- {
- element = parent->ToElement ();
- last_element = parent->Value ();
-@@ -290,7 +290,7 @@
- break;
-
-
-- case TiXmlNode::TEXT:
-+ case TiXmlNode::TINYXML_TEXT:
- text = parent->ToText ();
- value_str = text->Value ();
-
diff --git a/debian/rules b/debian/rules
index a2e7155..0351355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,16 @@
dh $@ --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --datadir=/usr/share/games
+ dh_auto_configure -- \
+ --datadir=/usr/share/games
-override_dh_clean:
- find ./ -name Makefile.in -delete
- dh_clean
+override_dh_auto_clean:
+ # Building the game twice in a row does not work currently. Use
+ # a custom clean file and an override instead.
+ find $(CURDIR) -name Makefile -delete
override_dh_auto_install:
dh_auto_install
- # The data package
+ # Do not overwrite old hiscore files. Let tecnoballz.postinst handle this.
mv $(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi \
$(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi.clean
diff --git a/debian/tecnoballz-data.install b/debian/tecnoballz-data.install
index 0ec509e..0d009d1 100644
--- a/debian/tecnoballz-data.install
+++ b/debian/tecnoballz-data.install
@@ -1 +1 @@
-debian/tmp/usr/share/games/tecnoballz/* usr/share/games/tecnoballz/
+usr/share/games/tecnoballz
diff --git a/debian/tecnoballz.dirs b/debian/tecnoballz.dirs
deleted file mode 100644
index 7276ecd..0000000
--- a/debian/tecnoballz.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc
diff --git a/debian/tecnoballz.install b/debian/tecnoballz.install
index 953dbad..654eb19 100644
--- a/debian/tecnoballz.install
+++ b/debian/tecnoballz.install
@@ -1,4 +1,4 @@
-debian/tecnoballz.desktop usr/share/applications/
-debian/tecnoballz.xpm usr/share/pixmaps/
-debian/tmp/usr/games/* usr/games/
-debian/tmp/var/games/* var/games/
+debian/tecnoballz.desktop usr/share/applications/
+debian/tecnoballz.xpm usr/share/pixmaps/
+usr/games
+var/games
diff --git a/debian/tecnoballz.postinst b/debian/tecnoballz.postinst
index 99d2e64..39e4387 100644
--- a/debian/tecnoballz.postinst
+++ b/debian/tecnoballz.postinst
@@ -9,17 +9,6 @@ PROG=/usr/games/tecnoballz
case "$1" in
configure)
- # cancel pre-0.91cvs20060501-1.2 erroneous use of dpkg-statoverride
- if [ "$1" = "configure" ] && [ "$2" != "" ] &&
- dpkg --compare-versions "$2" lt "0.91cvs20060501-1.2" &&
- [ -x /usr/sbin/dpkg-statoverride ]; then
- for file in $SCOREDIR $SCOREDIR/tecnoballz.hi $PROG; do
- if dpkg-statoverride --list $file >/dev/null; then
- dpkg-statoverride --remove $file
- fi
- done
- fi
-
# tecnoballz is setuid "root:games".
if ! [ -x /usr/sbin/dpkg-statoverride ] || \
! dpkg-statoverride --list "$PROG" >/dev/null ; then
@@ -27,11 +16,6 @@ case "$1" in
chmod 2755 "$PROG"
fi
- # If we saved the scorefile in the preinst rule, restore it
- if [ -f $SCOREDIR/tecnoballz.hi.saved ]; then
- mv $SCOREDIR/tecnoballz.hi.saved $SCOREDIR/tecnoballz.hi
- fi
-
# If there is no scorefile, create one
if ! [ -f $SCOREDIR/tecnoballz.hi ]; then
cp $SCOREDIR/tecnoballz.hi.clean $SCOREDIR/tecnoballz.hi
@@ -43,15 +27,7 @@ case "$1" in
chown root:games $SCOREDIR/tecnoballz.hi
chmod 0664 $SCOREDIR/tecnoballz.hi
- # Help dpkg with the directory -> symlink transition
- if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then
- rmdir --ignore-fail-on-non-empty "$DOCDIR"
- if [ ! -d "$DOCDIR" ]; then
- ln -s tecnoballz-data "$DOCDIR"
- fi
- fi
-
- ;;
+ ;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
diff --git a/debian/tecnoballz.preinst b/debian/tecnoballz.preinst
deleted file mode 100644
index 829cdb8..0000000
--- a/debian/tecnoballz.preinst
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SCOREDIR=/var/games/tecnoballz
-
-case "$1" in
-
- upgrade)
- # Save the scorefile from a pre-0.91cvs20060501-1.2 version
- if [ -f $SCOREDIR/tecnoballz.hi ] && \
- dpkg --compare-versions "$2" lt "0.91cvs20060501-1.2"; then
- cp $SCOREDIR/tecnoballz.hi $SCOREDIR/tecnoballz.hi.saved
- fi
-
- ;;
-esac
-
-#DEBHELPER#
-
diff --git a/debian/watch b/debian/watch
index 3692ae5..a790a55 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
version=3
-
http://linux.tlk.fr/games/TecnoballZ/download/ tecnoballz-(.*)\.(?:tgz|tar.gz|tar.bz2)
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tecnoballz.git
More information about the Pkg-games-commits
mailing list