[asc] 51/65: Debian release 2.6.0.0-1
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Dec 7 20:38:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository asc.
commit fe21089ec94b6c170022ed3e1f019275600c4721
Author: Markus Koschany <apo at gambaru.de>
Date: Wed Mar 19 12:50:08 2014 +0000
Debian release 2.6.0.0-1
---
debian/asc-data.dirs | 1 -
debian/asc-data.install | 2 +
debian/asc.desktop | 4 +-
debian/asc.dirs | 3 -
debian/asc.install | 6 +-
debian/asc.manpages | 5 -
debian/asc.menu | 10 +-
debian/changelog | 38 +-
debian/compat | 2 +-
debian/control | 53 +-
debian/copyright | 191 ++---
debian/icons/asc.png | Bin 0 -> 8606 bytes
debian/icons/asc.xpm | 872 +++++++++++++++++++++
debian/patches/gcc-4.7-part2.diff | 146 ----
debian/patches/no_unittester.patch | 15 -
debian/patches/series | 4 +-
...spelling_errors.patch => spelling-errors.patch} | 277 ++++---
debian/rules | 21 +-
debian/source/include-binaries | 1 +
debian/watch | 3 +-
20 files changed, 1193 insertions(+), 461 deletions(-)
diff --git a/debian/asc-data.dirs b/debian/asc-data.dirs
deleted file mode 100644
index 09feaac..0000000
--- a/debian/asc-data.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/games/asc
diff --git a/debian/asc-data.install b/debian/asc-data.install
index 209ef65..fb473e4 100644
--- a/debian/asc-data.install
+++ b/debian/asc-data.install
@@ -1 +1,3 @@
+debian/icons/asc.png usr/share/icons/hicolor/64x64/apps
+debian/icons/asc.xpm usr/share/pixmaps
usr/share/games/asc/*
diff --git a/debian/asc.desktop b/debian/asc.desktop
index 4d63a9f..68914fa 100644
--- a/debian/asc.desktop
+++ b/debian/asc.desktop
@@ -1,9 +1,11 @@
[Desktop Entry]
Name=Advanced Strategic Command
-GenericName=asc
+GenericName=Strategy Game
Comment=Defend your Command
+Comment[de]=Verteidige deinen Kommandobereich
Type=Application
Exec=asc
Icon=asc
Terminal=false
Categories=Game;StrategyGame;
+Keywords=strategy;battle;isle;turn-based;hexagon;tiles;multiplayer;singleplayer;AI;maps;editor;
diff --git a/debian/asc.dirs b/debian/asc.dirs
deleted file mode 100644
index ac6602a..0000000
--- a/debian/asc.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/games
-usr/share/man/man6
-usr/share/applications
diff --git a/debian/asc.install b/debian/asc.install
index 73326e0..4ca8039 100644
--- a/debian/asc.install
+++ b/debian/asc.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin/* /usr/games/
-doc/unitguide /usr/share/doc/asc/html/
-debian/asc.desktop usr/share/applications
+debian/asc.desktop usr/share/applications
+usr/bin/* usr/games
+usr/share/man
diff --git a/debian/asc.manpages b/debian/asc.manpages
deleted file mode 100644
index 988e9df..0000000
--- a/debian/asc.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/share/man/man6/asc.6
-debian/tmp/usr/share/man/man6/asc_demount.6
-debian/tmp/usr/share/man/man6/asc_mapedit.6
-debian/tmp/usr/share/man/man6/asc_mount.6
-debian/tmp/usr/share/man/man6/asc_weaponguide.6
diff --git a/debian/asc.menu b/debian/asc.menu
index afc7bea..55cdd5e 100644
--- a/debian/asc.menu
+++ b/debian/asc.menu
@@ -1,4 +1,6 @@
-?package(asc):needs="X11" section="Games/Strategy"\
- title="asc" command="/usr/games/asc"\
- longtitle="Advanced Strategic Command"
-
+?package(asc):needs="X11" \
+ section="Games/Strategy"\
+ title="Advanced Strategic Command" \
+ longtitle="Advanced Strategic Command - a turn-based strategy game" \
+ command="/usr/games/asc" \
+ icon="/usr/share/pixmaps/asc.xpm"
diff --git a/debian/changelog b/debian/changelog
index 8590066..be803f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,44 @@
-asc (2.5.0.0-2) UNRELEASED; urgency=low
+asc (2.6.0.0-1) UNRELEASED; urgency=medium
[ Evgeni Golov ]
- * Correct Vcs-* URLs to point to anonscm.debian.org
+ * Correct Vcs-* URLs to point to anonscm.debian.org.
[ Alexander Reichle-Schmehl ]
* Removed myself from uploaders.
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:06 +0200
+ [ Markus Koschany ]
+ * Add myself to Uploaders.
+ * Imported Upstream version 2.6.0.0.
+ * wrap-and-sort -sab.
+ * Use compat level 9 and require debhelper >= 9.
+ * Drop dirs files. Not needed with compat level 9 and install files.
+ * Declare compliance with Debian policy 3.9.5.
+ * debian/control:
+ - Remove build-dependency on dpkg-dev.
+ - asc: change versioned dependency for asc-data to (= ${source:Version}).
+ - Switch to libwxgtk3.0-dev.
+ * debian/watch: Make the extension regex more flexible.
+ * Install man pages with asc.install. Drop asc.manpages.
+ * Update asc.menu. Add icon entry.
+ * debian/rules:
+ - Build --with parallel and --with autotools_dev. Thanks to Logan Rosen for
+ the report and patch. (Closes: #733210)
+ - Remove override for dh_auto_configure. Disabling the paraguitest is
+ obsolete thus an override is not needed anymore.
+ - Export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed.
+ * Drop gcc-4.7-part2.diff. Fixed upstream.
+ * Drop no_unittester.patch. Export DEB_BUILD_OPTIONS = nocheck instead and
+ disable the non-functional unittests to avoid a FTBFS.
+ * Rename spelling patch to spelling-errors.patch and forward it to upstream's
+ forum.
+ * Add keywords and comment in German to desktop file.
+ * Add and install asc.png and asc.xpm icons. (Closes: #720169)
+ * Update debian/copyright to copyright format 1.0.
+ * Do not install uncompiled unitguide documentation anymore. Using
+ asc_weaponguide for creating the documentation on a per user basis
+ is recommended.
+
+ -- Markus Koschany <apo at gambaru.de> Tue, 18 Mar 2014 22:06:48 +0100
asc (2.5.0.0-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 75bd5f8..5d47466 100644
--- a/debian/control
+++ b/debian/control
@@ -2,29 +2,60 @@ Source: asc
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar <sho at debian.org>, Bartosz Fenski <fenio at debian.org>, Barry deFreese <bdefreese at debian.org>, Moritz Muehlenhoff <jmm at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-sound1.2-dev, libsigc++-1.2-dev, libphysfs-dev, libxt-dev, libesd0-dev, libboost-dev, libboost-regex-dev, libbz2-dev, zip, libwxgtk2.8-dev, liblua5.1-0-dev, libexpat1-dev, libjpeg-dev, libfreetype6-dev, libpng-dev
-Standards-Version: 3.9.4
+Uploaders:
+ Sam Hocevar <sho at debian.org>,
+ Bartosz Fenski <fenio at debian.org>,
+ Barry deFreese <bdefreese at debian.org>,
+ Moritz Muehlenhoff <jmm at debian.org>,
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ libboost-dev,
+ libboost-regex-dev,
+ libbz2-dev,
+ libesd0-dev,
+ libexpat1-dev,
+ libfreetype6-dev,
+ libjpeg-dev,
+ liblua5.1-0-dev,
+ libphysfs-dev,
+ libpng-dev,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-sound1.2-dev,
+ libsdl1.2-dev,
+ libsigc++-1.2-dev,
+ libwxgtk3.0-dev,
+ libxt-dev,
+ zip
+Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/asc/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/asc/
Homepage: http://www.asc-hq.org
Package: asc
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, asc-data (>= 2.5.0.0)
-Recommends: asc-music
+Depends:
+ asc-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ asc-music
Description: turn-based strategy game
- Advanced Strategic Command is a free strategy game in the tradition
- of Battle Isle 2/3. The game is turn-based and can be played against
+ Advanced Strategic Command is a free strategy game in the tradition
+ of Battle Isle 2/3. The game is turn-based and can be played against
human or computer.
Package: asc-data
Architecture: all
-Depends: ${misc:Depends}
-Suggests: asc
+Depends:
+ ${misc:Depends}
+Suggests:
+ asc
Description: data files for the Advanced Strategic Command game
- Advanced Strategic Command is a free strategy game in the tradition
- of BattleIsle 2/3. The game is turn-based and can be played against
+ Advanced Strategic Command is a free strategy game in the tradition
+ of Battle Isle 2/3. The game is turn-based and can be played against
human or computer.
.
This package contains the data files for the ASC game.
diff --git a/debian/copyright b/debian/copyright
index 2eb68ee..e07e74f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,134 +1,93 @@
-This package was debianized by Bartosz Fenski <fenio at debian.org> on
-Tue, 18 May 2004 16:01:36 +0200.
-
-It was downloaded from http://www.asc-hq.org/
-
-Upstream Author: Martin Bickel <bickel at asc-hq.org>
-
-Copyright:
-
-Copyright 1994-2006 Martin Bickel <bickel at asc-hq.org>
-Copyright 1994-2006 Steffen Fröhlich
-Copyright 1994-2006 Daniel Korbely
-
-Contributions:
-
-Christian Mayer (graphics)
-Frank Fiedler (graphics)
-Michael Kievernagel (music)
-Torsten Maekler (objects, terrain)
-Kevin Hirschmann (code, unit and building guide)
-Jeffrey M. Wacheski (sound)
-Tom Wilson, Simon Britnell (linux porting)
-
-More information about contributors can be find in:
-/usr/share/games/asc/helpsyst.txt
-
-License:
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-Some content of this package is differently licensed and copyrighted. See below:
-
-source/libs/loki:
- The Loki Library
- Copyright (c) 2001 by Andrei Alexandrescu
- This code accompanies the book:
- Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
- Patterns Applied". Copyright (c) 2001. Addison-Wesley.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Martin Bickel <bickel at asc-hq.org>
+Upstream-Name: Advanced Strategic Command (ASC)
+Source: http://www.asc-hq.org
+
+Files: *
+Copyright: 1994-2010, Martin Bickel <bickel at asc-hq.org>
+ 1994-2010, Marc Schellenberger
+ 1994-2010, Steffen Fröhlich
+ 1994-2010, Daniel Korbely
+ 1996-2013, Free Software Foundation
+ 2005, Kevin Hirschmann <hirsch at dhcppc0>
+ 1999, Rainer Johanni <Rainer at Johanni.de>
+ 2004, Cort Stratton <cort at cortstratton dot org>
+ 2001, David Hedbor <david at hedbor.org>
+License: GPL-2+
+Comment:
+ You can view the list of people who contributed to ASC in the game itself
+ through the HELP / ABOUT menu item. The text itself is stored in
+ data/helpsyst.txt
+
+Files: debian/*
+Copyright: 2004-2006, Bartosz Fenski <fenio at debian.org>
+ 2006, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+ 2010, Moritz Muehlenhoff <jmm at debian.org>
+ 2012, Felix Geyer <debfx-pkg at fobos.de>
+ 2012, Dmitrijs Ledkovs <xnox at debian.org>
+ 2008-2013, Barry deFreese <bdefreese at debian.org>
+ 2014, Markus Koschany <apo at gambaru.de>
+License: GPL-2+
+
+Files: source/sdl/sdlstretch.*
+ source/libs/paragui/*
+Copyright: 1999, Alexander Pipelka
+License: LGPL-2+
+
+Files: source/libs/paragui/src/ystring/ystring.cpp
+Copyright: 2004, Arabeyes, Mohammed Yousif
+License: GPL-2+
+
+Files: source/libs/loki-0.1.6/*
+Copyright: 2005-2006, Peter Kümmel
+ 2001, 2005-2006, Andrei Alexandrescu
+ 2006, Richard Sposato
+License: The-Loki-Library-License
Permission to use, copy, modify, distribute and sell this software for any
- purpose is hereby granted without fee, provided that the above copyright
- notice appear in all copies and that both that copyright notice and this
- permission notice appear in supporting documentation.
- The author or Addison-Wesley Longman make no representations about the
- suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
-source/libs/paragui:
- ParaGUI - crossplatform widgetset
- Copyright (C) 2000,2001,2002 Alexander Pipelka
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- Alexander Pipelka
- pipelka at teleweb.at
-
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in the file `/usr/share/common-licenses/LGPL-2'.
-
-source/libs/sdlmm, source/libs/sdl_sound:
- Copyright (C) 2001 David Hedbor <david at hedbor.org>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-source/libs/triangul:
- Written by Atul Narkhede <narkhede at cs.unc.edu>
-
- This code is in the public domain. Specifically, we give to the public
- domain all rights for future licensing of the source code, all resale
- rights, and all publishing rights.
-
- UNC-CH GIVES NO WARRANTY, EXPRESSED OR IMPLIED, FOR THE SOFTWARE
- AND/OR DOCUMENTATION PROVIDED, INCLUDING, WITHOUT LIMITATION, WARRANTY
- OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE.
-
-source/libs/rand:
+ purpose is hereby granted without fee, provided that the above copyright
+ notice appear in all copies and that both that copyright notice and this
+ permission notice appear in supporting documentation. The author or
+ Addison-Wesley Longman make no representations about the suitability of this
+ software for any purpose. It is provided "as is" without express or implied
+ warranty.
+
+Files: source/libs/rand/*
+Copyright: 1996, 1999 Free Software Foundation, Inc
+ 1996, Ulrich Drepper <drepper at cygnus.com>
+License: LGPL-2.1+
Reentrant random function frm POSIX.1c.
Copyright (C) 1996, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper at cygnus.com>, 1996.
-
+ .
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
-
+ .
The GNU C Library 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
Lesser General Public License for more details.
-
- On Debian systems, the complete text of the GNU Library General Public
+ .
+ On Debian systems, the complete text of the GNU Library General Public
License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
-source/sdl/sdlstretch.cpp, source/sdl/sdlstretch.h:
- Copyright (C) 1999 Alexander Pipelka <pipelka at teleweb.at>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+Files: source/libs/triangul/*
+Copyright: Atul Narkhede <narkhede at cs.unc.edu>
+License: public-domain
+ This code is in the public domain. Specifically, we give to the public
+ domain all rights for future licensing of the source code, all resale
+ rights, and all publishing rights.
+ .
+ UNC-CH GIVES NO WARRANTY, EXPRESSED OR IMPLIED, FOR THE SOFTWARE
+ AND/OR DOCUMENTATION PROVIDED, INCLUDING, WITHOUT LIMITATION, WARRANTY
+ OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE.
- This library 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
- Library General Public License for more details.
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL-2'.
- On Debian systems, the complete text of the GNU Library General Public
+License: LGPL-2+
+ On Debian systems, the complete text of the GNU Library General Public
License can be found in the file `/usr/share/common-licenses/LGPL-2'.
-
diff --git a/debian/icons/asc.png b/debian/icons/asc.png
new file mode 100644
index 0000000..a5422e8
Binary files /dev/null and b/debian/icons/asc.png differ
diff --git a/debian/icons/asc.xpm b/debian/icons/asc.xpm
new file mode 100644
index 0000000..5037ae4
--- /dev/null
+++ b/debian/icons/asc.xpm
@@ -0,0 +1,872 @@
+/* XPM */
+static char * asc_xpm[] = {
+"32 32 837 2",
+" c #75880F",
+". c #76890F",
+"+ c #80920F",
+"@ c #75870F",
+"# c #81940F",
+"$ c #71850F",
+"% c #788B0F",
+"& c #798D0F",
+"* c #75890F",
+"= c #7F910F",
+"- c #6D830F",
+"; c #7B8E0F",
+"> c #798D07",
+", c #ABB186",
+"' c #A7AE83",
+") c #A6AD83",
+"! c #A9AE83",
+"~ c #A4AC83",
+"{ c #ADB283",
+"] c #AFB68D",
+"^ c #6C7A1A",
+"/ c #7B8511",
+"( c #6A721D",
+"_ c #545F0F",
+": c #596417",
+"< c #465C14",
+"[ c #667220",
+"} c #4C5D14",
+"| c #6A7928",
+"1 c #575F12",
+"2 c #72850F",
+"3 c #74870F",
+"4 c #687D0F",
+"5 c #7D8F0F",
+"6 c #70840F",
+"7 c #7A8E0F",
+"8 c #788C0F",
+"9 c #73870F",
+"0 c #778A0F",
+"a c #7B8D0F",
+"b c #83940F",
+"c c #7B8F00",
+"d c #ADABB8",
+"e c #717171",
+"f c #767471",
+"g c #7D7570",
+"h c #707173",
+"i c #59595B",
+"j c #63701D",
+"k c #6E820F",
+"l c #6D810F",
+"m c #6F7C14",
+"n c #6A7427",
+"o c #43570B",
+"p c #40611A",
+"q c #40530B",
+"r c #475307",
+"s c #636C1C",
+"t c #7C8E0F",
+"u c #75860F",
+"v c #71870F",
+"w c #82930F",
+"x c #778C0F",
+"y c #6E840F",
+"z c #7A8D0F",
+"A c #71830F",
+"B c #81930F",
+"C c #6A8000",
+"D c #B1AFBA",
+"E c #908F8D",
+"F c #A49A8A",
+"G c #A69D8D",
+"H c #A79D8B",
+"I c #A89C8A",
+"J c #AD9F8B",
+"K c #717479",
+"L c #616063",
+"M c #64701D",
+"N c #798C0F",
+"O c #6F840F",
+"P c #6A750E",
+"Q c #4B520E",
+"R c #576A22",
+"S c #556315",
+"T c #454F04",
+"U c #586112",
+"V c #7C8F0F",
+"W c #7F900F",
+"X c #84980F",
+"Y c #8A970F",
+"Z c #73840F",
+"` c #778B0F",
+" . c #7D900F",
+".. c #7D920F",
+"+. c #6D8100",
+"@. c #B1AFBB",
+"#. c #AEAEAE",
+"$. c #818181",
+"%. c #8E8E8E",
+"&. c #80807F",
+"*. c #AAA9A9",
+"=. c #616161",
+"-. c #606060",
+";. c #656467",
+">. c #68741B",
+",. c #72890E",
+"'. c #85980F",
+"). c #86930F",
+"!. c #76880F",
+"~. c #778F0F",
+"{. c #6E7917",
+"]. c #555F10",
+"^. c #61691A",
+"/. c #6C7626",
+"(. c #6E830F",
+"_. c #76870F",
+":. c #6F8210",
+"<. c #7E9310",
+"[. c #7C8F10",
+"}. c #768710",
+"|. c #7C8F12",
+"1. c #6F8104",
+"2. c #94987E",
+"3. c #B5B4B7",
+"4. c #B4B4B4",
+"5. c #878787",
+"6. c #515151",
+"7. c #848484",
+"8. c #6E6E6E",
+"9. c #707070",
+"0. c #4C4C4C",
+"a. c #3B3A3B",
+"b. c #4A4C39",
+"c. c #65751A",
+"d. c #7B8D10",
+"e. c #758710",
+"f. c #748810",
+"g. c #7E9210",
+"h. c #6F7A11",
+"i. c #676A1B",
+"j. c #5F6616",
+"k. c #5B6C0C",
+"l. c #89990F",
+"m. c #82920F",
+"n. c #84950F",
+"o. c #7E9111",
+"p. c #97A162",
+"q. c #999B59",
+"r. c #8F9259",
+"s. c #9EA059",
+"t. c #949559",
+"u. c #9A9B5A",
+"v. c #919454",
+"w. c #968C93",
+"x. c #626363",
+"y. c #666666",
+"z. c #A0A0A0",
+"A. c #8B8B8B",
+"B. c #747474",
+"C. c #3A3A3A",
+"D. c #3D3D3D",
+"E. c #3B3B3B",
+"F. c #453F41",
+"G. c #949264",
+"H. c #959759",
+"I. c #979A59",
+"J. c #989B59",
+"K. c #999959",
+"L. c #929459",
+"M. c #95A05C",
+"N. c #97A061",
+"O. c #75830A",
+"P. c #4D5809",
+"Q. c #515F0A",
+"R. c #788B0E",
+"S. c #7E910F",
+"T. c #7F9415",
+"U. c #8C838B",
+"V. c #2F908F",
+"W. c #2B8D8C",
+"X. c #2A8C8B",
+"Y. c #298B8A",
+"Z. c #298A8A",
+"`. c #248E90",
+" + c #9A7E63",
+".+ c #8A7658",
+"++ c #8F7A5A",
+"@+ c #9F9E9D",
+"#+ c #45413B",
+"$+ c #594426",
+"%+ c #5A4629",
+"&+ c #5B4B36",
+"*+ c #5D9F9F",
+"=+ c #2E908F",
+"-+ c #2F9090",
+";+ c #2D8F8E",
+">+ c #2C8E8D",
+",+ c #218D8C",
+"'+ c #918B8A",
+")+ c #73717E",
+"!+ c #829607",
+"~+ c #3F4C09",
+"{+ c #4F5B09",
+"]+ c #414C08",
+"^+ c #53610B",
+"/+ c #4A550F",
+"(+ c #918A8F",
+"_+ c #0A6161",
+":+ c #0A6060",
+"<+ c #095F5F",
+"[+ c #095E5E",
+"}+ c #085E5E",
+"|+ c #056262",
+"1+ c #6C4C26",
+"2+ c #C99B51",
+"3+ c #BF8E40",
+"4+ c #A1A09C",
+"5+ c #898989",
+"6+ c #897D6A",
+"7+ c #976718",
+"8+ c #B6873A",
+"9+ c #9A8667",
+"0+ c #337171",
+"a+ c #0D6464",
+"b+ c #0C6464",
+"c+ c #0C6363",
+"d+ c #0B6262",
+"e+ c #046363",
+"f+ c #514B4B",
+"g+ c #757381",
+"h+ c #809507",
+"i+ c #4E5909",
+"j+ c #555F09",
+"k+ c #57650A",
+"l+ c #404D09",
+"m+ c #44510F",
+"n+ c #938F93",
+"o+ c #467272",
+"p+ c #265252",
+"q+ c #275353",
+"r+ c #265353",
+"s+ c #275252",
+"t+ c #255555",
+"u+ c #3E393A",
+"v+ c #424243",
+"w+ c #323232",
+"x+ c #999999",
+"y+ c #727272",
+"z+ c #39393A",
+"A+ c #383838",
+"B+ c #2E2F30",
+"C+ c #678484",
+"D+ c #2A5555",
+"E+ c #295555",
+"F+ c #285454",
+"G+ c #383535",
+"H+ c #6B6976",
+"I+ c #768A07",
+"J+ c #475409",
+"K+ c #5F6F0C",
+"L+ c #4D5B0A",
+"M+ c #435009",
+"N+ c #47540F",
+"O+ c #8D8D92",
+"P+ c #827979",
+"Q+ c #4F4646",
+"R+ c #524949",
+"S+ c #524848",
+"T+ c #504646",
+"U+ c #484949",
+"V+ c #8A8A8A",
+"W+ c #A3A3A3",
+"X+ c #909090",
+"Y+ c #767676",
+"Z+ c #393939",
+"`+ c #67696A",
+" @ c #8B736B",
+".@ c #8D8A8B",
+"+@ c #4B4343",
+"@@ c #514848",
+"#@ c #504747",
+"$@ c #5A5050",
+"%@ c #454646",
+"&@ c #777581",
+"*@ c #738807",
+"=@ c #72850E",
+"-@ c #56630A",
+";@ c #455109",
+">@ c #4C5909",
+",@ c #48540F",
+"'@ c #978E93",
+")@ c #2E9292",
+"!@ c #2D9191",
+"~@ c #2C9090",
+"{@ c #2B8F8F",
+"]@ c #249193",
+"^@ c #9F7E5E",
+"/@ c #8F7650",
+"(@ c #91764E",
+"_@ c #9E9D9C",
+":@ c #838383",
+"<@ c #464139",
+"[@ c #624821",
+"}@ c #7C643F",
+"|@ c #927B60",
+"1@ c #529697",
+"2@ c #329696",
+"3@ c #329595",
+"4@ c #319595",
+"5@ c #309494",
+"6@ c #2F9393",
+"7@ c #229090",
+"8@ c #8E8888",
+"9@ c #706E7C",
+"0@ c #7B9107",
+"a@ c #6E7F0E",
+"b@ c #424C08",
+"c@ c #4B560F",
+"d@ c #938D91",
+"e@ c #0E6565",
+"f@ c #0D6363",
+"g@ c #0C6262",
+"h@ c #0B6161",
+"i@ c #076464",
+"j@ c #6B4C28",
+"k@ c #C09655",
+"l@ c #B58944",
+"m@ c #A19F9C",
+"n@ c #857B6A",
+"o@ c #8E611B",
+"p@ c #AB803D",
+"q@ c #988467",
+"r@ c #3A7777",
+"s@ c #106868",
+"t@ c #0F6767",
+"u@ c #0E6666",
+"v@ c #076565",
+"w@ c #534E4E",
+"x@ c #748907",
+"y@ c #73860F",
+"z@ c #71840F",
+"A@ c #4E5A0F",
+"B@ c #94888A",
+"C@ c #447070",
+"D@ c #234F4F",
+"E@ c #244F4F",
+"F@ c #225151",
+"G@ c #3E3A3A",
+"H@ c #464646",
+"I@ c #9A9A9A",
+"J@ c #3A3A39",
+"K@ c #3C3C3C",
+"L@ c #363838",
+"M@ c #5E7B7B",
+"N@ c #224E4E",
+"O@ c #265151",
+"P@ c #255151",
+"Q@ c #255050",
+"R@ c #393636",
+"S@ c #696673",
+"T@ c #748A07",
+"U@ c #7E930F",
+"V@ c #7C8D0F",
+"W@ c #73850F",
+"X@ c #859715",
+"Y@ c #878891",
+"Z@ c #807777",
+"`@ c #574D4D",
+" # c #594F4F",
+".# c #4E4F4F",
+"+# c #8E8B89",
+"@# c #8A8887",
+"## c #A5A5A5",
+"$# c #7E7E7E",
+"%# c #313131",
+"&# c #636565",
+"*# c #8C7771",
+"=# c #8D8889",
+"-# c #544A4A",
+";# c #4C4D4D",
+"># c #7A9007",
+",# c #83950F",
+"'# c #7A8D15",
+")# c #948B93",
+"!# c #2A8F8F",
+"~# c #298D8D",
+"{# c #278D8D",
+"]# c #278B8B",
+"^# c #268B8B",
+"/# c #1F8D8F",
+"(# c #9F7C58",
+"_# c #937649",
+":# c #967747",
+"<# c #585248",
+"[# c #9D7F52",
+"}# c #96794C",
+"|# c #937E61",
+"1# c #509595",
+"2# c #2D9393",
+"3# c #2D9292",
+"4# c #2C9191",
+"5# c #2B9090",
+"6# c #1F8E8E",
+"7# c #8A8484",
+"8# c #7F7C89",
+"9# c #728807",
+"0# c #74860F",
+"a# c #809315",
+"b# c #8A838C",
+"c# c #136B6B",
+"d# c #0F6666",
+"e# c #0A696A",
+"f# c #6D4D29",
+"g# c #B58E55",
+"h# c #AA8044",
+"i# c #A09E9B",
+"j# c #786F60",
+"k# c #845C1D",
+"l# c #9F783D",
+"m# c #958267",
+"n# c #438080",
+"o# c #156E6E",
+"p# c #156D6D",
+"q# c #146D6D",
+"r# c #126A6A",
+"s# c #0A6B6B",
+"t# c #555050",
+"u# c #777582",
+"v# c #7B9007",
+"w# c #677C0F",
+"x# c #819315",
+"y# c #89858D",
+"z# c #436E6E",
+"A# c #214B4B",
+"B# c #224C4C",
+"C# c #204D4D",
+"D# c #3D3939",
+"E# c #5C5C5B",
+"F# c #565655",
+"G# c #9B9B9B",
+"H# c #3F3F3E",
+"I# c #454444",
+"J# c #484747",
+"K# c #5F7B7B",
+"L# c #1F4949",
+"M# c #234D4D",
+"N# c #234C4C",
+"O# c #204E4E",
+"P# c #3A3737",
+"Q# c #656370",
+"R# c #798E07",
+"S# c #798E0F",
+"T# c #7D8E0F",
+"U# c #7F9115",
+"V# c #908F9B",
+"W# c #7E7E81",
+"X# c #5A5A5D",
+"Y# c #5B5B5E",
+"Z# c #59595C",
+"`# c #636366",
+" $ c #797A7A",
+".$ c #C9C9C9",
+"+$ c #858585",
+"@$ c #4E4E4E",
+"#$ c #4C4C4D",
+"$$ c #4C5045",
+"%$ c #5A5A5C",
+"&$ c #67676A",
+"*$ c #575759",
+"=$ c #787585",
+"-$ c #7A8F07",
+";$ c #80910F",
+">$ c #83960F",
+",$ c #85940F",
+"'$ c #68741F",
+")$ c #6A781F",
+"!$ c #677420",
+"~$ c #6B7820",
+"{$ c #6D7A20",
+"]$ c #637120",
+"^$ c #5A690C",
+"/$ c #9998A1",
+"($ c #6D6D6D",
+"_$ c #B2B2B2",
+":$ c #A8A8A8",
+"<$ c #5E5E5E",
+"[$ c #B7B7B7",
+"}$ c #7C7C7C",
+"|$ c #8F8F8F",
+"1$ c #70706F",
+"2$ c #34323C",
+"3$ c #6A7A1F",
+"4$ c #727F20",
+"5$ c #727C20",
+"6$ c #6C7920",
+"7$ c #697820",
+"8$ c #66721D",
+"9$ c #6E7B20",
+"0$ c #667522",
+"a$ c #768A0D",
+"b$ c #7B8B0F",
+"c$ c #74890F",
+"d$ c #84970F",
+"e$ c #75880E",
+"f$ c #829413",
+"g$ c #687D00",
+"h$ c #9B99A6",
+"i$ c #767777",
+"j$ c #BABABA",
+"k$ c #737373",
+"l$ c #636363",
+"m$ c #6F6F6F",
+"n$ c #525252",
+"o$ c #505050",
+"p$ c #32303B",
+"q$ c #7A8F0D",
+"r$ c #84960F",
+"s$ c #859713",
+"t$ c #6F7E12",
+"u$ c #73880F",
+"v$ c #83930F",
+"w$ c #88980F",
+"x$ c #8E9E36",
+"y$ c #71860E",
+"z$ c #70850F",
+"A$ c #889A20",
+"B$ c #87982E",
+"C$ c #85960F",
+"D$ c #6D8400",
+"E$ c #9998A5",
+"F$ c #8C7973",
+"G$ c #726967",
+"H$ c #434546",
+"I$ c #444444",
+"J$ c #424445",
+"K$ c #535353",
+"L$ c #787878",
+"M$ c #383643",
+"N$ c #8EA10B",
+"O$ c #5A6A0B",
+"P$ c #616D12",
+"Q$ c #5F6A11",
+"R$ c #5D6A1A",
+"S$ c #7A8F0F",
+"T$ c #6E8204",
+"U$ c #E5EABF",
+"V$ c #697334",
+"W$ c #81960A",
+"X$ c #8B8F73",
+"Y$ c #C6CD8E",
+"Z$ c #7F920C",
+"`$ c #758A00",
+" % c #A9A2AC",
+".% c #646060",
+"+% c #6E615D",
+"@% c #93817C",
+"#% c #7C7C7B",
+"$% c #837D7B",
+"%% c #8D7770",
+"&% c #8B7E7A",
+"*% c #5B5B5C",
+"=% c #2D2C37",
+"-% c #83970D",
+";% c #7B8F0F",
+">% c #788A0F",
+",% c #647013",
+"'% c #737E2C",
+")% c #565F0F",
+"!% c #586715",
+"~% c #6B800F",
+"{% c #86970F",
+"]% c #788D0F",
+"^% c #6C8002",
+"/% c #BCC395",
+"(% c #FBFBFE",
+"_% c #B3B4AC",
+":% c #C3CE88",
+"<% c #C8C8CC",
+"[% c #EAE9F3",
+"}% c #A3AE62",
+"|% c #677C00",
+"1% c #9C9373",
+"2% c #666564",
+"3% c #656565",
+"4% c #424344",
+"5% c #323737",
+"6% c #602626",
+"7% c #3E3937",
+"8% c #414344",
+"9% c #545454",
+"0% c #565656",
+"a% c #474A36",
+"b% c #7C910D",
+"c% c #6F830F",
+"d% c #61740D",
+"e% c #58641B",
+"f% c #5C661B",
+"g% c #5E681C",
+"h% c #6A7423",
+"i% c #748900",
+"j% c #C2C8AA",
+"k% c #E7E6E8",
+"l% c #181717",
+"m% c #1C1C1C",
+"n% c #061010",
+"o% c #091211",
+"p% c #201B1B",
+"q% c #6E6E73",
+"r% c #B2BB85",
+"s% c #5E7209",
+"t% c #665653",
+"u% c #666565",
+"v% c #5C5D5D",
+"w% c #672020",
+"x% c #C80000",
+"y% c #472020",
+"z% c #525353",
+"A% c #768615",
+"B% c #6A7C19",
+"C% c #697524",
+"D% c #5D681C",
+"E% c #5F6A1D",
+"F% c #5A6317",
+"G% c #636C1D",
+"H% c #788A11",
+"I% c #CED2BB",
+"J% c #CBCBCB",
+"K% c #12130C",
+"L% c #3E3628",
+"M% c #88433E",
+"N% c #840E0E",
+"O% c #C9595A",
+"P% c #BC9D8F",
+"Q% c #352B28",
+"R% c #626265",
+"S% c #BEC49E",
+"T% c #687C00",
+"U% c #4D4D4F",
+"V% c #5A5F5F",
+"W% c #E86C6C",
+"X% c #E84747",
+"Y% c #A60808",
+"Z% c #535A59",
+"`% c #474840",
+" & c #758713",
+".& c #768A0F",
+"+& c #53610E",
+"@& c #505C13",
+"#& c #515F15",
+"$& c #42540F",
+"%& c #4B5A10",
+"&& c #3C4D06",
+"*& c #56661C",
+"=& c #6E8302",
+"-& c #C1C4B2",
+";& c #A5A4AA",
+">& c #AFAFAF",
+",& c #1C1C1B",
+"'& c #4E512D",
+")& c #492C2C",
+"!& c #745934",
+"~& c #D4B19E",
+"{& c #867160",
+"]& c #847957",
+"^& c #3E4042",
+"/& c #57565D",
+"(& c #767A5C",
+"_& c #7F8E0C",
+":& c #3C3D3E",
+"<& c #896970",
+"[& c #8C636C",
+"}& c #6F2026",
+"|& c #474B42",
+"1& c #728512",
+"2& c #77880F",
+"3& c #81930E",
+"4& c #666F23",
+"5& c #636A18",
+"6& c #4D580B",
+"7& c #667325",
+"8& c #5B6618",
+"9& c #4D590D",
+"0& c #657221",
+"a& c #6F8013",
+"b& c #6E7F0A",
+"c& c #B3B2B9",
+"d& c #151912",
+"e& c #8A8D49",
+"f& c #1C1819",
+"g& c #60692F",
+"h& c #E7C7B6",
+"i& c #534E34",
+"j& c #A89F73",
+"k& c #3E3F4B",
+"l& c #70810E",
+"m& c #6E8211",
+"n& c #708115",
+"o& c #7F921B",
+"p& c #849915",
+"q& c #7A8B1C",
+"r& c #7D8D1C",
+"s& c #6A7D0E",
+"t& c #5C6415",
+"u& c #575B06",
+"v& c #4D5404",
+"w& c #5E6515",
+"x& c #6A711F",
+"y& c #626A18",
+"z& c #5A6112",
+"A& c #7A8E11",
+"B& c #5F710A",
+"C& c #464F14",
+"D& c #B5B4B8",
+"E& c #0E0F10",
+"F& c #5B6929",
+"G& c #75665A",
+"H& c #143149",
+"I& c #55433E",
+"J& c #47492B",
+"K& c #A59F5F",
+"L& c #3F3F4A",
+"M& c #666F29",
+"N& c #7F900D",
+"O& c #7C8E10",
+"P& c #868E4C",
+"Q& c #959399",
+"R& c #919096",
+"S& c #A19EB3",
+"T& c #879903",
+"U& c #73870E",
+"V& c #5E6619",
+"W& c #5C6515",
+"X& c #626B1E",
+"Y& c #67701F",
+"Z& c #5C6516",
+"`& c #5A6315",
+" * c #636B1B",
+".* c #798C00",
+"+* c #D0D8A6",
+"@* c #F7F5FE",
+"#* c #A1A1A1",
+"$* c #1A1A18",
+"%* c #86894B",
+"&* c #7E6763",
+"** c #213F54",
+"=* c #5A4841",
+"-* c #61583F",
+";* c #B2A87C",
+">* c #393A3D",
+",* c #6F6D78",
+"'* c #737A51",
+")* c #7B8F09",
+"!* c #7F8949",
+"~* c #C1C1C1",
+"{* c #8D8D8D",
+"]* c #8E8C99",
+"^* c #7A8D03",
+"/* c #82950F",
+"(* c #636F11",
+"_* c #626E1E",
+":* c #394E05",
+"<* c #4B6118",
+"[* c #4D5B0D",
+"}* c #44540A",
+"|* c #546418",
+"1* c #596C1E",
+"2* c #6F830D",
+"3* c #94A240",
+"4* c #D3D2DB",
+"5* c #161B10",
+"6* c #716C4B",
+"7* c #856F68",
+"8* c #294A61",
+"9* c #58463F",
+"0* c #7C6C55",
+"a* c #948672",
+"b* c #27262F",
+"c* c #768719",
+"d* c #778910",
+"e* c #7B8549",
+"f* c #888888",
+"g* c #8A8996",
+"h* c #849704",
+"i* c #667318",
+"j* c #5B6616",
+"k* c #4B590E",
+"l* c #3F5710",
+"m* c #657526",
+"n* c #4A5C15",
+"o* c #6A7B2B",
+"p* c #778A10",
+"q* c #89983E",
+"r* c #77757C",
+"s* c #40362D",
+"t* c #A8897E",
+"u* c #80655C",
+"v* c #866D66",
+"w* c #D1AD9D",
+"x* c #24282D",
+"y* c #717E16",
+"z* c #889A10",
+"A* c #697D10",
+"B* c #75814A",
+"C* c #9E9E9E",
+"D* c #A9A7B4",
+"E* c #738703",
+"F* c #4D5511",
+"G* c #5B6514",
+"H* c #6F792D",
+"I* c #455A0E",
+"J* c #3C5B13",
+"K* c #3D5109",
+"L* c #4D5A0B",
+"M* c #616918",
+"N* c #99A944",
+"O* c #4F4B48",
+"P* c #564943",
+"Q* c #554D32",
+"R* c #544745",
+"S* c #5F5B53",
+"T* c #404B04",
+"U* c #6C820F",
+"V* c #6B8010",
+"W* c #7C854C",
+"X* c #595958",
+"Y* c #3B3A3A",
+"Z* c #1D1E27",
+"`* c #667C08",
+" = c #72840F",
+".= c #6C791E",
+"+= c #626D1D",
+"@= c #525C0C",
+"#= c #4A590E",
+"$= c #596E24",
+"%= c #546216",
+"&= c #455107",
+"*= c #586113",
+" . + @ # $ % & * = - ; > , ' ' ' ) ! ~ { ] ^ / ( _ : < [ } | 1 ",
+"2 3 3 4 5 6 7 8 9 0 a b c d e f f f f g h i j k l m n o p q r s ",
+"k t & u v w x y z A 8 B C D E F G H I J K L M N O 8 P Q R S T U ",
+"V W v X Y Z * ` .7 ..+. at .#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.",
+"(._.l @ ; :.<.[.}.z |.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.a h.i.j.",
+"k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.y.z.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.Y.`. +.+++ at +5.#+$+%+&+*+=+-+=+;+>+,+'+)+!+",
+"~+{+]+^+/+(+_+:+<+[+}+[+|+1+2+3+4+5+6+7+8+9+0+a+a+b+c+d+e+f+g+h+",
+"i+j+k+l+m+n+o+p+q+r+s+r+t+u+v+w+x+7.y+z+A+B+C+p+D+E+E+F+t+G+H+I+",
+"J+K+L+M+N+O+P+Q+R+S+S+R+T+U+V+%.W+X+Y+Z+`+ @. at +@@@@@@@#@$@%@&@*@",
+"=@-@;@>@,@'@)@!@~@{@{@{@]@^@/@(@_@:@<@[@}@|@1 at 2@3 at 4@5 at 6@7 at 8@9 at 0@",
+"_.* a at b@c at d@e at f@g at h@:+h at i@j at k@l at m@5+n at o@p at q@r at s@s at t@u at e@v at w@&@x@",
+"y at 3 z at 3 A at B@C at D@E at E@E at E@F at G@H at C.I@7.y+J at K@L at M@N at O@O at P@Q at F@R at S@T@",
+"; U at V@W at X@Y at Z@`@ # # # # #.#+#@###$#B.%#&#*#=#-# # # # # #;#)+>#",
+",#A a $ '#)#!#~#{#]#^#^#/#(#_#:#_ at V+<#[#}#|#1#2#3#4#5#!#6#7#8#9#",
+"0#. # 2 a#b#c#s at d#u at e@e at e#f#g#h#i#$#j#k#l#m#n#o#p#q#c#r#s#t#u#v#",
+"$ % w#x#y#z#A#B#B#B#B#C#D#E#F#G#7.e H#I#J#K#L#M#M#N#M#O#P#Q#R#",
+"O S#` T#U#V#W#X#Y#Y#Z#`# $y+.$$#:@:@+$A.@$#$$$Y#Y#Y#Y#%$&$*$=$-$",
+"% ;$l >$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$6.1$2$3$4$5$6$7$8$9$0$a$",
+"6 b$y at 9 c$9 d$7 a e$f$g$h$i$j$k$<$l$m$n$o$8.p$q$` 9 x r$S#; s$t$",
+"u$B v$w$'.x$y$z$A$B$C$D$E$F$G$H$I$I$J$I$K$L$M$N$n.X z at c$O$P$Q$R$",
+"z S$N % T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%6.=%-%;%>%n.. ,%'%)%!%",
+"~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%2 c%d%e%f%g%h%: ",
+"t ,#i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%F#H at A%` w#k B%C%D%E%F%G%",
+"H%D$I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &a .&v +&@&#&$&%&&&*&",
+"=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&1&2&V k 3&4&5&6&7&8&9&0&",
+"0#a&b&c&d&e&f&g&h&i&j&k&l&m&7 n&o&p&q&r&;%A W at 5 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&c&R&S&T&u$8 U&V&W&X&Y&1 Z&`& *",
+".*+*@*#*$*%*&***=*-*;*>*,*'*)*!*#%~*{*]*^*/*# !.(*_*:*<*[*}*|*1*",
+"z 2*3*4*5*6*7*8*9*0*a*b*c* d*e*5+f*f*g*h*$ $ b i*j*k*l*m*n*o*F%",
+"0#@ p*q*r*s*t*u*v*w*x*y*z*(.A*B*f*:$C*D*E*W at 9 ]%F*G*H*I*J*K*L*M*",
+"6 7 .:.N*O*P*Q*R*S*T*>$U*9 V*W*X*L$Y*Z*`* =z 0 .=+=@=#=$=%=&=*="};
diff --git a/debian/patches/gcc-4.7-part2.diff b/debian/patches/gcc-4.7-part2.diff
deleted file mode 100644
index 17b896c..0000000
--- a/debian/patches/gcc-4.7-part2.diff
+++ /dev/null
@@ -1,146 +0,0 @@
-Description: Fix remaining GCC 4.7 build failures
-Author: Gregor Jasny <gjasny at googlemail.com>
-
---- a/source/graphics/blitter.h
-+++ b/source/graphics/blitter.h
-@@ -30,6 +30,7 @@
- #include "../misc.h"
- #include "../palette.h"
- #include "../basegfx.h"
-+#include "lighten.h"
-
- typedef SDLmm::Color Color;
-
---- a/source/graphics/drawing.h
-+++ b/source/graphics/drawing.h
-@@ -31,6 +31,7 @@
- #include "../misc.h"
- #include "../palette.h"
- // #include "../basegfx.h"
-+#include "lighten.h"
-
-
-
-@@ -128,30 +129,6 @@
-
- extern char saturationTranslationTable[256][256];
-
--
--inline SDLmm::Color lighten_Color( SDLmm::Color color, int factor16 )
--{
-- return saturationTranslationTable[color & 0xff][factor16] |
-- (saturationTranslationTable[(color >> 8) & 0xff][factor16] << 8 ) |
-- (saturationTranslationTable[(color >> 16) & 0xff][factor16] << 16 ) |
-- (color & 0xff000000);
--}
--
--inline void lighten_Color( SDLmm::Color* color, int factor16 )
--{
-- *color = lighten_Color( *color, factor16 );
--};
--
--inline SDL_Color lighten_Color( const SDL_Color& color, int factor16 )
--{
-- SDL_Color c = color;
-- c.r = saturationTranslationTable[color.r & 0xff][factor16];
-- c.g = saturationTranslationTable[color.g & 0xff][factor16];
-- c.b = saturationTranslationTable[color.b & 0xff][factor16];
-- return c;
--}
--
--
- template< int pixelsize,
- template<int> class ColorMerger >
- class PutPixel: public ColorMerger<pixelsize>
-@@ -169,7 +146,7 @@
- PixelType* pix = (PixelType*)( surf.pixels() );
- pix += pos.y * surf.pitch()/pixelsize + pos.x;
-
-- assign ( src, pix );
-+ this->assign ( src, pix );
- };
- };
-
---- a/source/itemrepository.cpp
-+++ b/source/itemrepository.cpp
-@@ -88,7 +88,7 @@
- t->filename = fileName;
- t->location = location;
- t->archive = prc.getArchive();
-- add ( t );
-+ this->add ( t );
- }
-
-
-@@ -110,7 +110,7 @@
- t->archive = stream.readString();
- dataLoaderTicker();
-
-- add ( t );
-+ this->add ( t );
- // add ( T::newFromStream(stream ));
- }
- }
---- /dev/null
-+++ b/source/graphics/lighten.h
-@@ -0,0 +1,60 @@
-+/*
-+ This file is part of Advanced Strategic Command; http://www.asc-hq.de
-+ Copyright (C) 1994-2004 Martin Bickel and Marc Schellenberger
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; see the file COPYING. If not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-+ Boston, MA 02111-1307 USA
-+*/
-+
-+#ifndef lightenH
-+ #define lightenH
-+
-+#include <cmath>
-+ #include <map>
-+ #include "loki/static_check.h"
-+ #include "../libs/sdlmm/src/sdlmm.h"
-+ #include "surface.h"
-+
-+#include "../misc.h"
-+ #include "../palette.h"
-+ // #include "../basegfx.h"
-+
-+extern char saturationTranslationTable[256][256];
-+
-+
-+inline SDLmm::Color lighten_Color( SDLmm::Color color, int factor16 )
-+{
-+ return saturationTranslationTable[color & 0xff][factor16] |
-+ (saturationTranslationTable[(color >> 8) & 0xff][factor16] << 8 ) |
-+ (saturationTranslationTable[(color >> 16) & 0xff][factor16] << 16 ) |
-+ (color & 0xff000000);
-+}
-+
-+inline void lighten_Color( SDLmm::Color* color, int factor16 )
-+{
-+ *color = lighten_Color( *color, factor16 );
-+};
-+
-+inline SDL_Color lighten_Color( const SDL_Color& color, int factor16 )
-+{
-+ SDL_Color c = color;
-+ c.r = saturationTranslationTable[color.r & 0xff][factor16];
-+ c.g = saturationTranslationTable[color.g & 0xff][factor16];
-+ c.b = saturationTranslationTable[color.b & 0xff][factor16];
-+ return c;
-+}
-+
-+#endif
-+
diff --git a/debian/patches/no_unittester.patch b/debian/patches/no_unittester.patch
deleted file mode 100644
index 99c05a6..0000000
--- a/debian/patches/no_unittester.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Barry deFreese <bdefreese at debian.org>
-Description: Remove unittester subdir since it is broken.
-Index: asc-2.5.0.0/Makefile.in
-===================================================================
---- asc-2.5.0.0.orig/Makefile.in 2012-05-19 11:30:27.000000000 -0400
-+++ asc-2.5.0.0/Makefile.in 2013-05-25 18:29:00.000000000 -0400
-@@ -291,7 +291,7 @@
- top_srcdir = @top_srcdir@
- zipfound = @zipfound@
- MAINTAINERCLEANFILES = Makefile.in
--SUBDIRS = source data doc installer unittester @extradatadir@
-+SUBDIRS = source data doc installer @extradatadir@
- EXTRA_DIST = asc.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO asc.lsm bootstrap asc.suse.spec mac_configure
- AUTOMAKE_OPTIONS = foreign
- all: config.h
diff --git a/debian/patches/series b/debian/patches/series
index 20e7fe4..38edaa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-gcc-4.7-part2.diff
-no_unittester.patch
-spelling_errors.patch
+spelling-errors.patch
diff --git a/debian/patches/spelling_errors.patch b/debian/patches/spelling-errors.patch
similarity index 65%
rename from debian/patches/spelling_errors.patch
rename to debian/patches/spelling-errors.patch
index 561eb80..893e1b3 100644
--- a/debian/patches/spelling_errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -1,48 +1,41 @@
-Author: Barry deFreese <bdefreese at debian.org>
-Description: Fix spelling errors in binary packages.
-Index: asc-2.5.0.0/source/sgstream.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/sgstream.cpp 2012-05-19 11:30:40.000000000 -0400
-+++ asc-2.5.0.0/source/sgstream.cpp 2013-05-26 07:49:55.000000000 -0400
-@@ -400,7 +400,7 @@
- if ( !filename.empty() ) {
- CGameOptions::Instance()->setChanged();
- if ( writegameoptions( filename ))
-- displayLogMessage ( 6, "A config file has been sucessfully written to " + filename + " ");
-+ displayLogMessage ( 6, "A config file has been successfully written to " + filename + " ");
- else {
- warningMessage("Unable to write file " + filename );
- displayLogMessage ( 6, "Failed to write config file to " + filename + " ");
-Index: asc-2.5.0.0/source/libs/paragui/src/themes/themeloader.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/libs/paragui/src/themes/themeloader.cpp 2012-05-19 11:30:39.000000000 -0400
-+++ asc-2.5.0.0/source/libs/paragui/src/themes/themeloader.cpp 2013-05-26 07:50:24.000000000 -0400
-@@ -480,7 +480,7 @@
- delete file;
- delete[] buff;
-
-- PG_LogMSG("theme '%s' loaded sucessfully", filename.c_str());
-+ PG_LogMSG("theme '%s' loaded successfully", filename.c_str());
+From: Barry deFreese <bdefreese at debian.org>
+Date: Tue, 18 Mar 2014 12:09:37 +0100
+Subject: spelling errors
+
+Forwarded: http://battle-planet.de/pbp/board/viewtopic.php?f=48&t=5101
+---
+ ChangeLog | 2 +-
+ data/campaign/standard/asc008.map.en_US | 2 +-
+ source/dialogs/editgameoptions.cpp | 2 +-
+ source/edglobal.cpp | 2 +-
+ source/gamemap.cpp | 2 +-
+ source/libs/paragui/src/themes/themeloader.cpp | 2 +-
+ source/maped-mainscreen.cpp | 4 ++--
+ source/sg.cpp | 2 +-
+ source/sgstream.cpp | 2 +-
+ source/tools/infopage.cpp | 4 ++--
+ source/tools/infopage.h | 4 ++--
+ source/weatherdialog.cpp | 2 +-
+ source/weatherdialog.h | 4 ++--
+ 13 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 694cadc..13024b2 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -28501,7 +28501,7 @@ The old Changelogs were automatically created from CVS history:
+ * source/: artint.cpp, artint.h, building.cpp, building.h,
+ controls.cpp, mousehnd.cpp, sg.cpp, sg.wpj, strtmesg.cpp,
+ dos/mousehnd.cpp, hexagon/asc.tgt, hexagon/mapedit/edhex.tgt,
+- tools/asctool.tgt, tools/tools.wpj: Fixed crash when transfering
++ tools/asctool.tgt, tools/tools.wpj: Fixed crash when transferring
+ ammo to vehicle with > 8 weapons
- return info.theme;
- }
-Index: asc-2.5.0.0/source/gamemap.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/gamemap.cpp 2012-05-19 11:30:39.000000000 -0400
-+++ asc-2.5.0.0/source/gamemap.cpp 2013-05-26 07:52:09.000000000 -0400
-@@ -2272,7 +2272,7 @@
- { "TrainingIncrement", 2, 1, maxunitexperience, true, false, "training centers: training increment"}, // cgp_trainingIncrement,
- { "ExperienceEffectDivisorAttack", 1, 1, 10, false, false, "experience effect divisor for attack"}, // gp_experienceDivisorAttack
- { "DisableDirectView", 1, 0, 1, false, false, "disable direct View"}, // cgp_disableDirectView
-- { "DisableUnitTrade", 0, 0, 1, false, false, "disable transfering units/buildings to other players"}, // cgp_disableUnitTransfer
-+ { "DisableUnitTrade", 0, 0, 1, false, false, "disable transferring units/buildings to other players"}, // cgp_disableUnitTransfer
- { "ExperienceEffectDivisorDefense", 1, 1, 10, false, false, "experience effect divisor for defense"}, // cgp_experienceDivisorDefense
- { "DebugGameEvents", 0, 0, 2, true, false, "debug game events"}, // cgp_debugEvents
- { "ObjectGrowthRate", 0, 0, maxint, true, false, "Object growth rate (percentage)" }, // cgp_objectGrowthMultiplier
-Index: asc-2.5.0.0/data/campaign/standard/asc008.map.en_US
-===================================================================
---- asc-2.5.0.0.orig/data/campaign/standard/asc008.map.en_US 2012-05-19 11:30:28.000000000 -0400
-+++ asc-2.5.0.0/data/campaign/standard/asc008.map.en_US 2013-05-26 07:52:51.000000000 -0400
+ 2000-06-09 17:13 mbickel
+diff --git a/data/campaign/standard/asc008.map.en_US b/data/campaign/standard/asc008.map.en_US
+index fc8dd5f..bef77f6 100644
+--- a/data/campaign/standard/asc008.map.en_US
++++ b/data/campaign/standard/asc008.map.en_US
@@ -1,6 +1,6 @@
map = asc.getLoadingMap()
--- ===== 170 =======
@@ -51,24 +44,11 @@ Index: asc-2.5.0.0/data/campaign/standard/asc008.map.en_US
asc.setLocalizedEventMessage( map, 170, message )
--- ===== 88 =======
-Index: asc-2.5.0.0/ChangeLog
-===================================================================
---- asc-2.5.0.0.orig/ChangeLog 2012-05-19 11:30:27.000000000 -0400
-+++ asc-2.5.0.0/ChangeLog 2013-05-26 07:53:23.000000000 -0400
-@@ -28501,7 +28501,7 @@
- * source/: artint.cpp, artint.h, building.cpp, building.h,
- controls.cpp, mousehnd.cpp, sg.cpp, sg.wpj, strtmesg.cpp,
- dos/mousehnd.cpp, hexagon/asc.tgt, hexagon/mapedit/edhex.tgt,
-- tools/asctool.tgt, tools/tools.wpj: Fixed crash when transfering
-+ tools/asctool.tgt, tools/tools.wpj: Fixed crash when transferring
- ammo to vehicle with > 8 weapons
-
- 2000-06-09 17:13 mbickel
-Index: asc-2.5.0.0/source/dialogs/editgameoptions.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/dialogs/editgameoptions.cpp 2012-05-19 11:30:38.000000000 -0400
-+++ asc-2.5.0.0/source/dialogs/editgameoptions.cpp 2013-05-26 07:55:02.000000000 -0400
-@@ -325,7 +325,7 @@
+diff --git a/source/dialogs/editgameoptions.cpp b/source/dialogs/editgameoptions.cpp
+index e89463e..67ec719 100644
+--- a/source/dialogs/editgameoptions.cpp
++++ b/source/dialogs/editgameoptions.cpp
+@@ -325,7 +325,7 @@ class EditGameOptions : public ASC_PG_Dialog {
(new PG_PropertyField_String<ASCString>( propertyEditor , "Language Override", &o->languageOverride ));
if ( !mainApp )
@@ -77,32 +57,10 @@ Index: asc-2.5.0.0/source/dialogs/editgameoptions.cpp
PG_Button* ok = new PG_Button( this, PG_Rect( Width() - 100, Height() - 40, 90, 30), "OK" );
-Index: asc-2.5.0.0/source/weatherdialog.h
-===================================================================
---- asc-2.5.0.0.orig/source/weatherdialog.h 2012-05-19 11:30:40.000000000 -0400
-+++ asc-2.5.0.0/source/weatherdialog.h 2013-05-26 07:56:22.000000000 -0400
-@@ -115,7 +115,7 @@
- private:
- static const int xSize;
- static const int ySize;
-- static const string SEPERATOR;
-+ static const string SEPARATOR;
- list<WeatherAreaInformation*> currentList;
- list<WeatherAreaInformation*> removeList;
- list<WeatherAreaInformation*> addList;
-@@ -159,7 +159,7 @@
- private:
- static const int xSize;
- static const int ySize;
-- static const string SEPERATOR;
-+ static const string SEPARATOR;
- list<WindInformation*> currentList;
- list<WindInformation*> addList;
-
-Index: asc-2.5.0.0/source/edglobal.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/edglobal.cpp 2012-05-19 11:30:39.000000000 -0400
-+++ asc-2.5.0.0/source/edglobal.cpp 2013-05-26 07:56:56.000000000 -0400
+diff --git a/source/edglobal.cpp b/source/edglobal.cpp
+index b2b1886..52699d3 100644
+--- a/source/edglobal.cpp
++++ b/source/edglobal.cpp
@@ -121,7 +121,7 @@
"End PolygonMode",
"Smooth coasts",
@@ -112,24 +70,37 @@ Index: asc-2.5.0.0/source/edglobal.cpp
"BI-Resource Mode",
"Resize map",
"Insert BI map",
-Index: asc-2.5.0.0/source/weatherdialog.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/weatherdialog.cpp 2012-05-19 11:30:40.000000000 -0400
-+++ asc-2.5.0.0/source/weatherdialog.cpp 2013-05-26 07:57:31.000000000 -0400
-@@ -411,7 +411,7 @@
- const int AddWindChangeDialog::xSize = 400;
- const int AddWindChangeDialog::ySize = 400;
+diff --git a/source/gamemap.cpp b/source/gamemap.cpp
+index 9850f3a..9d73081 100644
+--- a/source/gamemap.cpp
++++ b/source/gamemap.cpp
+@@ -2276,7 +2276,7 @@ GameParameterSettings gameParameterSettings[gameparameternum ] = {
+ { "TrainingIncrement", 2, 1, maxunitexperience, true, false, "training centers: training increment"}, // cgp_trainingIncrement,
+ { "ExperienceEffectDivisorAttack", 1, 1, 10, false, false, "experience effect divisor for attack"}, // gp_experienceDivisorAttack
+ { "DisableDirectView", 1, 0, 1, false, false, "disable direct View"}, // cgp_disableDirectView
+- { "DisableUnitTrade", 0, 0, 1, false, false, "disable transfering units/buildings to other players"}, // cgp_disableUnitTransfer
++ { "DisableUnitTrade", 0, 0, 1, false, false, "disable transferring units/buildings to other players"}, // cgp_disableUnitTransfer
+ { "ExperienceEffectDivisorDefense", 1, 1, 10, false, false, "experience effect divisor for defense"}, // cgp_experienceDivisorDefense
+ { "DebugGameEvents", 0, 0, 2, true, false, "debug game events"}, // cgp_debugEvents
+ { "ObjectGrowthRate", 0, 0, maxint, true, false, "Object growth rate (percentage)" }, // cgp_objectGrowthMultiplier
+diff --git a/source/libs/paragui/src/themes/themeloader.cpp b/source/libs/paragui/src/themes/themeloader.cpp
+index f58017c..eba04ce 100644
+--- a/source/libs/paragui/src/themes/themeloader.cpp
++++ b/source/libs/paragui/src/themes/themeloader.cpp
+@@ -480,7 +480,7 @@ PG_Theme* PG_Theme::Load(const std::string& xmltheme) {
+ delete file;
+ delete[] buff;
--const string SEPERATOR = ";";
-+const string SEPARATOR = ";";
+- PG_LogMSG("theme '%s' loaded sucessfully", filename.c_str());
++ PG_LogMSG("theme '%s' loaded successfully", filename.c_str());
- AddWindChangeDialog::AddWindChangeDialog(EventWindChangesDialog* ewcd): ASC_PG_Dialog(ewcd, PG_Rect( 0, 0, xSize, ySize ), "Add Weather Area", SHOW_CLOSE ) {
- int valueXPos = static_cast<int>(xSize * 0.75);
-Index: asc-2.5.0.0/source/maped-mainscreen.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/maped-mainscreen.cpp 2012-05-19 11:30:39.000000000 -0400
-+++ asc-2.5.0.0/source/maped-mainscreen.cpp 2013-05-26 08:01:36.000000000 -0400
-@@ -133,8 +133,8 @@
+ return info.theme;
+ }
+diff --git a/source/maped-mainscreen.cpp b/source/maped-mainscreen.cpp
+index cb1846f..87968f8 100644
+--- a/source/maped-mainscreen.cpp
++++ b/source/maped-mainscreen.cpp
+@@ -133,8 +133,8 @@ void Menu::setup()
addbutton ( "Resi~z~e map\tR", act_resizemap );
addbutton ( "set global uniform ~w~eather\tctrl-W", act_setactweatherglobal );
// addbutton ( "configure weather generator", act_setactnewweather );
@@ -140,25 +111,10 @@ Index: asc-2.5.0.0/source/maped-mainscreen.cpp
addbutton ( "Clear all mineral resources", act_clearresources );
currentMenu->addSeparator();
addbutton ( "~S~et turn number", act_setTurnNumber );
-Index: asc-2.5.0.0/source/tools/infopage.h
-===================================================================
---- asc-2.5.0.0.orig/source/tools/infopage.h 2012-05-19 11:30:40.000000000 -0400
-+++ asc-2.5.0.0/source/tools/infopage.h 2013-05-26 08:02:11.000000000 -0400
-@@ -478,8 +478,8 @@
- };
-
- /**
-- at brief Representation of one the building information page containing the information which ressources
-- the building can provide. Research points are treated as one ressource a building can provide
-+ at brief Representation of one the building information page containing the information which resources
-+ the building can provide. Research points are treated as one resource a building can provide
- *@author Kevin Hirschmann
- */
- class BuildingResourcePage: public BuildingInfoPage {
-Index: asc-2.5.0.0/source/sg.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/sg.cpp 2012-05-19 11:30:40.000000000 -0400
-+++ asc-2.5.0.0/source/sg.cpp 2013-05-26 08:04:21.000000000 -0400
+diff --git a/source/sg.cpp b/source/sg.cpp
+index d7c53dc..193daa6 100644
+--- a/source/sg.cpp
++++ b/source/sg.cpp
@@ -43,7 +43,7 @@
available. They are not modified during runtime in any way and are referenced
by the indiividual instances of Vehicle and Building.
@@ -168,11 +124,24 @@ Index: asc-2.5.0.0/source/sg.cpp
turn, ammo, fuel and cargo.
The primary contents of a GameMap are its fields ( #tfield ). Each field has again a pointer
-Index: asc-2.5.0.0/source/tools/infopage.cpp
-===================================================================
---- asc-2.5.0.0.orig/source/tools/infopage.cpp 2012-05-19 11:30:40.000000000 -0400
-+++ asc-2.5.0.0/source/tools/infopage.cpp 2013-05-26 08:05:33.000000000 -0400
-@@ -506,7 +506,7 @@
+diff --git a/source/sgstream.cpp b/source/sgstream.cpp
+index dbe5d8b..06f460c 100644
+--- a/source/sgstream.cpp
++++ b/source/sgstream.cpp
+@@ -400,7 +400,7 @@ int readgameoptions ( const ASCString& filename )
+ if ( !filename.empty() ) {
+ CGameOptions::Instance()->setChanged();
+ if ( writegameoptions( filename ))
+- displayLogMessage ( 6, "A config file has been sucessfully written to " + filename + " ");
++ displayLogMessage ( 6, "A config file has been successfully written to " + filename + " ");
+ else {
+ warningMessage("Unable to write file " + filename );
+ displayLogMessage ( 6, "Failed to write config file to " + filename + " ");
+diff --git a/source/tools/infopage.cpp b/source/tools/infopage.cpp
+index afe4691..39f8634 100644
+--- a/source/tools/infopage.cpp
++++ b/source/tools/infopage.cpp
+@@ -506,7 +506,7 @@ void BuildingCargoPage::buildContent() {
type = addTREntryln(type, cmovemalitypes[h]);
}
}
@@ -181,7 +150,7 @@ Index: asc-2.5.0.0/source/tools/infopage.cpp
endTable();
if ( !cbt.entranceSystems.empty() ) {
addHeadline("Entrance System", 4);
-@@ -734,7 +734,7 @@
+@@ -734,7 +734,7 @@ void UnitCargoPage::buildContent() {
type = addTREntryln(type, cmovemalitypes[h]);
}
}
@@ -190,3 +159,53 @@ Index: asc-2.5.0.0/source/tools/infopage.cpp
endTable();
if ( !cbt.entranceSystems.empty() ) {
addHeadline("Entrance System", 4);
+diff --git a/source/tools/infopage.h b/source/tools/infopage.h
+index d9547c7..8f225f3 100644
+--- a/source/tools/infopage.h
++++ b/source/tools/infopage.h
+@@ -478,8 +478,8 @@ public:
+ };
+
+ /**
+- at brief Representation of one the building information page containing the information which ressources
+- the building can provide. Research points are treated as one ressource a building can provide
++ at brief Representation of one the building information page containing the information which resources
++ the building can provide. Research points are treated as one resource a building can provide
+ *@author Kevin Hirschmann
+ */
+ class BuildingResourcePage: public BuildingInfoPage {
+diff --git a/source/weatherdialog.cpp b/source/weatherdialog.cpp
+index 512fa34..4f20ce1 100644
+--- a/source/weatherdialog.cpp
++++ b/source/weatherdialog.cpp
+@@ -411,7 +411,7 @@ void EventWindChangesDialog::addNewWindInformation(WindInformation* wi) {
+ const int AddWindChangeDialog::xSize = 400;
+ const int AddWindChangeDialog::ySize = 400;
+
+-const string SEPERATOR = ";";
++const string SEPARATOR = ";";
+
+ AddWindChangeDialog::AddWindChangeDialog(EventWindChangesDialog* ewcd): ASC_PG_Dialog(ewcd, PG_Rect( 0, 0, xSize, ySize ), "Add Weather Area", SHOW_CLOSE ) {
+ int valueXPos = static_cast<int>(xSize * 0.75);
+diff --git a/source/weatherdialog.h b/source/weatherdialog.h
+index 984d3f5..9e71951 100644
+--- a/source/weatherdialog.h
++++ b/source/weatherdialog.h
+@@ -115,7 +115,7 @@ bool closeWindow();
+ private:
+ static const int xSize;
+ static const int ySize;
+- static const string SEPERATOR;
++ static const string SEPARATOR;
+ list<WeatherAreaInformation*> currentList;
+ list<WeatherAreaInformation*> removeList;
+ list<WeatherAreaInformation*> addList;
+@@ -159,7 +159,7 @@ bool closeWindow();
+ private:
+ static const int xSize;
+ static const int ySize;
+- static const string SEPERATOR;
++ static const string SEPARATOR;
+ list<WindInformation*> currentList;
+ list<WindInformation*> addList;
+
diff --git a/debian/rules b/debian/rules
index b62a5ab..07961fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,7 @@
#!/usr/bin/make -f
-# rules file for asc (May 2004)
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-CFLAGS += -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_OPTIONS = nocheck
%:
- dh $@
-
-override_dh_auto_configure:
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-paraguitest
+ dh $@ --parallel --with autotools_dev
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..1311b03
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/icons/asc.png
diff --git a/debian/watch b/debian/watch
index 1925d5e..7fe08bb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=3
-
-http://sf.net/asc-hq/asc-([\d.]+)\.tar\.bz2
+http://sf.net/asc-hq/asc-([\d.]+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/asc.git
More information about the Pkg-games-commits
mailing list