This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository airstrike.
commit 829b714f43932e2a5885a53cf674ac0d00f728e8 Author: Arthur Loiret <[email protected]> Date: Thu Oct 11 15:06:41 2007 +0000 Branch airstrike. --- debian/airstrike-common.install | 1 + debian/airstrike.desktop | 11 + debian/airstrike.install | 2 + debian/airstrike.xpm | 245 +++++++++++++++++++++ debian/changelog | 78 +++++++ debian/compat | 1 + debian/control | 35 +++ debian/copyright | 31 +++ debian/dirs | 4 + debian/docs | 5 + debian/menu | 2 + debian/patches/fix-buffer-overflow.diff | 11 + .../patches/fix-red-baron-has-unlimited-bombs.diff | 15 ++ debian/patches/fix-segfault-on-close.diff | 11 + debian/patches/fix-unusable-on-amd64.diff | 30 +++ debian/patches/series | 4 + debian/rules | 90 ++++++++ 17 files changed, 576 insertions(+) diff --git a/debian/airstrike-common.install b/debian/airstrike-common.install new file mode 100644 index 0000000..b519087 --- /dev/null +++ b/debian/airstrike-common.install @@ -0,0 +1 @@ +usr/share/games/airstrike diff --git a/debian/airstrike.desktop b/debian/airstrike.desktop new file mode 100644 index 0000000..89eb380 --- /dev/null +++ b/debian/airstrike.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Airstrike +Comment=Dogfight an enemy plane +Comment[de_DE]=Kämpfe gegen ein feindliches Flugzeug +Exec=/usr/games/airstrike +Icon=airstrike.xpm +StartupNotify=false +Terminal=false +Type=Application +Categories=Game;ArcadeGame; diff --git a/debian/airstrike.install b/debian/airstrike.install new file mode 100644 index 0000000..4e35382 --- /dev/null +++ b/debian/airstrike.install @@ -0,0 +1,2 @@ +usr/games +etc diff --git a/debian/airstrike.xpm b/debian/airstrike.xpm new file mode 100644 index 0000000..8f64785 --- /dev/null +++ b/debian/airstrike.xpm @@ -0,0 +1,245 @@ +/* XPM */ +static char * airstrike_xpm[] = { +"48 48 194 2", +" c None", +". c #000000", +"+ c #8D0000", +"@ c #9D0000", +"# c #3C0000", +"$ c #2D312F", +"% c #2E322F", +"& c #9E0000", +"* c #B50000", +"= c #680000", +"- c #1B0000", +"; c #260000", +"> c #884C4A", +", c #9CB2AD", +"' c #9BB2AD", +") c #93AAA7", +"! c #7F9592", +"~ c #2C312F", +"{ c #830000", +"] c #B30000", +"^ c #790000", +"/ c #2C0000", +"( c #0F0000", +"_ c #630000", +": c #BD0000", +"< c #C2C0B8", +"[ c #D0DFD6", +"} c #99B1AD", +"| c #87A09F", +"1 c #748E90", +"2 c #222522", +"3 c #770000", +"4 c #340000", +"5 c #140000", +"6 c #030000", +"7 c #B70000", +"8 c #C90000", +"9 c #D46B68", +"0 c #CFDED7", +"a c #93ACAA", +"b c #89A2A2", +"c c #718D90", +"d c #515F5E", +"e c #580000", +"f c #270000", +"g c #100000", +"h c #3E0000", +"i c #8B0000", +"j c #AB0000", +"k c #B90000", +"l c #BA0000", +"m c #9A9E9B", +"n c #94A9A7", +"o c #8AA09E", +"p c #718B8F", +"q c #525F5E", +"r c #111515", +"s c #110000", +"t c #5E0000", +"u c #860000", +"v c #900000", +"w c #A60000", +"x c #9E423E", +"y c #7C8877", +"z c #6A7769", +"A c #56655B", +"B c #3E413C", +"C c #180000", +"D c #1A0000", +"E c #200000", +"F c #1F0000", +"G c #330000", +"H c #3D0000", +"I c #480000", +"J c #810000", +"K c #980000", +"L c #8A0000", +"M c #7F0000", +"N c #5A553D", +"O c #536748", +"P c #46563E", +"Q c #394433", +"R c #280000", +"S c #2E0000", +"T c #300000", +"U c #310000", +"V c #3B0000", +"W c #740000", +"X c #350000", +"Y c #4E0000", +"Z c #6B0000", +"` c #600000", +" . c #4E150F", +".. c #4B6742", +"+. c #44603C", +"@. c #30402A", +"#. c #710000", +"$. c #440000", +"%. c #320000", +"&. c #1D0000", +"*. c #620000", +"=. c #A20000", +"-. c #490000", +";. c #4A0000", +">. c #4D0000", +",. c #470000", +"'. c #430000", +"). c #404C2E", +"!. c #395233", +"~. c #AC0000", +"{. c #780000", +"]. c #610000", +"^. c #4C0000", +"/. c #460000", +"(. c #930000", +"_. c #9F0000", +":. c #540000", +"<. c #420000", +"[. c #3A0000", +"}. c #1D110A", +"|. c #6F0000", +"1. c #BB0000", +"2. c #C40000", +"3. c #9C0000", +"4. c #7A0000", +"5. c #520000", +"6. c #530000", +"7. c #7D0000", +"8. c #500000", +"9. c #2D0000", +"0. c #410000", +"a. c #380000", +"b. c #150000", +"c. c #BC0000", +"d. c #B80000", +"e. c #950000", +"f. c #C50000", +"g. c #AA0000", +"h. c #920000", +"i. c #750000", +"j. c #650000", +"k. c #250000", +"l. c #3F0000", +"m. c #A70000", +"n. c #A90000", +"o. c #AE0000", +"p. c #D00000", +"q. c #D10000", +"r. c #D70000", +"s. c #CB0000", +"t. c #B60000", +"u. c #AF0000", +"v. c #6A0000", +"w. c #570000", +"x. c #990000", +"y. c #9B0000", +"z. c #A00000", +"A. c #CA0000", +"B. c #CD0000", +"C. c #C00000", +"D. c #A50000", +"E. c #A10000", +"F. c #970000", +"G. c #840000", +"H. c #690000", +"I. c #400000", +"J. c #360000", +"K. c #C10000", +"L. c #8C0000", +"M. c #7E0000", +"N. c #730000", +"O. c #670000", +"P. c #590000", +"Q. c #510000", +"R. c #390000", +"S. c #640000", +"T. c #960000", +"U. c #940000", +"V. c #A80000", +"W. c #660000", +"X. c #5F0000", +"Y. c #4F0000", +"Z. c #450000", +"`. c #2A0000", +" + c #910000", +".+ c #5B0000", +"++ c #880000", +"@+ c #550000", +"#+ c #5D0000", +"$+ c #370000", +"%+ c #160000", +"&+ c #290000", +"*+ c #240000", +"=+ c #2F0000", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" . ", +" + @ # $ % . ", +" & * = - ; > , ' ) ! ~ . ", +" { ] ^ / ( _ : : < [ } | 1 2 ", +" @ 3 4 5 6 . . + 7 8 9 0 a b c d . ", +" e f g . . . h i j k l m n o p q r ", +" . . . . s t u v & w x y z A B . ", +" C D E F G H I J K = L M N O P Q ", +" R S T . G U V W l i X Y Z ` ...+.@. ", +" J #.$.V %.X &.*.] =.-./ I ;.>.,.'.).!. ", +" + : ~.{.].^.h /.(._.:./ <././.<.<.[.S }. ", +" |._._. t 1.2.2.] 3.4.5.6.7.8.9.<.0.$.0.h a.S b. ", +" 7.c.k d.1.e. (.l c.f.c.g.h.i.j.k.G '.0.l.0.H a.k.6 ", +" g.m.m.n.o.: p.q.r.s.l k t.u.w (.^ v.w.;./.'.'.H 4 E . ", +" x.y.3.z.g.f.A.B.s.C.n.D.E.F.v G.H.].5.;.0.I.J.k. . . . ", +" L K y.x.j ] t.D.K.* e.L.u M.N.O.P.Q.I I.R.R . . . ", +" S.T.U.e.m.V.w.P.D.w G.Z W.X.6.Y.^.Z.a.`. . . . ", +" i +& _ 4 /..+++i 3 6.Y.^.-.'.V T b. ", +" H.@+X V <.,.#+= #.S.8.'.H $+`.%+ ", +" &+Z./.Z.l.;.w.#+@+^.$+D ", +" *+$.,.0.h Z./.=+ ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b5c3fd5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,78 @@ +airstrike (0.99+1.0pre6a-3.2) unstable; urgency=low + + * debian/control: Add XS-Vcs-Svn and XS-Vcs-Browser. + * debian/copyright: pention the current maintainer is the Debian Game team. + + -- Arthur Loiret <[email protected]> Thu, 11 Oct 2007 17:02:25 +0200 + +airstrike (0.99+1.0pre6a-3.1) unstable; urgency=low + + * NMU with current maintainer's authorization. + * Set Maintainer to the Debian Games Team. + * Add a .desktop and an icon. (Closes: #359279, #432842) + - debian/dirs: Update. + - debian/rules: Install .desktop and icon. + * debian/rules: generate airstrike-common in binary-arch target. + (Closes: #304116) + * debian/control: + - Add quilt (>= 0.40) to Build-Depends. + - Update debhelper version. + - Update Standards-Version. + - Add Homepage. + * debian/patches/series: Add. + - fix-red-baron-has-unlimited-bombs.diff: Add. (Closes: #340167) + - fix-buffer-overflow.diff: Add. (Closes: #290423) + - fix-unusable-on-amd64.diff: Add. (Closes: #406879) + - fix-segfault-on-close.diff: Add. (Closes: #418192) + * debian/rules: + - Remove deprecated DH_COMPAT. + - Update CFLAGS. + - Remove unused configure target. + - Fix debian-rules-ignore-make-clean-errors. + - Remove useless comments. + - Don't install menu file anymore since there is a .desktop now. + * debian/copyright: + - Add missing copyright. + - Update FSF address. + * debian/compat: Add. + + -- Arthur Loiret <[email protected]> Tue, 09 Oct 2007 12:40:20 +0200 + +airstrike (0.99+1.0pre6a-3) unstable; urgency=low + + * Added "Replaces: airstrike (<< 0.99+1.0pre6a-2)" to + airstrike-common to get rid of problems at upgrading to the + splitted version (closes: #278110). + * Upload sponsored by Norbert Tretkowski <[email protected]>. + + -- Sven Velt <[email protected]> Sat, 30 Oct 2004 17:23:12 +0200 + +airstrike (0.99+1.0pre6a-2) unstable; urgency=low + + * "Release Notes" and "About the game" fixed (closes: #231820). + * Fixed manpage so whatis parse problem is gone + (closes: #238021). + * Moved arch independent data in separate airstrike-common package + (closes: #233323). + * Upload sponsored by Norbert Tretkowski <[email protected]>. + + -- Sven Velt <[email protected]> Tue, 28 Sep 2004 13:24:29 +0200 + +airstrike (0.99+1.0pre6a-1) unstable; urgency=low + + * New upstream (closes: #22807) should be completly licensed + under the GPL (closes: #228085) and includes a man page + (closes: #225658) + * Useless files are removed from the package (closes: 225660) + * Sound files removed due to unknown source and license. + * Upload sponsored by Norbert Tretkowski <[email protected]>. + + -- Sven Velt <[email protected]> Wed, 03 Feb 2004 00:25:29 +0100 + +airstrike (0.99+1.0pre4-1) unstable; urgency=low + + * Initial Release (closes: #179453). + * Upload sponsored by Norbert Tretkowski <[email protected]>. + + -- Sven Velt <[email protected]> Fri, 30 Oct 2003 11:31:09 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..527b20e --- /dev/null +++ b/debian/control @@ -0,0 +1,35 @@ +Source: airstrike +Section: games +Priority: optional +Maintainer: Debian Games Team <[email protected]> +Uploaders: Sven Velt <[email protected]> +Build-Depends: debhelper (>= 5), quilt (>= 0.40), libsdl-image1.2-dev, libsdl-mixer1.2-dev +Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/airstrike/ +XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/airstrike/?op=log +Homepage: http://icculus.org/airstrike/ + +Package: airstrike +Architecture: any +Depends: airstrike-common, ${shlibs:Depends} +Description: 2d dogfight game in the tradition of 'Biplanes' and 'BIP' + Airstrike is a 2d dogfight game in the tradition of the Intellivision and + Amiga games 'Biplanes' and 'BIP'. It features a robust physics engine and + several other extensions of the original games. It is currently 0-2 player + only, but will hopefully have network play and some more advanced computer + controlled enemies in the future. The graphics have been created using the + Povray raytracer, and should be easy to extend and modify. + +Package: airstrike-common +Architecture: all +Depends: ${shlibs:Depends} +Replaces: airstrike (<< 0.99+1.0pre6a-2) +Description: 2d dogfight game in the tradition of 'Biplanes' and 'BIP' + Airstrike is a 2d dogfight game in the tradition of the Intellivision and + Amiga games 'Biplanes' and 'BIP'. It features a robust physics engine and + several other extensions of the original games. It is currently 0-2 player + only, but will hopefully have network play and some more advanced computer + controlled enemies in the future. The graphics have been created using the + Povray raytracer, and should be easy to extend and modify. + . + This package contains the architecture-independent data files. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ee70c00 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Sven Velt <[email protected]> on +09, 08 Oct 2003 09:12:39 +0200. + +Today, the current maintainer is the Debian Games Team. + +It was downloaded from http://icculus.org/airstrike/ + +Upstream Authors: Ulf Ektr�m, Peter Eismann, Eero Tamminen, Alessandro Giusti + Development-Mailinglist: [email protected] + +Copyright (C) 2002 Ulf Ekstr�m + +License: + + This package 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; version 2 dated June, 1991. + + 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..1aa48f8 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,4 @@ +usr/games +usr/share/games/airstrike +usr/share/applications +usr/share/pixmaps diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..d18d21e --- /dev/null +++ b/debian/docs @@ -0,0 +1,5 @@ +README +doc/1.0-features +doc/BUGS +doc/TODO +doc/WHISHLIST diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..d13be9b --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(airstrike):needs=X11 section=Games/Arcade\ + title="Airstrike" command="/usr/games/airstrike" diff --git a/debian/patches/fix-buffer-overflow.diff b/debian/patches/fix-buffer-overflow.diff new file mode 100644 index 0000000..1f43a4d --- /dev/null +++ b/debian/patches/fix-buffer-overflow.diff @@ -0,0 +1,11 @@ +--- airstrike-0.99+1.0pre6a/src/config.c 2003-01-18 20:48:05.000000000 +0100 ++++ airstrike-0.99+1.0pre6a/src/config.c 2005-01-14 01:42:55.000000000 +0100 +@@ -21,7 +21,7 @@ int config_setup() + } + if (getenv("HOME")) + { +- sprintf(cbuf,"%s/%s",getenv("HOME"),USER_CONFIG_FILE); ++ snprintf(cbuf,sizeof(cbuf),"%s/%s",getenv("HOME"),USER_CONFIG_FILE); + cfile = fopen(cbuf,"r"); + if (cfile) + { diff --git a/debian/patches/fix-red-baron-has-unlimited-bombs.diff b/debian/patches/fix-red-baron-has-unlimited-bombs.diff new file mode 100644 index 0000000..d475651 --- /dev/null +++ b/debian/patches/fix-red-baron-has-unlimited-bombs.diff @@ -0,0 +1,15 @@ +--- airstrike-0.99+1.0pre6a/src/sprite_types/biplane.c 2003-01-18 20:48:05.000000000 +0100 ++++ airstrike-0.99+1.0pre6a/src/sprite_types/biplane.c 2007-10-10 01:26:25.000000000 +0200 +@@ -198,9 +198,10 @@ + } + break; + case SIGNAL_NUM0: /* create bomb */ +- if (sprite_timer_finished(((struct biplane*)s)->bomb_timer) && +- (!(s->state & BIPLANE_CRASHING))) ++ if (sprite_timer_finished(((struct biplane*)s)->bomb_timer) && ++ (!(s->state & BIPLANE_CRASHING)) && (((struct biplane*)s)->nr_bombs > 0)) + { ++ ((struct biplane*)s)->nr_bombs--; + p = sprite_create(&bomb); + p->anim_p = s->anim_p; + ((mech_sprite_t *)p)->angle = ((mech_sprite_t *)s)->angle; diff --git a/debian/patches/fix-segfault-on-close.diff b/debian/patches/fix-segfault-on-close.diff new file mode 100644 index 0000000..abbe917 --- /dev/null +++ b/debian/patches/fix-segfault-on-close.diff @@ -0,0 +1,11 @@ +--- airstrike-0.99+1.0pre6a/src/sprite/refcount.h 2003-01-18 11:48:05.000000000 -0800 ++++ airstrike-0.99+1.0pre6a/src/sprite/refcount.h 2007-04-09 08:31:32.000000000 -0700 +@@ -9,7 +9,7 @@ + + /* freefn will be called with x as argument if the refcount goes below 1 */ + #define DEREF(x,freefn) (x)->refcount -= 2; \ +-if ((x)->refcount <= 1) {(freefn)(x);} ++if ((x)->refcount == 1) {(freefn)(x);} + + /* Marks the referenced obj as dead */ + #define REFKILL(x) ((x)->refcount |= 1) diff --git a/debian/patches/fix-unusable-on-amd64.diff b/debian/patches/fix-unusable-on-amd64.diff new file mode 100644 index 0000000..a80bd79 --- /dev/null +++ b/debian/patches/fix-unusable-on-amd64.diff @@ -0,0 +1,30 @@ +--- airstrike-0.99+1.0pre6a/src/mech.c 2003-01-18 16:48:05.000000000 -0300 ++++ airstrike-0.99+1.0pre6a/src/mech.c 2007-01-14 16:04:06.000000000 -0300 +@@ -335,11 +335,10 @@ + n[2]*((mech_sprite_t *)s1)->ang_vel + + n[3]*((mech_sprite_t *)s2)->ang_vel; + +- if (a > 0) +- { +- b = n[0]*delta[0] + n[1]*delta[1] + n[2]*delta[2] ++ b = n[0]*delta[0] + n[1]*delta[1] + n[2]*delta[2] + - n[0]*delta[3] - n[1]*delta[4] + n[3]*delta[5]; +- ++ if ( (a > 0) && (abs(b) > 0) ) ++ { + c = -1.4*a/b; + + s1->vel[0] += c*delta[0]; +@@ -479,10 +478,9 @@ + a = n[0]*s1->vel[0] + n[1]*s1->vel[1] + + n[2]*((mech_sprite_t *)s1)->ang_vel; + +- if (a > 0) ++ b = n[0]*delta[0] + n[1]*delta[1] + n[2]*delta[2]; ++ if ( (a > 0) && (abs(b) > 0) ) + { +- b = n[0]*delta[0] + n[1]*delta[1] + n[2]*delta[2]; +- + c = -1.2*a/b; + + s1->vel[0] += c*delta[0]; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7de6503 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +fix-buffer-overflow.diff +fix-red-baron-has-unlimited-bombs.diff +fix-segfault-on-close.diff +fix-unusable-on-amd64.diff diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..347f1fa --- /dev/null +++ b/debian/rules @@ -0,0 +1,90 @@ +#!/usr/bin/make -f +# 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 + +include /usr/share/quilt/quilt.make + +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-stamp +build-stamp: patch + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + # install desktop file + cp debian/airstrike.desktop debian/airstrike/usr/share/applications/ + # and icon + cp debian/airstrike.xpm debian/airstrike/usr/share/pixmaps/ + + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs -i +# dh_installmenu -i + dh_installchangelogs -i ChangeLog + dh_install -i --sourcedir=debian/tmp + dh_link -i + dh_strip -i + dh_fixperms -i + dh_compress -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -a +# dh_installmenu -a + dh_installman -a doc/airstrike.6 + dh_installchangelogs -a ChangeLog + dh_install -a --sourcedir=debian/tmp + dh_link -a + dh_strip -a + dh_fixperms -a + dh_compress -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/airstrike.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
