debian/0000775000000000000000000000000012257205147007175 5ustar debian/asc-data.install0000664000000000000000000000002612150474140012231 0ustar usr/share/games/asc/* debian/rules0000775000000000000000000000064612257205070010256 0ustar #!/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 %: dh $@ --with autotools_dev override_dh_auto_configure: CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-paraguitest debian/asc.install0000664000000000000000000000016212150474140011323 0ustar debian/tmp/usr/bin/* /usr/games/ doc/unitguide /usr/share/doc/asc/html/ debian/asc.desktop usr/share/applications debian/watch0000664000000000000000000000006712150474140010222 0ustar version=3 http://sf.net/asc-hq/asc-([\d.]+)\.tar\.bz2 debian/asc.manpages0000664000000000000000000000032612150474140011452 0ustar 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 debian/changelog0000664000000000000000000001715112257205131011045 0ustar asc (2.5.0.0-1ubuntu1) trusty; urgency=medium * Use autotools-dev to update config.{sub,guess} for new arches. -- Logan Rosen Fri, 27 Dec 2013 00:04:12 -0500 asc (2.5.0.0-1build1) trusty; urgency=low * No change rebuild for Boost 1.54 transition. -- Dmitrijs Ledkovs Tue, 22 Oct 2013 18:08:36 +0100 asc (2.5.0.0-1) unstable; urgency=low * New upstream release. (Closes: #708835). * Add patch to not build unittester dir since it is broken. * Add patch to fix spelling errors in binary packages. * Remove gcc-4.7 patch, fixed upstream. * Change debian/rules to dh7 style. * Add hardening flags. * Bump Standards Version to 3.9.4. -- Barry deFreese Sat, 25 May 2013 14:49:56 -0400 asc (2.4.0.0-3) unstable; urgency=low * Team upload. * Add patches fixing FTBFS with gcc-4.7, thanks to Gregor Jasny (Closes: #674299) -- Dmitrijs Ledkovs Sun, 27 May 2012 21:38:32 +0100 asc (2.4.0.0-2) unstable; urgency=low [ Felix Geyer ] * Team upload. * Drop build-dependency on libparagui1.1-dev since it's not actually used. - Add libexpat1-dev which was previously pulled in by libparagui1.1-dev. * Add build-arch and build-indep targets. * Fix Vcs-Browser link. * Explicitly build-depend on libjpeg-dev, libfreetype6-dev and libpng-dev. * Bump Standards-Version to 3.9.3, no changes needed. [ Sam Hocevar ] * A few e-mail address updates. -- Felix Geyer Sat, 24 Mar 2012 12:23:18 +0100 asc (2.4.0.0-1) unstable; urgency=low [ Moritz Muehlenhoff ] * New upstream release. (2.4.0) - Drop obsolete patches - Initializes map_edit properly. (Closes: #534171). * Update to standards version 3.8.3 * Switch to source format 3.0 (quilt) (Closes: #538430) * Adding myself to uploaders [ Barry deFreese ] * New upstream release. (2.2.0) [ Alexander Reichle-Schmehl ] * Adopt debian/control to my new name. -- Moritz Muehlenhoff Fri, 01 Jan 2010 22:11:14 +0100 asc (2.1.0.0-2) unstable; urgency=low [ Barry deFreese ] * Update my e-mail address. * Remove unnecessary build-dep on libartsc0-dev. * 010_boost_libs.diff - Look for boost_regex-mt for newer boost libs. * Build-depend on libparagui1.1-dev instead of 1.0. (Closes: #529562). * Bump Standards Version to 3.8.1. (No changes needed). -- Barry deFreese Thu, 28 May 2009 13:49:52 -0400 asc (2.1.0.0-1) unstable; urgency=low [ Barry deFreese ] * New upstream release. + Remove gcc-4.3 patch. Fixed upstream. (Closes: #478838). * Bump Standards Version to 3.8.0. (No changes needed). -- Barry deFreese Tue, 17 Jun 2008 12:29:22 -0400 asc (2.0.1.0-2) unstable; urgency=low [ Ansgar Burchardt ] * Use quilt for patch management * Fix build with g++-4.3 (Closes: #417112) * Improve debian/copyright -- Barry deFreese Sun, 23 Mar 2008 17:55:48 -0400 asc (2.0.1.0-1) unstable; urgency=low [ Eddy Petrișor ] * fixed Homepage semifield [ Gonéri Le Bouder ] * add a watchfile * move homepage from the description to the new Homepage field [ Cyril Brulebois ] * Added Vcs-Svn and Vcs-Browser fields in the control file. [ Barry deFreese ] * Fix make-clean lintian warning * New upstream release * Bump debhelper build-dep to match compat * Add desktop file * Update watch file for new upstream naming * Remove nostrip check from rules * Bump Standards Version to 3.7.3 * Add myself to uploaders -- Barry deFreese Tue, 08 Jan 2008 19:54:18 -0500 asc (1.16.3.0-3) unstable; urgency=low * Adopted package and moved it to the Debian Games Team repository. * Set Bartosz Fenski, Alexander Schmehl and myself as uploaders. * debian/control: + Set policy to 3.7.2. -- Sam Hocevar (Debian packages) Thu, 15 Jun 2006 17:43:41 +0200 asc (1.16.3.0-2) unstable; urgency=low * Orphanage upload. -- Bartosz Fenski Fri, 17 Mar 2006 17:02:53 +0100 asc (1.16.3.0-1) unstable; urgency=low * New upstream bugfix release. -- Bartosz Fenski Mon, 23 Jan 2006 15:57:32 +0100 asc (1.16.2.0-3) unstable; urgency=low * Depends on ${Upstream-Version} of asc-data. (Closes: #343216) -- Bartosz Fenski Sun, 25 Dec 2005 06:17:38 +0100 asc (1.16.2.0-2) unstable; urgency=low * Seems that asc (at least without networking support) works on all archs, so we're going to support them again. (Closes: #322198, #309677) -- Bartosz Fenski Wed, 10 Aug 2005 11:07:34 +0200 asc (1.16.2.0-1) unstable; urgency=low * New upstream release. * Added kfreebsd-i386 to the list of supported archs (Closes: #321353) -- Bartosz Fenski Mon, 8 Aug 2005 12:27:56 +0200 asc (1.16.1.0-1) unstable; urgency=low * New upstream release. * Transition upload for both G++ / aalib. (Closes: #320889) * Upstream officially supports only three archs, so we build only for them for now. * Bumped Standards-Version (no changes needed). -- Bartosz Fenski Thu, 4 Aug 2005 19:43:39 +0200 asc (1.16.0.0-1) unstable; urgency=low * New upstream version. - AMD64 platform is now officially supported. (Closes: #297556) -- Bartosz Fenski Sat, 30 Apr 2005 15:33:21 +0200 asc (1.15.3.0-1) unstable; urgency=low * New upstream release. Contains fixes for AMD64 arch, so dpatch and Andreas's patches are now removed. * Copyright file extended a little. -- Bartosz Fenski Fri, 18 Feb 2005 14:37:21 +0100 asc (1.15.2.1-5) unstable; urgency=low * Added libesd0-dev to build dependencies. -- Bartosz Fenski Tue, 18 Jan 2005 00:48:22 +0100 asc (1.15.2.1-4) unstable; urgency=low * Added libartsc0-dev to build dependencies. -- Bartosz Fenski Mon, 17 Jan 2005 16:55:22 +0100 asc (1.15.2.1-3) unstable; urgency=low * Added patch to fix problems with building on amd64 using gcc-4.0. Thanks to Andreas Jochens for provided patch (Closes: #285482) -- Bartosz Fenski Fri, 14 Jan 2005 16:05:23 +0100 asc (1.15.2.1-2) unstable; urgency=low * Added libxt-dev to Build-Depends. -- Bartosz Fenski Sat, 2 Jan 2005 02:21:24 +0100 asc (1.15.2.1-1) unstable; urgency=low * New upstream version. * s/fenio@o2.pl/fenio@debian.org/ ;) -- Bartosz Fenski Sat, 1 Jan 2005 20:14:21 +0100 asc (1.15.1.0-2) unstable; urgency=low * Using -jX switch for make wasn't good idea. Reverted this change. -- Bartosz Fenski Tue, 9 Nov 2004 10:11:23 +0100 asc (1.15.1.0-1) unstable; urgency=low * New upstream release: - hopefully fixes at least some of the endianness problems, but it has to be checked on autobuilders. * debian/control: - recommends asc-music (Closes: #274670) * debian/rules: - I started using distcc so we're now launching make with -j4 -- Bartosz Fenski Sat, 9 Oct 2004 20:22:24 +0200 asc (1.15.0.0-2) unstable; urgency=medium * Urgency medium due to libtiff transition. * debian/control: - added libparagui1.0 dependency - added dependency on the explicit libsdl-image1.2-dev (Closes: #262789) - added libphysfs-dev dependency (waiting for fixed libparagui) * debian/rules: - removed --disable-paragui from configure switches -- Bartosz Fenski Mon, 1 Aug 2004 22:12:21 +0200 asc (1.15.0.0-1) unstable; urgency=low * Initial Release, finally (Closes: #77705) -- Bartosz Fenski Wed, 23 Jun 2004 06:01:36 +0200 debian/compat0000664000000000000000000000000212150474140010364 0ustar 7 debian/asc-data.dirs0000664000000000000000000000002412150474140011522 0ustar usr/share/games/asc debian/asc.desktop0000664000000000000000000000025412150474140011330 0ustar [Desktop Entry] Name=Advanced Strategic Command GenericName=asc Comment=Defend your Command Type=Application Exec=asc Icon=asc Terminal=false Categories=Game;StrategyGame; debian/asc.menu0000664000000000000000000000020612150474140010620 0ustar ?package(asc):needs="X11" section="Games/Strategy"\ title="asc" command="/usr/games/asc"\ longtitle="Advanced Strategic Command" debian/copyright0000664000000000000000000001252712150474140011130 0ustar This package was debianized by Bartosz Fenski on Tue, 18 May 2004 16:01:36 +0200. It was downloaded from http://www.asc-hq.org/ Upstream Author: Martin Bickel Copyright: Copyright 1994-2006 Martin Bickel 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. 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@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 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 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: 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 , 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 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 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. 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'. debian/source/0000775000000000000000000000000012150474140010466 5ustar debian/source/format0000664000000000000000000000001312150474140011673 0ustar 3.0 (quilt)debian/control0000664000000000000000000000314012257205111010565 0ustar Source: asc Section: games Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Games Team Uploaders: Sam Hocevar , Bartosz Fenski , Alexander Reichle-Schmehl , Barry deFreese , Moritz Muehlenhoff 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, autotools-dev Standards-Version: 3.9.4 Vcs-Svn: svn://svn.debian.org/svn/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 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 human or computer. Package: asc-data Architecture: all 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 human or computer. . This package contains the data files for the ASC game. debian/asc.docs0000664000000000000000000000002412150474140010602 0ustar README TODO AUTHORS debian/patches/0000775000000000000000000000000012150505502010612 5ustar debian/patches/series0000664000000000000000000000007512150474154012041 0ustar gcc-4.7-part2.diff no_unittester.patch spelling_errors.patch debian/patches/gcc-4.7-part2.diff0000664000000000000000000001006212150474140013536 0ustar Description: Fix remaining GCC 4.7 build failures Author: Gregor Jasny --- 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 class ColorMerger > class PutPixel: public ColorMerger @@ -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 + #include + #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 + debian/patches/spelling_errors.patch0000664000000000000000000002603412150505502015051 0ustar Author: Barry deFreese 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()); 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 @@ -1,6 +1,6 @@ map = asc.getLoadingMap() --- ===== 170 ======= -message = [[Thunderlance HQ, Rogul:#crt##crt#Commander, we have found a hoovercraft. This vehicle is damaged and without fuel. The hoovercraft seems to have been for transfering workers to a little island in the west. Perhaps we will find some tools their to rebuild the bridge across the river.#crt##crt#Thor Menser,#crt#Thunderlance Military Advisor #crt#]] +message = [[Thunderlance HQ, Rogul:#crt##crt#Commander, we have found a hoovercraft. This vehicle is damaged and without fuel. The hoovercraft seems to have been for transferring workers to a little island in the west. Perhaps we will find some tools their to rebuild the bridge across the river.#crt##crt#Thor Menser,#crt#Thunderlance Military Advisor #crt#]] 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 @@ (new PG_PropertyField_String( propertyEditor , "Language Override", &o->languageOverride )); if ( !mainApp ) - new PG_PropertyField_Checkbox( propertyEditor, "DEV: Save event message seperately", &o->saveEventMessagesExternal ); + new PG_PropertyField_Checkbox( propertyEditor, "DEV: Save event message separately", &o->saveEventMessagesExternal ); 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 currentList; list removeList; list addList; @@ -159,7 +159,7 @@ private: static const int xSize; static const int ySize; - static const string SEPERATOR; + static const string SEPARATOR; list currentList; list 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 @@ -121,7 +121,7 @@ "End PolygonMode", "Smooth coasts", "Import BI-Map", - "SEPERATOR", + "SEPARATOR", "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; -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(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 @@ addbutton ( "Resi~z~e map\tR", act_resizemap ); addbutton ( "set global uniform ~w~eather\tctrl-W", act_setactweatherglobal ); // addbutton ( "configure weather generator", act_setactnewweather ); - addbutton ( "~C~reate regional ressources", act_createresources ); - addbutton ( "Create global ressources\tctrl+F", act_createresources2 ); + addbutton ( "~C~reate regional resources", act_createresources ); + addbutton ( "Create global resources\tctrl+F", act_createresources2 ); 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 @@ }; /** -@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 +@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 @@ -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. The Vehicletype has information that are shared by all vehicles of this 'type', like speed, - weapon systems, accessable terrain etc, while the vehicle stores things like remaining movement for this + weapon systems, accessible terrain etc, while the vehicle stores things like remaining movement for this 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 @@ type = addTREntryln(type, cmovemalitypes[h]); } } - addTREntry("Building accessable to", type); + addTREntry("Building accessible to", type); endTable(); if ( !cbt.entranceSystems.empty() ) { addHeadline("Entrance System", 4); @@ -734,7 +734,7 @@ type = addTREntryln(type, cmovemalitypes[h]); } } - addTREntry("Unit accessable for", type); + addTREntry("Unit accessible for", type); endTable(); if ( !cbt.entranceSystems.empty() ) { addHeadline("Entrance System", 4); debian/patches/no_unittester.patch0000664000000000000000000000131712150505435014544 0ustar Author: Barry deFreese 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 debian/asc.dirs0000664000000000000000000000006412150474140010617 0ustar usr/games usr/share/man/man6 usr/share/applications