r11706 - in packages/trunk/antigrav/debian: . patches source
Vincent Fourmond
fourmond at alioth.debian.org
Wed Jan 26 21:39:01 UTC 2011
Author: fourmond
Date: 2011-01-26 21:39:00 +0000 (Wed, 26 Jan 2011)
New Revision: 11706
Added:
packages/trunk/antigrav/debian/patches/03_daca_fixes.diff
packages/trunk/antigrav/debian/patches/04-height-selection.diff
packages/trunk/antigrav/debian/source/
packages/trunk/antigrav/debian/source/format
Modified:
packages/trunk/antigrav/debian/antigrav.6
packages/trunk/antigrav/debian/changelog
packages/trunk/antigrav/debian/compat
packages/trunk/antigrav/debian/control
packages/trunk/antigrav/debian/copyright
packages/trunk/antigrav/debian/patches/series
packages/trunk/antigrav/debian/rules
Log:
[antigrav] Few fixes/updates
Modified: packages/trunk/antigrav/debian/antigrav.6
===================================================================
--- packages/trunk/antigrav/debian/antigrav.6 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/antigrav.6 2011-01-26 21:39:00 UTC (rev 11706)
@@ -24,6 +24,11 @@
.TP
.B -r, --resolution=RES
set resolution to \fIRES\fP, 1024 for 1024x768, 800 for 800x600, etc
+.TP
+.B -H, --height=HEIGHT
+sets the height of the display to HEIGHT, to be used when an aspect
+ratio of 4/3 is not desired.
+
.SH AUTHOR
antigrav was written by Riku Salminen and Calle Laakkonen.
.PP
Modified: packages/trunk/antigrav/debian/changelog
===================================================================
--- packages/trunk/antigrav/debian/changelog 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/changelog 2011-01-26 21:39:00 UTC (rev 11706)
@@ -1,8 +1,16 @@
-antigrav (0.0.3-3) UNRELEASED; urgency=low
+antigrav (0.0.3-3) experimental; urgency=low
- * NOT RELEASED YET
+ * Switched to format 3.0 (quilt)
+ * Applied patch courtesy of Mario Lang <mlang at debian.org> to fix few
+ DACA-detected problems (closes: #610305) (03_daca_fixes.diff)
+ * Adding ${misc:Depends} for potential dh-induced dependencies
+ * Switched build system to a pure dh 7 debian/rules (and, in passing, I
+ cannot help but express my gratitude to the authors of the dh sequencer)
+ * Conforms to standards 3.9.1
+ * Patch 04-height-selection.diff to provide a -H option to allow the
+ user to change the aspect ratio (closes: #538910)
- -- Vincent Fourmond <fourmond at debian.org> Thu, 27 Dec 2007 15:17:39 +0100
+ -- Vincent Fourmond <fourmond at debian.org> Wed, 26 Jan 2011 22:34:32 +0100
antigrav (0.0.3-2) unstable; urgency=low
Modified: packages/trunk/antigrav/debian/compat
===================================================================
--- packages/trunk/antigrav/debian/compat 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/compat 2011-01-26 21:39:00 UTC (rev 11706)
@@ -1 +1 @@
-5
+7
Modified: packages/trunk/antigrav/debian/control
===================================================================
--- packages/trunk/antigrav/debian/control 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/control 2011-01-26 21:39:00 UTC (rev 11706)
@@ -4,15 +4,15 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>,
Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>> 5.0.0), autotools-dev, quilt, zlib1g-dev, libpng12-dev, libalut-dev, libopenal-dev, libsdl1.2-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 7), autotools-dev, zlib1g-dev, libpng12-dev, libalut-dev, libopenal-dev, libsdl1.2-dev
+Standards-Version: 3.9.1
Homepage: http://www.luolamies.org/software/antigrav/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/antigrav/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/antigrav/?op=log
Package: antigravitaattori
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Multiplayer flying saucer racing game
This is a multiplayer flying saucer racing game, made for
Assembly 2006 game competition. It is a great and fun game
Modified: packages/trunk/antigrav/debian/copyright
===================================================================
--- packages/trunk/antigrav/debian/copyright 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/copyright 2011-01-26 21:39:00 UTC (rev 11706)
@@ -28,7 +28,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Released under the GNU GPL.
-Please see /usr/share/common-licenses/GPL for the full license.
+Please see /usr/share/common-licenses/GPL-2 for the full license.
License (src/tinyxml/*):
@@ -54,4 +54,4 @@
distribution.
The Debian packaging is (C) 2006, Gürkan Sengün <gurkan at linuks.mine.nu> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
Added: packages/trunk/antigrav/debian/patches/03_daca_fixes.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/03_daca_fixes.diff (rev 0)
+++ packages/trunk/antigrav/debian/patches/03_daca_fixes.diff 2011-01-26 21:39:00 UTC (rev 11706)
@@ -0,0 +1,35 @@
+--- ./src/m3dtexture.cpp.orig 2006-08-04 21:38:31.000000000 +0200
++++ ./src/m3dtexture.cpp 2011-01-17 13:32:33.000000000 +0100
+@@ -382,7 +382,7 @@
+
+ png_write_image(pngPtr, rowPointers);
+ png_write_end(pngPtr, pngInfoPtr);
+- delete rowPointers;
++ delete[] rowPointers;
+ png_destroy_write_struct(&pngPtr, &pngInfoPtr);
+ return 0;
+ }
+@@ -423,11 +423,11 @@
+
+ if(savePNG(filename, data, width, height) != 0)
+ {
+- delete data;
++ delete[] data;
+ return -1;
+ }
+
+- delete data;
++ delete[] data;
+ return 0;
+ }
+
+--- ./src/tinyxml/tinyxml.cpp.orig 2006-08-04 21:38:31.000000000 +0200
++++ ./src/tinyxml/tinyxml.cpp 2011-01-17 13:34:01.000000000 +0100
+@@ -1085,6 +1085,7 @@
+
+ if ( fread( buf, length, 1, file ) != 1 ) {
+ SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
++ delete [] buf;
+ return false;
+ }
+
Added: packages/trunk/antigrav/debian/patches/04-height-selection.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/04-height-selection.diff (rev 0)
+++ packages/trunk/antigrav/debian/patches/04-height-selection.diff 2011-01-26 21:39:00 UTC (rev 11706)
@@ -0,0 +1,58 @@
+Index: antigrav-0.0.3/src/main.cpp
+===================================================================
+--- antigrav-0.0.3.orig/src/main.cpp 2011-01-26 22:15:47.432908120 +0100
++++ antigrav-0.0.3/src/main.cpp 2011-01-26 22:18:37.312575085 +0100
+@@ -25,13 +25,16 @@
+ bool opt_fullscreen = true;
+ bool opt_fsaa = false;
+ int opt_width = 1024;
++int opt_height = 0;
+ const char *help_msg =
+ "Usage: antigrav [options]\n\
+ Options:\n\
+ -h, --help\t\tprint this help, then exit\n\
+ -f, --fsaa\t\tenable full screen antialiasing\n\
+ -w, --windowed\trun in windowed mode\n\
+- -r, --resolution=RES\tset resolution to RES, 1024 for 1024x768, 800 for 800x600, etc\n";
++ -r, --resolution=RES\tset resolution to RES, 1024 for 1024x768, 800 for 800x600, etc\n\
++ -H, --height=HEIGHT\tsets screen height for cases when a 4/3 aspect ratio isn't desirable\n";
++
+
+ int parse_args(int argc, char *argv[])
+ {
+@@ -44,10 +47,11 @@
+ {"fsaa", no_argument, 0, 'f'},
+ {"windowed", no_argument, 0, 'w'},
+ {"resolution", required_argument, 0, 'r'},
++ {"height", required_argument, 0, 'H'},
+ {0, 0, 0, 0}
+ };
+
+- int c = getopt_long(argc, argv, "hfwr:", long_options, &option_index);
++ int c = getopt_long(argc, argv, "hfwr:H:", long_options, &option_index);
+ if(c == -1)
+ break;
+
+@@ -66,6 +70,9 @@
+ case 'r':
+ opt_width = atoi(optarg);
+ break;
++ case 'H':
++ opt_height = atoi(optarg);
++ break;
+ default:
+ puts(help_msg);
+ return 1;
+@@ -113,7 +120,11 @@
+ if(opt_fullscreen) flags |= SDL_FULLSCREEN;
+
+ int width = opt_width;
+- int height = width * 3 / 4;
++ int height;
++ if(opt_height)
++ height = opt_height;
++ else
++ height = width * 3 / 4;
+
+ screen = SDL_SetVideoMode(width, height, 0, flags);
+ if(screen == NULL)
Modified: packages/trunk/antigrav/debian/patches/series
===================================================================
--- packages/trunk/antigrav/debian/patches/series 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/patches/series 2011-01-26 21:39:00 UTC (rev 11706)
@@ -1,2 +1,4 @@
+04-height-selection.diff
01_fix_png_load.diff
02_fix_sound.diff
+03_daca_fixes.diff
Modified: packages/trunk/antigrav/debian/rules
===================================================================
--- packages/trunk/antigrav/debian/rules 2011-01-26 10:53:11 UTC (rev 11705)
+++ packages/trunk/antigrav/debian/rules 2011-01-26 21:39:00 UTC (rev 11706)
@@ -1,79 +1,9 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-include /usr/share/quilt/quilt.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-config.status: patch configure
- dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/antigravitaattori
- cp debian/antigravitaattori.desktop debian/antigravitaattori/usr/share/applications/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installmenu
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ override_dh_auto_configure:
+ ./configure --prefix=/usr \
+ --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
Added: packages/trunk/antigrav/debian/source/format
===================================================================
--- packages/trunk/antigrav/debian/source/format (rev 0)
+++ packages/trunk/antigrav/debian/source/format 2011-01-26 21:39:00 UTC (rev 11706)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-games-commits
mailing list