[airstrike] 19/33: Release 0.99+1.0pre6a-6
Markus Koschany
apo at moszumanska.debian.org
Wed Apr 13 09:34:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository airstrike.
commit 58f2c6bf267c28e364c19fb65544eeeeba4e9565
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Mar 30 22:23:22 2014 +0000
Release 0.99+1.0pre6a-6
---
debian/airstrike-common.install | 4 +-
debian/airstrike.desktop | 3 +-
debian/airstrike.install | 9 +-
debian/airstrike.xpm | 245 --------------------
debian/changelog | 34 ++-
debian/compat | 2 +-
debian/control | 23 +-
debian/copyright | 55 ++---
debian/dirs | 4 -
debian/icons/airstrike.png | Bin 0 -> 4575 bytes
debian/icons/airstrike.xpm | 253 +++++++++++++++++++++
debian/manpages | 1 +
debian/menu | 8 +-
...> Add-lm-to-fix-FTBFS-with-binutils-gold.patch} | 15 +-
debian/patches/airstrikerc.diff | 11 -
debian/patches/airstrikerc.patch | 21 ++
debian/patches/fix-buffer-overflow.diff | 11 -
debian/patches/fix-buffer-overflow.patch | 21 ++
.../patches/fix-red-baron-has-unlimited-bombs.diff | 15 --
.../fix-red-baron-has-unlimited-bombs.patch | 25 ++
debian/patches/fix-segfault-on-close.diff | 11 -
debian/patches/fix-segfault-on-close.patch | 21 ++
debian/patches/fix-spawn-level.diff | 14 --
debian/patches/fix-spawn-level.patch | 23 ++
...e-on-amd64.diff => fix-unusable-on-amd64.patch} | 18 +-
debian/patches/{fix_paths.diff => fix_paths.patch} | 66 ++++--
debian/patches/hardening.patch | 30 +++
debian/patches/manpage.diff | 12 -
debian/patches/manpage.patch | 22 ++
debian/patches/series | 19 +-
debian/rules | 85 +------
debian/source/include-binaries | 1 +
32 files changed, 581 insertions(+), 501 deletions(-)
diff --git a/debian/airstrike-common.install b/debian/airstrike-common.install
index a5f972e..6e1e56f 100644
--- a/debian/airstrike-common.install
+++ b/debian/airstrike-common.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/games/airstrike/* usr/share/games/airstrike/
-
+debian/icons/airstrike.png usr/share/icons/hicolor/64x64/apps
+usr/share/games/airstrike
diff --git a/debian/airstrike.desktop b/debian/airstrike.desktop
index ae6bd52..b51a946 100644
--- a/debian/airstrike.desktop
+++ b/debian/airstrike.desktop
@@ -7,4 +7,5 @@ Icon=airstrike
StartupNotify=false
Terminal=false
Type=Application
-Categories=Game;ArcadeGame;
+Categories=Game;ActionGame;
+Keywords=dogfight;plane;zeppelin;air;combat;
diff --git a/debian/airstrike.install b/debian/airstrike.install
index 9b83f73..ca02b0c 100644
--- a/debian/airstrike.install
+++ b/debian/airstrike.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/games/* usr/games/
-debian/tmp/etc/* etc/
-debian/airstrike.desktop usr/share/applications/
-debian/airstrike.xpm usr/share/pixmaps/
-
+debian/airstrike.desktop usr/share/applications
+debian/icons/airstrike.xpm usr/share/pixmaps
+etc
+usr/games
diff --git a/debian/airstrike.xpm b/debian/airstrike.xpm
deleted file mode 100644
index 8f64785..0000000
--- a/debian/airstrike.xpm
+++ /dev/null
@@ -1,245 +0,0 @@
-/* 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 ` ...+. at . ",
-" 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. at +X V <.,.#+= #.S.8.'.H $+`.%+ ",
-" &+Z./.Z.l.;.w.#+ at +^.$+D ",
-" *+$.,.0.h Z./.=+ ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/debian/changelog b/debian/changelog
index 6581a16..129d4b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,32 @@
-airstrike (0.99+1.0pre6a-6) UNRELEASED; urgency=low
-
- * Correct Vcs-* URLs to point to anonscm.debian.org
-
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:02 +0200
+airstrike (0.99+1.0pre6a-6) unstable; urgency=low
+
+ [ Evgeni Golov ]
+ * Correct Vcs-* URLs to point to anonscm.debian.org.
+
+ [ Markus Koschany ]
+ * Remove Sven Velt from Uploaders. He is apparently not active anymore.
+ (Closes: #739091)
+ * Add myself to Uploaders.
+ * airstrike.desktop: Add keywords. Change category key to ActionGame.
+ * Update menu file. Add longtitle and icon entry.
+ * Add new airstrike.png and airstrike.xpm icons. (Closes: #726201)
+ * Use compat level 9 and require debhelper >= 9.
+ * wrap-and-sort -sa.
+ * Remove Replaces field from airstrike-common. It is no longer necessary.
+ * Use a different short description for airstrike-common.
+ * Drop libsdl-mixer1.2-dev from Build-Depends. We do not ship the sounds
+ anyway.
+ * Declare compliance with Debian policy 3.9.5.
+ * Install man page with manpages file.
+ * Simplify debian/rules by using dh sequencer.
+ * Drop dirs file. Not needed.
+ * Add DEP3 headers to all patches. Rename .diff extensions to .patch.
+ * Rename fix-link-flags.diff to Add-lm-to-fix-FTBFS-with-binutils-gold.patch.
+ * Add hardening.patch to pass all hardening build flags to airstrike's
+ Makefile.
+ * Update debian/copyright to copyright format 1.0.
+
+ -- Markus Koschany <apo at gambaru.de> Sun, 30 Mar 2014 20:43:32 +0200
airstrike (0.99+1.0pre6a-5) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 430e481..0213759 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,34 @@ Source: airstrike
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sven Velt <sven at velt.de>, Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5), libsdl-image1.2-dev, libsdl-mixer1.2-dev
-Standards-Version: 3.9.1
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>,
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ debhelper (>= 9),
+ libsdl-image1.2-dev
+Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/airstrike/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/airstrike/
Homepage: http://icculus.org/airstrike/
Package: airstrike
Architecture: any
-Depends: airstrike-common, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ airstrike-common,
+ ${misc:Depends},
+ ${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. Playable by
+ several other extensions of the original games. Playable by
1 or 2 persons.
Package: airstrike-common
Architecture: all
-Depends: ${misc:Depends}
-Replaces: airstrike (<< 0.99+1.0pre6a-2)
-Description: 2d dogfight game in the tradition of 'Biplanes' and 'BIP'
+Depends:
+ ${misc:Depends}
+Description: 2d dogfight game - data files
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
diff --git a/debian/copyright b/debian/copyright
index a23767d..c3da630 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,24 @@
-This package was debianized by Sven Velt <sven at velt.de> 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: airstrike at icculus.org
-
-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 systems, the complete text of version 2 of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Airstrike
+Upstream-Contact: airstrike at icculus.org
+Source: http://icculus.org/airstrike/
+
+Files: *
+Copyright: 2002, Ulf Ektröm
+ Peter Eismann
+ Eero Tamminen
+ Alessandro Giusti
+License: GPL-2
+
+Files: debian/*
+Copyright: 2002-2004, Sven Velt
+ 2007, Arthur Loiret <arthur.loiret at gmail.com>
+ 2008, Barry deFreese <bdefreese at debian.org>
+ 2011, Ansgar Burchardt <ansgar at debian.org>
+ 2011, Paul Wise <pabs at debian.org>
+ 2014, Markus Koschany <apo at gambaru,de>
+License: GPL-2
+
+License: GPL-2
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 1aa48f8..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/games
-usr/share/games/airstrike
-usr/share/applications
-usr/share/pixmaps
diff --git a/debian/icons/airstrike.png b/debian/icons/airstrike.png
new file mode 100644
index 0000000..47e8685
Binary files /dev/null and b/debian/icons/airstrike.png differ
diff --git a/debian/icons/airstrike.xpm b/debian/icons/airstrike.xpm
new file mode 100644
index 0000000..5431486
--- /dev/null
+++ b/debian/icons/airstrike.xpm
@@ -0,0 +1,253 @@
+/* XPM */
+static char *airballoon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 215 2 ",
+" c #1E150D",
+". c #250707",
+"X c #2D0504",
+"o c #250708",
+"O c #240A09",
+"+ c #2C0B0A",
+"@ c #320302",
+"# c #3C0101",
+"$ c #330B0B",
+"% c #3F0B0B",
+"& c #21180E",
+"* c #251313",
+"= c #2E1414",
+"- c #231910",
+"; c #2C1C12",
+": c #231C1C",
+"> c #2B1C1C",
+", c #391615",
+"< c #3C1919",
+"1 c #2F2015",
+"2 c #312314",
+"3 c #35261C",
+"4 c #3B211C",
+"5 c #3C2A1A",
+"6 c #242222",
+"7 c #2D2826",
+"8 c #2D2B2A",
+"9 c #352222",
+"0 c #3D2727",
+"q c #353232",
+"w c #3C3534",
+"e c #3B3936",
+"r c #3F3E3E",
+"t c #430101",
+"y c #4C0101",
+"u c #440C0C",
+"i c #4F0908",
+"p c #540202",
+"a c #5B0101",
+"s c #5C0807",
+"d c #48130E",
+"f c #401A12",
+"g c #461B1B",
+"h c #481918",
+"j c #551514",
+"k c #650101",
+"l c #6B0101",
+"z c #630B0B",
+"x c #6F0C0B",
+"c c #740202",
+"v c #7B0000",
+"b c #7E0D0D",
+"n c #641C1A",
+"m c #402B1F",
+"M c #4B341D",
+"N c #442E22",
+"B c #463022",
+"V c #4B3522",
+"C c #4E3922",
+"Z c #46322F",
+"A c #4F302F",
+"S c #523627",
+"D c #533D23",
+"F c #453D3B",
+"G c #6F2B28",
+"H c #772B28",
+"J c #633B37",
+"K c #6D3F3D",
+"L c #753B37",
+"P c #7B3F3C",
+"I c #5C4326",
+"U c #614729",
+"Y c #674929",
+"T c #6A4C2B",
+"R c #6E502D",
+"E c #73522E",
+"W c #63403F",
+"Q c #69403F",
+"! c #735431",
+"~ c #434444",
+"^ c #4C4543",
+"/ c #4C4D4C",
+"( c #544645",
+") c #5A4342",
+"_ c #554C47",
+"` c #574C49",
+"' c #515151",
+"] c #5A5B5A",
+"[ c #6D4B47",
+"{ c #614F4C",
+"} c #7B4442",
+"| c #7B554E",
+" . c #615B54",
+".. c #6A5A56",
+"X. c #61605E",
+"o. c #656462",
+"O. c #676867",
+"+. c #696865",
+"@. c #6D6D6B",
+"#. c #796A64",
+"$. c #777470",
+"%. c #787572",
+"&. c #797876",
+"*. c #7F7E7B",
+"=. c #840303",
+"-. c #8D0202",
+";. c #940000",
+":. c #9D0101",
+">. c #950A09",
+",. c #9C0F0E",
+"<. c #9F110F",
+"1. c #891514",
+"2. c #951615",
+"3. c #A60000",
+"4. c #AB0000",
+"5. c #A40D0C",
+"6. c #AB0908",
+"7. c #B40101",
+"8. c #BC0101",
+"9. c #BC0C0B",
+"0. c #B41412",
+"q. c #BA1514",
+"w. c #88211E",
+"e. c #91221F",
+"r. c #8C2A27",
+"t. c #9E2724",
+"y. c #912926",
+"u. c #863F3D",
+"i. c #9D3732",
+"p. c #9D3934",
+"a. c #913D3A",
+"s. c #993F3D",
+"d. c #AA2A26",
+"f. c #B52F2B",
+"g. c #A63530",
+"h. c #A93530",
+"j. c #AD3B36",
+"k. c #A53C3A",
+"l. c #AF3F3A",
+"z. c #BF3531",
+"x. c #C40000",
+"c. c #CC0000",
+"v. c #CE0B0B",
+"b. c #D40000",
+"n. c #CE1514",
+"m. c #CB3531",
+"M. c #97423C",
+"N. c #9D423F",
+"B. c #825E34",
+"V. c #B0413E",
+"C. c #8A6033",
+"Z. c #8A4442",
+"A. c #8F554E",
+"S. c #AB534F",
+"D. c #B4534C",
+"F. c #BA524E",
+"G. c #A25751",
+"H. c #BC5952",
+"J. c #B5605A",
+"K. c #816F66",
+"L. c #8C6F67",
+"P. c #9A6D65",
+"I. c #85736C",
+"U. c #8F756D",
+"Y. c #BB6862",
+"T. c #A7796E",
+"R. c #A67E73",
+"E. c #B17F74",
+"W. c #C45952",
+"Q. c #C25E59",
+"!. c #C86761",
+"~. c #C47D76",
+"^. c #CD7D75",
+"/. c #85807B",
+"(. c #8D837B",
+"). c #B48277",
+"_. c #B88277",
+"`. c #B78378",
+"'. c #8A8681",
+"]. c #8C8983",
+"[. c #8F8D89",
+"{. c #918C84",
+"}. c #9A948E",
+"|. c #9D9791",
+" X c #AF8B81",
+".X c #BA8D81",
+"XX c #A4998D",
+"oX c #A39B94",
+"OX c #A69F98",
+"+X c #A89F98",
+"@X c #ADA49C",
+"#X c #B0A397",
+"$X c #B0A69B",
+"%X c #B4AA9E",
+"&X c #B6ACA3",
+"*X c #BAAFA2",
+"=X c #BFB1A3",
+"-X c #BEB5AC",
+";X c #C99289",
+":X c #D09389",
+">X c #CCA89C",
+",X c #D1AA9E",
+"<X c #C4B7A7",
+"1X c #C9B3A5",
+"2X c #C0B6AC",
+"3X c #CFB7A9",
+"4X c #C3B9AD",
+"5X c #C8BCAD",
+"6X c #C6BDB2",
+"7X c #CBBFB3",
+"8X c #CBC1B4",
+"9X c #CBC3B8",
+"0X c #D1C4B6",
+"qX c #D3CABD",
+"wX c None",
+/* pixels */
+"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXh.h.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwXl.`._.0.0.E.T.i.wXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXd.f..X<XW.x.8.H.*XR.t.e.wXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXd.q.`.5X3Xm.c.x.m.1X%XP.<.w.wXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXp.7.D.=X0X,Xn.b.c.q.>X4XXXM.>.H wXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXA.6.q. X5XqX:Xv.b.c.9.;X8X$XL.<.=.J wXwXwXwXwXwXwX",
+"wXwXwXwXwXwXK.y.7.j.#X8XqX^.c.b.c.8.~.9X&X(.r.;.n ( wXwXwXwXwXwX",
+"wXwXwXwXwXwX| >.7.G.&X8XqX!.c.c.c.8.Y.9X*X{.P ;.l Z wXwXwXwXwXwX",
+"wXwXwXwXwXwXL :.6.P.$X6X9XQ.x.c.x.7.J.6X&X{.[ -.l 4 wXwXwXwXwXwX",
+"wXwXwXwXwX .G ;.5.U. at X2X4XF.8.x.8.4.G.-X@X{.{ =.l , 8 wXwXwXwXwX",
+"wXwXwXwXwX_ n -.2.I.OX&X&Xl.7.8.4.3.N.&X at XI.` x l $ 7 wXwXwXwXwX",
+"wXwXwXwXwXF j =.1.#.}. at X@Xk.4.4.3.-.a.OX|.&.^ z a + 6 wXwXwXwXwX",
+"wXwXwXwXwXe h c b ..(.|.oXs.:.:.;.=.u.}.'.+.F s y + 6 wXwXwXwXwX",
+"wXwXwXwXwXwX< a x ) $.'.[.Z.-.;.=.c } ].%.] w p t * wXwXwXwXwXwX",
+"wXwXwXwXwXwX> t k A X.%.*.P v v c k K &.o./ 0 y @ : wXwXwXwXwXwX",
+"wXwXwXwXwXwX: $ y g / X. at .) l l k a W +.] ~ < t X : wXwXwXwXwXwX",
+"wXwXwXwXwXwXwX* # u w ' ] ) a a a p ) ] / e % # * wXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwX: + # 9 ~ ' ( i p p i ( ' ~ 9 # + : wXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwX= @ $ q ~ ^ u y y d ^ ~ q $ X * wXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwX; + = q r < # # f e q = X * wXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXo * 8 9 X @ 3 7 * o wXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwXwX* : O o 3 * wXwXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwX; 5 S S V V B N 5 1 wXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwX 2 V C C V V V 5 - wXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwX2 M B.B.E ! R R C 2 wXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwX1 M C.B.E R Y T I 5 wXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwX5 T ! T Y Y U I wXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwX1 M U U I U I D wXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwX& 2 C D D D C C wXwXwXwXwXwXwXwXwXwXwXwX",
+"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX"
+};
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..8ad6a10
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+doc/airstrike.6
diff --git a/debian/menu b/debian/menu
index 6fc069d..aa7cf63 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,6 @@
-?package(airstrike):needs="X11" section="Games/Action"\
- title="Airstrike" command="/usr/games/airstrike"
+?package(airstrike):needs="X11" \
+ section="Games/Action" \
+ title="Airstrike" \
+ longtitle="Airstrike - 2d dogfight game in the tradition of Biplanes and BIP" \
+ command="/usr/games/airstrike" \
+ icon="/usr/share/pixmaps/airstrike.xpm"
diff --git a/debian/patches/fix-link-flags.diff b/debian/patches/Add-lm-to-fix-FTBFS-with-binutils-gold.patch
similarity index 65%
rename from debian/patches/fix-link-flags.diff
rename to debian/patches/Add-lm-to-fix-FTBFS-with-binutils-gold.patch
index 991e4c9..cd3e9e2 100644
--- a/debian/patches/fix-link-flags.diff
+++ b/debian/patches/Add-lm-to-fix-FTBFS-with-binutils-gold.patch
@@ -1,12 +1,17 @@
From: Ilya Barygin <barygin at gmail.com>
Date: Sun, 2 Jan 2011 11:44:12 +0300
Subject: Add -lm to fix FTBFS with binutils-gold
-Bug-Debian: http://bugs.debian.org/553647
-Index: airstrike-0.99+1.0pre6a/src/Makefile
+
===================================================================
---- airstrike-0.99+1.0pre6a.orig/src/Makefile 2011-01-01 09:57:25.000000000 +0000
-+++ airstrike-0.99+1.0pre6a/src/Makefile 2011-01-01 09:57:34.000000000 +0000
-@@ -5,7 +5,7 @@
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 76e1976..67ea301 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,7 +5,7 @@ CFILES:= $(shell find . -name '*.c')
OBJECTS:= $(CFILES:.c=.o)
airstrike: $(OBJECTS)
diff --git a/debian/patches/airstrikerc.diff b/debian/patches/airstrikerc.diff
deleted file mode 100644
index 46a5415..0000000
--- a/debian/patches/airstrikerc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- airstrike-0.99+1.0pre6a.orig/airstrikerc
-+++ airstrike-0.99+1.0pre6a/airstrikerc
-@@ -4,7 +4,7 @@
-
-
- # The path where the program looks for its data files
--datapath "data"
-+datapath "/usr/share/games/airstrike"
-
- #window size or fullscreen resolution
- screen.width 800
diff --git a/debian/patches/airstrikerc.patch b/debian/patches/airstrikerc.patch
new file mode 100644
index 0000000..6d2837d
--- /dev/null
+++ b/debian/patches/airstrikerc.patch
@@ -0,0 +1,21 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: airstrikerc
+
+---
+ airstrikerc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/airstrikerc b/airstrikerc
+index 11e0916..ed84883 100644
+--- a/airstrikerc
++++ b/airstrikerc
+@@ -4,7 +4,7 @@
+
+
+ # The path where the program looks for its data files
+-datapath "data"
++datapath "/usr/share/games/airstrike"
+
+ #window size or fullscreen resolution
+ screen.width 800
diff --git a/debian/patches/fix-buffer-overflow.diff b/debian/patches/fix-buffer-overflow.diff
deleted file mode 100644
index 1f43a4d..0000000
--- a/debian/patches/fix-buffer-overflow.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-buffer-overflow.patch b/debian/patches/fix-buffer-overflow.patch
new file mode 100644
index 0000000..fd23a93
--- /dev/null
+++ b/debian/patches/fix-buffer-overflow.patch
@@ -0,0 +1,21 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: fix-buffer-overflow
+
+---
+ src/config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config.c b/src/config.c
+index 6379b26..95cbd5f 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -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
deleted file mode 100644
index d475651..0000000
--- a/debian/patches/fix-red-baron-has-unlimited-bombs.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-red-baron-has-unlimited-bombs.patch b/debian/patches/fix-red-baron-has-unlimited-bombs.patch
new file mode 100644
index 0000000..dfef28b
--- /dev/null
+++ b/debian/patches/fix-red-baron-has-unlimited-bombs.patch
@@ -0,0 +1,25 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: fix-red-baron-has-unlimited-bombs
+
+---
+ src/sprite_types/biplane.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/sprite_types/biplane.c b/src/sprite_types/biplane.c
+index a71ef56..712fcc5 100644
+--- a/src/sprite_types/biplane.c
++++ b/src/sprite_types/biplane.c
+@@ -198,9 +198,10 @@ static void sigget(sprite_t *s, int signal, void *data)
+ }
+ 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
deleted file mode 100644
index abbe917..0000000
--- a/debian/patches/fix-segfault-on-close.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-segfault-on-close.patch b/debian/patches/fix-segfault-on-close.patch
new file mode 100644
index 0000000..93643f5
--- /dev/null
+++ b/debian/patches/fix-segfault-on-close.patch
@@ -0,0 +1,21 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: fix-segfault-on-close
+
+---
+ src/sprite/refcount.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sprite/refcount.h b/src/sprite/refcount.h
+index c756abf..86f3a29 100644
+--- a/src/sprite/refcount.h
++++ b/src/sprite/refcount.h
+@@ -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-spawn-level.diff b/debian/patches/fix-spawn-level.diff
deleted file mode 100644
index 371d877..0000000
--- a/debian/patches/fix-spawn-level.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN old/src/airstrike.c new/src/airstrike.c
---- old/src/airstrike.c 2007-09-13 17:57:23.000000000 +0200
-+++ new/src/airstrike.c 2007-09-13 11:11:33.000000000 +0200
-@@ -92,8 +92,8 @@
- player_sprite_type[1] = &biplane;
- player_startpos[0][0] = 700;
- player_startpos[0][1] = 500;
-- player_startpos[1][0] = 5;
-- player_startpos[1][1] = 300;
-+ player_startpos[1][0] = 100;
-+ player_startpos[1][1] = 500;
- player_points[0] = max_points;
- player_points[1] = max_points;
-
diff --git a/debian/patches/fix-spawn-level.patch b/debian/patches/fix-spawn-level.patch
new file mode 100644
index 0000000..12bf9c3
--- /dev/null
+++ b/debian/patches/fix-spawn-level.patch
@@ -0,0 +1,23 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: fix-spawn-level
+
+---
+ src/airstrike.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/airstrike.c b/src/airstrike.c
+index 163fcd7..474df40 100644
+--- a/src/airstrike.c
++++ b/src/airstrike.c
+@@ -92,8 +92,8 @@ void players_setup(void)
+ player_sprite_type[1] = &biplane;
+ player_startpos[0][0] = 700;
+ player_startpos[0][1] = 500;
+- player_startpos[1][0] = 5;
+- player_startpos[1][1] = 300;
++ player_startpos[1][0] = 100;
++ player_startpos[1][1] = 500;
+ player_points[0] = max_points;
+ player_points[1] = max_points;
+
diff --git a/debian/patches/fix-unusable-on-amd64.diff b/debian/patches/fix-unusable-on-amd64.patch
similarity index 59%
rename from debian/patches/fix-unusable-on-amd64.diff
rename to debian/patches/fix-unusable-on-amd64.patch
index a80bd79..d1fc796 100644
--- a/debian/patches/fix-unusable-on-amd64.diff
+++ b/debian/patches/fix-unusable-on-amd64.patch
@@ -1,6 +1,16 @@
---- 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 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: fix-unusable-on-amd64
+
+---
+ src/mech.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/mech.c b/src/mech.c
+index 2010088..3e6ae3c 100644
+--- a/src/mech.c
++++ b/src/mech.c
+@@ -335,11 +335,10 @@ void mech_sprite_collide(sprite_t *s1, sprite_t *s2, int x, int y)
n[2]*((mech_sprite_t *)s1)->ang_vel +
n[3]*((mech_sprite_t *)s2)->ang_vel;
@@ -15,7 +25,7 @@
c = -1.4*a/b;
s1->vel[0] += c*delta[0];
-@@ -479,10 +478,9 @@
+@@ -479,10 +478,9 @@ void mech_sprite_bg_collide(sprite_t *s1, int x, int y)
a = n[0]*s1->vel[0] + n[1]*s1->vel[1] +
n[2]*((mech_sprite_t *)s1)->ang_vel;
diff --git a/debian/patches/fix_paths.diff b/debian/patches/fix_paths.patch
similarity index 63%
rename from debian/patches/fix_paths.diff
rename to debian/patches/fix_paths.patch
index e7051cd..8dd673d 100644
--- a/debian/patches/fix_paths.diff
+++ b/debian/patches/fix_paths.patch
@@ -1,28 +1,18 @@
---- airstrike-0.99+1.0pre6a.orig/src/config.h
-+++ airstrike-0.99+1.0pre6a/src/config.h
-@@ -6,7 +6,7 @@
- /* absolute path to main config file (for now it's airstrikerc in the
- current dir)*/
- #ifndef ROOT_CONFIG_FILE
--#define ROOT_CONFIG_FILE "airstrikerc"
-+#define ROOT_CONFIG_FILE "/etc/airstrikerc"
- #endif
- /* path to file in users $HOME */
- #ifndef USER_CONFIG_FILE
---- airstrike-0.99+1.0pre6a.orig/src/airstrike.c
-+++ airstrike-0.99+1.0pre6a/src/airstrike.c
-@@ -74,7 +74,7 @@
- console_set_pos(9,254);
- console_load_bg(path_to_data("console-bg.png"));
- sprite_types_setup();
-- sprite_background_load("data/bg.png","data/bgmask.png");
-+ sprite_background_load("/usr/share/games/airstrike/bg.png","/usr/share/games/airstrike/bgmask.png");
-
- level_setup();
- winds_setup();
---- airstrike-0.99+1.0pre6a.orig/Makefile
-+++ airstrike-0.99+1.0pre6a/Makefile
-@@ -29,3 +29,15 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: fix_paths
+
+---
+ Makefile | 12 ++++++++++++
+ src/airstrike.c | 2 +-
+ src/config.h | 2 +-
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 074e456..32e6269 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,3 +29,15 @@ package: clean
# packages new files listed in new-files.txt
new:
tar -zcvf new.tgz -T new-files.txt
@@ -38,3 +28,29 @@
+ install -d $(DESTDIR)/etc
+ install -m 644 airstrikerc $(DESTDIR)/etc/airstrikerc
+
+diff --git a/src/airstrike.c b/src/airstrike.c
+index d66d632..163fcd7 100644
+--- a/src/airstrike.c
++++ b/src/airstrike.c
+@@ -74,7 +74,7 @@ static int general_setup(void)
+ console_set_pos(9,254);
+ console_load_bg(path_to_data("console-bg.png"));
+ sprite_types_setup();
+- sprite_background_load("data/bg.png","data/bgmask.png");
++ sprite_background_load("/usr/share/games/airstrike/bg.png","/usr/share/games/airstrike/bgmask.png");
+
+ level_setup();
+ winds_setup();
+diff --git a/src/config.h b/src/config.h
+index 443cd43..ab1712e 100644
+--- a/src/config.h
++++ b/src/config.h
+@@ -6,7 +6,7 @@
+ /* absolute path to main config file (for now it's airstrikerc in the
+ current dir)*/
+ #ifndef ROOT_CONFIG_FILE
+-#define ROOT_CONFIG_FILE "airstrikerc"
++#define ROOT_CONFIG_FILE "/etc/airstrikerc"
+ #endif
+ /* path to file in users $HOME */
+ #ifndef USER_CONFIG_FILE
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..9447e76
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,30 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 30 Mar 2014 21:51:28 +0200
+Subject: hardening
+
+---
+ src/Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 67ea301..5a7bbaf 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,14 +1,15 @@
+ CFLAGS:= -g -O2 -Wall -Wno-unused $(OPTIONS)
+ #
+ CFLAGS += $(shell sdl-config --cflags) -Isprite -I. -Isupport -DINLINE=inline
++CFLAGS += `dpkg-buildflags --get CFLAGS`
+ CFILES:= $(shell find . -name '*.c')
+ OBJECTS:= $(CFILES:.c=.o)
+
+ airstrike: $(OBJECTS)
+- $(CC) -o $@ $(CFLAGS) $(OBJECTS) `sdl-config --libs` -lSDL_image -lm
++ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) `sdl-config --libs` -lSDL_image -lm
+
+ airstrike-sound: $(OBJECTS)
+- $(CC) -o $@ $(CFLAGS) $(OBJECTS) `sdl-config --libs` -lSDL_image -lSDL_mixer
++ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) `sdl-config --libs` -lSDL_image -lSDL_mixer
+
+ # Use the rule below when coding new sprite types
+ #sprites_autogen.h: sprite_types/*.c
diff --git a/debian/patches/manpage.diff b/debian/patches/manpage.diff
deleted file mode 100644
index 01bcc31..0000000
--- a/debian/patches/manpage.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- airstrike-0.99+1.0pre6a.orig/doc/airstrike.6
-+++ airstrike-0.99+1.0pre6a/doc/airstrike.6
-@@ -8,6 +8,9 @@
- /_/ \\_\\_|_| |___/\\__|_| |_|_|\\_\\___|
- .fi
-
-+.SH NAME
-+
-+airstrike - 2d dogfight game in the tradition of 'Biplanes' and 'BIP'
-
- .SH DESCRIPTION
-
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
new file mode 100644
index 0000000..292fadf
--- /dev/null
+++ b/debian/patches/manpage.patch
@@ -0,0 +1,22 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 30 Mar 2014 21:01:08 +0200
+Subject: manpage
+
+---
+ doc/airstrike.6 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doc/airstrike.6 b/doc/airstrike.6
+index 5b8c795..3a36976 100644
+--- a/doc/airstrike.6
++++ b/doc/airstrike.6
+@@ -8,6 +8,9 @@
+ /_/ \\_\\_|_| |___/\\__|_| |_|_|\\_\\___|
+ .fi
+
++.SH NAME
++
++airstrike - 2d dogfight game in the tradition of 'Biplanes' and 'BIP'
+
+ .SH DESCRIPTION
+
diff --git a/debian/patches/series b/debian/patches/series
index 7f3e47d..7735bb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,10 @@
-fix_paths.diff
-airstrikerc.diff
-manpage.diff
-fix-buffer-overflow.diff
-fix-red-baron-has-unlimited-bombs.diff
-fix-segfault-on-close.diff
-fix-unusable-on-amd64.diff
-fix-spawn-level.diff
-fix-link-flags.diff
+fix_paths.patch
+airstrikerc.patch
+manpage.patch
+fix-buffer-overflow.patch
+fix-red-baron-has-unlimited-bombs.patch
+fix-segfault-on-close.patch
+fix-unusable-on-amd64.patch
+fix-spawn-level.patch
+Add-lm-to-fix-FTBFS-with-binutils-gold.patch
+hardening.patch
diff --git a/debian/rules b/debian/rules
index 26bc68e..25c87f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,83 +1,8 @@
#!/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
+%:
+ 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-stamp
-build-stamp:
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- $(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- #Remove empty dir
- rm -rf debian/tmp/usr/share/games/airstrike/sound
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_install -i
- 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
- 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
+override_dh_install:
+ dh_install
+ find debian -type d -empty -delete -printf 'removed %p\n'
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..be3d3a1
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/icons/airstrike.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/airstrike.git
More information about the Pkg-games-commits
mailing list