This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository asc.
commit 296e21aa6434cad9d67818646b2c58f116f1f131 Merge: f519f1d 7adb1af Author: Markus Koschany <[email protected]> Date: Mon Dec 7 18:20:59 2015 +0100 Imported Debian patch 2.6.1.0-1 ChangeLog | 2 +- Makefile.in | 22 +- aclocal.m4 | 879 ++++++++++++++++++++- asc.suse.spec | 2 +- compile | 347 ++++++++ config.h.in | 3 - configure | 312 ++++++-- configure.ac | 6 +- data/Makefile | 97 +-- data/Makefile.in | 5 +- data/campaign/standard/asc008.map.en_US | 2 +- data/dialog/Makefile | 97 +-- data/dialog/Makefile.in | 5 +- data/icons/Makefile | 95 +-- data/icons/Makefile.in | 5 +- data/music/Makefile | 95 +-- data/music/Makefile.in | 5 +- data/pbpeditor-icon.png | Bin 0 -> 35890 bytes data/sounds/Makefile | 95 +-- data/sounds/Makefile.in | 5 +- data/unittests/unittest-pathfinding.map | Bin 1023 -> 1044 bytes debian/changelog | 20 + debian/clean | 4 + debian/control | 8 +- debian/copyright | 2 +- debian/patches/reproducible-build.patch | 46 ++ debian/patches/series | 2 +- debian/patches/spelling-errors.patch | 211 ----- debian/rules | 7 +- doc/Makefile.in | 5 +- doc/manpages/Makefile.in | 5 +- doc/unitguide/Makefile.in | 5 +- doc/unitguide/output/Makefile.in | 5 +- extra-data/Makefile.in | 5 +- installer/Makefile.am | 1 + installer/Makefile.in | 6 +- installer/asc.nsi.in | 1 + ltmain.sh | 4 +- m4/libtool.m4 | 12 +- missing | 4 +- source/ASCStringHelpers.h | 6 +- source/Makefile.in | 5 +- source/actions/Makefile.in | 5 +- source/actions/actioncontainer.cpp | 6 +- source/actions/actioncontainer.h | 6 +- source/actions/moveunitcommand.cpp | 4 +- source/actions/moveunitcommand.h | 2 +- source/actions/servicing.cpp | 4 +- source/actions/servicing.h | 12 +- source/ai/Makefile.in | 5 +- source/ai/base.cpp | 8 +- source/ai/misc.cpp | 4 +- source/ai/tactics.cpp | 8 + source/asc-mainscreen.cpp | 9 +- source/ascstring.h | 5 +- source/astar2.cpp | 59 +- source/attack.cpp | 34 +- source/basegfx.cpp | 2 +- source/basestrm.cpp | 4 +- source/basestrm.h | 2 +- source/campaignactionrecorder.cpp | 6 +- source/campaignactionrecorder.h | 2 +- source/clparser/Makefile.in | 5 +- source/containerbase.cpp | 4 +- source/containerbase.h | 10 +- source/dashboard.cpp | 40 +- source/dashboard.h | 2 +- source/dataversioncheck.cpp | 2 +- source/dialogs/Makefile.am | 2 +- source/dialogs/Makefile.in | 10 +- source/dialogs/actionmanager.cpp | 8 +- source/dialogs/admingame.cpp | 14 +- source/dialogs/alliancesetup.cpp | 14 +- source/dialogs/ammotransferdialog.cpp | 14 +- source/dialogs/attackpanel.cpp | 2 +- source/dialogs/buildingtypeselector.h | 4 +- source/dialogs/cargodialog.cpp | 67 +- source/dialogs/cargoeditor.cpp | 16 +- source/dialogs/cargowidget.cpp | 14 +- source/dialogs/cargowidget.h | 22 +- source/dialogs/choosetech.cpp | 16 +- source/dialogs/editgameoptions.cpp | 6 +- source/dialogs/editmapparam.cpp | 10 +- source/dialogs/editplayerdata.cpp | 2 +- source/dialogs/edittechadapter.cpp | 16 +- source/dialogs/eventeditor.cpp | 26 +- source/dialogs/eventinfo.cpp | 66 ++ source/dialogs/eventinfo.h | 29 + source/dialogs/exchangegraphics.cpp | 18 +- source/dialogs/fieldmarker.cpp | 8 +- source/dialogs/fileselector.cpp | 20 +- source/dialogs/fileselector.h | 12 +- source/dialogs/gotoposition.cpp | 6 +- source/dialogs/importbi3map.cpp | 4 +- source/dialogs/internalAmmoTransferDialog.cpp | 6 +- source/dialogs/locatefile.cpp | 4 +- source/dialogs/mailoptionseditor.cpp | 8 +- source/dialogs/messagedialog.cpp | 6 +- source/dialogs/newgame.cpp | 22 +- source/dialogs/newmap.cpp | 6 +- source/dialogs/nextcampaignmap.cpp | 2 +- source/dialogs/playersetup.cpp | 4 +- source/dialogs/pwd_dlg.cpp | 14 +- source/dialogs/replayrecorder.cpp | 4 +- source/dialogs/selectionwindow.cpp | 8 +- source/dialogs/selectionwindow.h | 10 +- source/dialogs/soundsettings.cpp | 51 +- source/dialogs/taskmanager.cpp | 8 +- source/dialogs/unitcounting.cpp | 2 +- source/dialogs/unitguidedialog.cpp | 12 +- source/dialogs/unitinfodialog.cpp | 12 +- source/dialogs/unitnaming.cpp | 6 +- source/dialogs/vehicleproductionselection.cpp | 18 +- source/dialogs/vehicleproductionselection.h | 6 +- source/dialogs/vehicletypeselector.cpp | 8 +- source/dialogs/vehicletypeselector.h | 8 +- source/dlg_box.cpp | 4 +- source/doc/Makefile.in | 5 +- source/docs/Makefile.in | 5 +- source/docs/en/Makefile.in | 5 +- source/ed_mapcomponent.cpp | 2 +- source/ed_mapcomponent.h | 2 +- source/edgen.cpp | 2 +- source/edglobal.cpp | 8 +- source/edglobal.h | 6 +- source/edmain.cpp | 13 +- source/edmisc.cpp | 8 +- source/edselfnt.cpp | 10 +- source/gamedialog.cpp | 86 +- source/gameevent_dialogs.cpp | 4 +- source/gameevents.cpp | 32 +- source/gameevents.h | 18 +- source/gameeventsystem.h | 2 +- source/gamemap.cpp | 12 +- source/gamemap.h | 26 +- source/graphics/Makefile.in | 5 +- source/guifunctions.cpp | 10 +- source/guiiconhandler.cpp | 30 +- source/guiiconhandler.h | 4 + source/infopopup.cpp | 2 +- source/itemrepository.cpp | 4 +- source/itemrepository.h | 2 +- source/libs/Makefile.in | 5 +- source/libs/loki-0.1.6/Makefile.in | 5 +- source/libs/paragui/Makefile.in | 5 +- source/libs/paragui/VisualC/paragui_dynamic.vcproj | 31 +- source/libs/paragui/include/pgapplication.h | 17 +- source/libs/paragui/include/pgbutton.h | 9 +- source/libs/paragui/include/pgdropdown.h | 13 +- source/libs/paragui/include/pglineedit.h | 21 +- source/libs/paragui/include/pglistbox.h | 6 +- source/libs/paragui/include/pgmenubar.h | 5 +- source/libs/paragui/include/pgmessageobject.h | 59 +- source/libs/paragui/include/pgmultilineedit.h | 2 +- source/libs/paragui/include/pgpopupmenu.h | 14 +- .../paragui/include/pgpropertyeditor_linefield.h | 4 +- .../libs/paragui/include/pgpropertyfield_button.h | 6 +- .../paragui/include/pgpropertyfield_checkbox.h | 10 +- .../paragui/include/pgpropertyfield_dropdown.h | 8 +- .../paragui/include/pgpropertyfield_intdropdown.h | 6 +- .../libs/paragui/include/pgpropertyfield_integer.h | 2 +- .../libs/paragui/include/pgpropertyfield_string.h | 2 +- source/libs/paragui/include/pgradiobutton.h | 6 +- source/libs/paragui/include/pgrichedit.h | 2 +- source/libs/paragui/include/pgscrollarea.h | 5 +- source/libs/paragui/include/pgscrollbar.h | 12 +- source/libs/paragui/include/pgscrollwidget.h | 8 +- source/libs/paragui/include/pgsigconvert.h | 211 ----- source/libs/paragui/include/pgsignals.h | 127 --- source/libs/paragui/include/pgslider.h | 10 +- source/libs/paragui/include/pgspinnerbox.h | 7 +- source/libs/paragui/include/pgtimerobject.h | 7 +- source/libs/paragui/include/pgtooltiphelp.h | 8 +- source/libs/paragui/include/pgwidget.h | 13 +- source/libs/paragui/include/pgwindow.h | 7 +- source/libs/paragui/src/Makefile.in | 5 +- source/libs/paragui/src/core/Makefile.am | 1 - source/libs/paragui/src/core/Makefile.in | 12 +- source/libs/paragui/src/core/pgapplication.cpp | 27 +- source/libs/paragui/src/core/pgsigconvert.cpp | 37 - source/libs/paragui/src/draw/Makefile.in | 5 +- source/libs/paragui/src/font/Makefile.in | 5 +- source/libs/paragui/src/themes/Makefile.in | 5 +- source/libs/paragui/src/themes/themeloader.cpp | 2 +- source/libs/paragui/src/widgets/Makefile.in | 5 +- source/libs/paragui/src/widgets/pgbutton.cpp | 2 +- .../libs/paragui/src/widgets/pgcolorselector.cpp | 2 +- source/libs/paragui/src/widgets/pgdropdown.cpp | 13 +- source/libs/paragui/src/widgets/pglineedit.cpp | 12 +- source/libs/paragui/src/widgets/pgmenubar.cpp | 12 +- source/libs/paragui/src/widgets/pgmessagebox.cpp | 6 +- .../libs/paragui/src/widgets/pgmultilineedit.cpp | 6 +- source/libs/paragui/src/widgets/pgpopupmenu.cpp | 4 +- source/libs/paragui/src/widgets/pgradiobutton.cpp | 2 +- source/libs/paragui/src/widgets/pgrichedit.cpp | 10 +- source/libs/paragui/src/widgets/pgscrollbar.cpp | 20 +- source/libs/paragui/src/widgets/pgscrollwidget.cpp | 49 +- source/libs/paragui/src/widgets/pgslider.cpp | 6 +- source/libs/paragui/src/widgets/pgspinnerbox.cpp | 8 +- source/libs/paragui/src/widgets/pgtooltiphelp.cpp | 20 +- source/libs/paragui/src/widgets/pgwidget.cpp | 6 +- source/libs/paragui/src/widgets/pgwindow.cpp | 8 +- source/libs/paragui/src/ystring/Makefile.in | 5 +- source/libs/revel/Makefile.in | 9 +- source/libs/sdl_sound/Makefile.in | 9 +- source/libs/sdlmm/Makefile.in | 5 +- source/libs/sdlmm/src/Makefile.in | 5 +- source/libs/triangul/Makefile.in | 9 +- source/loadbi3.cpp | 12 +- source/loaders.cpp | 4 +- source/loaders.h | 2 +- source/loggingoutput.cpp | 2 +- source/loggingoutput.h | 2 +- source/lua/Makefile.in | 5 +- source/lua/common.cpp | 4 +- source/mainscreenwidget.cpp | 12 +- source/mainscreenwidget.h | 4 +- source/mapdisplay.cpp | 16 +- source/mapdisplay.h | 18 +- source/maped-mainscreen.cpp | 58 +- source/maped-mainscreen.h | 4 +- source/messagedlg.cpp | 22 +- source/misc.cpp | 4 +- source/network/Makefile.in | 5 +- source/network/pbem-server.cpp | 2 +- source/newfont.cpp | 4 +- source/oldlzw.cpp | 35 +- source/overviewmappanel.cpp | 18 +- source/overviewmappanel.h | 4 +- source/packagerepository.cpp | 2 +- source/packagerepository.h | 2 +- source/paradialog.cpp | 64 +- source/paradialog.h | 17 +- source/player.cpp | 6 +- source/player.h | 4 +- source/prehistoricevents.cpp | 2 +- source/reactionfire.cpp | 18 +- source/replay.cpp | 10 +- source/resourcenet.cpp | 2 +- source/resourcenet.h | 2 +- source/resourceplacementdialog.cpp | 32 +- source/resourceplacementdialog.h | 5 - source/sdl/Makefile.in | 5 +- source/sdl/events.cpp | 2 +- source/sdl/graphicsqueue.h | 2 +- source/sdl/sdl.vcproj | 4 +- source/sg.cpp | 62 +- source/sg.h | 2 +- source/sgstream.cpp | 2 +- source/simplestream.cpp | 5 +- source/spfst.cpp | 20 +- source/spfst.h | 20 +- source/stdio-errorhandler.cpp | 12 +- source/stdio-errorhandler.h | 2 +- source/strtmesg.cpp | 2 +- source/tasks/Makefile.in | 5 +- source/tasks/taskcontainer.cpp | 8 +- source/tasks/taskcontainer.h | 2 +- source/tasks/taskhibernatingcontainer.cpp | 2 +- source/tools/Makefile.in | 5 +- source/tools/infopage.cpp | 4 +- source/tools/infopage.h | 4 +- source/tools/lib/Makefile.in | 5 +- source/tools/linux/Makefile.in | 5 +- source/tools/win/demount.vcproj | 6 +- source/tools/win/makegfx.vcproj | 8 +- source/tools/win/mount.vcproj | 4 +- source/tools/win/tools.vcproj | 8 +- source/tools/win/weaponguide.vcproj | 14 +- source/unittests/Makefile.in | 5 +- source/unittests/main.cpp | 28 +- source/unittests/movementtest.cpp | 26 + source/unittests/repairtest.cpp | 4 +- source/unix/Makefile.in | 5 +- source/unix/asc/Makefile.in | 5 +- source/unix/mapeditor/Makefile.in | 5 +- source/unix/pbpedit/Makefile.in | 5 +- source/util/Makefile.in | 5 +- source/util/messaginghub.h | 18 +- source/vehicle.cpp | 4 + source/video/Makefile.in | 5 +- source/viewcalculation.cpp | 2 +- source/viewcalculation.h | 2 +- source/weaponrangelayer.cpp | 2 +- source/weatherarea.cpp | 4 +- source/weatherarea.h | 2 +- source/weathercast.cpp | 18 +- source/weatherdialog.cpp | 56 +- source/weatherdialog.h | 4 +- source/widgets/Makefile.in | 5 +- source/widgets/autoprogressbar.cpp | 4 +- source/widgets/autoprogressbar.h | 2 +- source/widgets/dropdownselector.cpp | 8 +- source/widgets/dropdownselector.h | 2 +- source/widgets/multilistbox.cpp | 4 +- source/win32/Makefile.in | 5 +- source/win32/msvc/ASC/ASC.vcproj | 18 +- source/win32/msvc/Makefile | 95 +-- source/win32/msvc/Makefile.in | 5 +- source/win32/msvc/mapeditor/mapeditor.vcproj | 16 +- source/win32/msvc/pbpeditor/mapeditor-icon.ico | Bin 2238 -> 0 bytes source/win32/msvc/pbpeditor/mapeditor.rc | 2 +- source/win32/msvc/pbpeditor/pbpeditor-icon.ico | Bin 0 -> 237345 bytes source/win32/msvc/pbpeditor/pbpeditor.vcproj | 20 +- source/win32/win32-errormsg.cpp | 4 +- source/win32/win32-errormsg.h | 2 +- test-driver | 20 +- unittester/Makefile.in | 5 +- 308 files changed, 3464 insertions(+), 2217 deletions(-) diff --cc debian/changelog index 58c9f91,0000000..c71193b mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,279 -1,0 +1,299 @@@ ++asc (2.6.1.0-1) unstable; urgency=medium ++ ++ [ Moritz Muehlenhoff ] ++ * Remove myself from uploaders. ++ ++ [ Markus Koschany ] ++ * Imported Upstream version 2.6.1.0. ++ * Switch to libsigc++-2.0-dev. (Closes: #672391) ++ * Add get-orig-source target. ++ * Update my e-mail address. ++ * Drop spelling-errors.patch. Merged upstream. ++ * Declare compliance with Debian Policy 3.9.6. ++ * d/rules: Remove export DEB_BUILD_OPTIONS = nocheck ++ * Override dh_auto_test to prevent a FTBFS due to non-functional tests. ++ * Add reproducible-build.patch and make the build reproducible. ++ * Move the package to Git. ++ * Add clean file and ensure that the game can be built twice in a row. ++ ++ -- Markus Koschany <[email protected]> Mon, 07 Dec 2015 18:20:59 +0100 ++ +asc (2.6.0.0-1) unstable; urgency=medium + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org. + + [ Alexander Reichle-Schmehl ] + * Removed myself from uploaders. + + [ 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. + * asc.docs: Do not install README anymore. + * 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 <[email protected]> Thu, 20 Mar 2014 14:50:20 +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Sat, 24 Mar 2012 12:23:18 +0100 + +asc (2.4.0.0-1) unstable; urgency=low + + [ Moritz Muehlenhoff ] + * New upstream release. + - 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. + + [ Alexander Reichle-Schmehl ] + * Adopt debian/control to my new name. + + -- Moritz Muehlenhoff <[email protected]> Fri, 01 Jan 2010 22:11:14 +0100 + +asc (2.1.0.0-2) unstable; urgency=low + + * 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 <[email protected]> Thu, 28 May 2009 13:49:52 -0400 + +asc (2.1.0.0-1) unstable; urgency=low + + * New upstream release. + - Remove gcc-4.3 patch. Fixed upstream. (Closes: #478838). + * Bump Standards Version to 3.8.0. (No changes needed). + + -- Barry deFreese <[email protected]> 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 <[email protected]> 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 <[email protected]> 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. + * Bump Standards Version to 3.7.2. + + -- Sam Hocevar (Debian packages) <[email protected]> Thu, 15 Jun 2006 17:43:41 +0200 + +asc (1.16.3.0-2) unstable; urgency=low + + * Orphan package. + + -- Bartosz Fenski <[email protected]> Fri, 17 Mar 2006 17:02:53 +0100 + +asc (1.16.3.0-1) unstable; urgency=low + + * New upstream release. + + -- Bartosz Fenski <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Thu, 4 Aug 2005 19:43:39 +0200 + +asc (1.16.0.0-1) unstable; urgency=low + + * New upstream release: + - amd64 is now officially supported. (Closes: #297556) + + -- Bartosz Fenski <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Sat, 2 Jan 2005 02:21:24 +0100 + +asc (1.15.2.1-1) unstable; urgency=low + + * New upstream release. + * Use my Debian email address for maintainership. + + -- Bartosz Fenski <[email protected]> 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 <[email protected]> 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 <[email protected]> Sat, 9 Oct 2004 20:22:24 +0200 + +asc (1.15.0.0-2) unstable; urgency=medium + + * Urgency set to 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 <[email protected]> Mon, 1 Aug 2004 22:12:21 +0200 + +asc (1.15.0.0-1) unstable; urgency=low + + * Initial release. (Closes: #77705) + + -- Bartosz Fenski <[email protected]> Wed, 23 Jun 2004 06:01:36 +0200 + diff --cc debian/clean index 0000000,0000000..7c03bd5 new file mode 100644 --- /dev/null +++ b/debian/clean @@@ -1,0 -1,0 +1,4 @@@ ++data/icons/Makefile ++data/sounds/Makefile ++extra-data/Makefile ++source/clparser/Makefile diff --cc debian/control index da7062f,0000000..1c488bf mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,60 -1,0 +1,60 @@@ +Source: asc +Section: games +Priority: optional +Maintainer: Debian Games Team <[email protected]> +Uploaders: + Sam Hocevar <[email protected]>, + Bartosz Fenski <[email protected]>, + Barry deFreese <[email protected]>, - Markus Koschany <[email protected]> ++ Markus Koschany <[email protected]> +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, ++ libsigc++-2.0-dev, + libwxgtk3.0-dev, + libxt-dev, + zip - Standards-Version: 3.9.5 ++Standards-Version: 3.9.6 +Vcs-Git: git://anonscm.debian.org/pkg-games/asc.git - Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/asc/ ++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/asc.git +Homepage: http://www.asc-hq.org + +Package: asc +Architecture: any +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 + 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 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 --cc debian/copyright index 19e5849,0000000..d5775c1 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,93 -1,0 +1,93 @@@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Martin Bickel <[email protected]> +Upstream-Name: Advanced Strategic Command (ASC) +Source: http://www.asc-hq.org + +Files: * +Copyright: 1994-2013, Martin Bickel <[email protected]> + 1994-2010, Marc Schellenberger + 1994-2010, Steffen Fröhlich + 1994-2010, Daniel Korbely + 1996-2013, Free Software Foundation + 2005, Kevin Hirschmann <hirsch@dhcppc0> + 1999, Rainer Johanni <[email protected]> + 2004, Cort Stratton <cort at cortstratton dot org> + 2001, David Hedbor <[email protected]> +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 <[email protected]> + 2006, Sam Hocevar (Debian packages) <[email protected]> + 2010, Moritz Muehlenhoff <[email protected]> + 2012, Felix Geyer <[email protected]> + 2012, Dmitrijs Ledkovs <[email protected]> + 2008-2013, Barry deFreese <[email protected]> - 2014, Markus Koschany <[email protected]> ++ 2014-2015, Markus Koschany <[email protected]> +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. + +Files: source/libs/rand/* +Copyright: 1996, 1999 Free Software Foundation, Inc + 1996, Ulrich Drepper <[email protected]> +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 <[email protected]>, 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'. + +Files: source/libs/triangul/* +Copyright: Atul Narkhede <[email protected]> +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. + +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'. + +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 --cc debian/patches/reproducible-build.patch index 0000000,0000000..978b612 new file mode 100644 --- /dev/null +++ b/debian/patches/reproducible-build.patch @@@ -1,0 -1,0 +1,46 @@@ ++From: Markus Koschany <[email protected]> ++Date: Mon, 7 Dec 2015 18:36:05 +0100 ++Subject: reproducible build ++ ++--- ++ source/strtmesg.cpp | 8 ++++---- ++ 1 file changed, 4 insertions(+), 4 deletions(-) ++ ++diff --git a/source/strtmesg.cpp b/source/strtmesg.cpp ++index a7c0189..914334c 100644 ++--- a/source/strtmesg.cpp +++++ b/source/strtmesg.cpp ++@@ -63,7 +63,7 @@ const char* getFullVersionString ( ) ++ ASCString getVersionAndCompilation() ++ { ++ char startupmessagebuffer[1000]; ++- sprintf( startupmessagebuffer, "Version: %s\nCompiled %s %s\n", asc_release, __DATE__, __TIME__); +++ sprintf( startupmessagebuffer, "Version: %s\nCompiled %s %s\n", asc_release); ++ return ASCString(startupmessagebuffer); ++ } ++ ++@@ -76,21 +76,21 @@ ASCString getstartupmessage ( ) ++ ASCString getaboutmessage ( ) ++ { ++ char startupmessagebuffer[1000]; ++- sprintf( startupmessagebuffer, "Advanced Strategic Command : %s ; made %s ; %s", asc_release, __DATE__, __TIME__); +++ sprintf( startupmessagebuffer, "Advanced Strategic Command : %s ; made %s ; %s", asc_release); ++ return ASCString(startupmessagebuffer); ++ } ++ ++ ASCString kgetstartupmessage ( ) ++ { ++ char startupmessagebuffer[1000]; ++- sprintf( startupmessagebuffer, "\n Mapeditor for\nAdvanced Strategic Command \n%s\nmade %s %s\n\n", asc_release, __DATE__, __TIME__); +++ sprintf( startupmessagebuffer, "\n Mapeditor for\nAdvanced Strategic Command \n%s\nmade %s %s\n\n", asc_release); ++ return ASCString(startupmessagebuffer); ++ } ++ ++ ASCString kgetaboutmessage ( ) ++ { ++ char startupmessagebuffer[1000]; ++- sprintf( startupmessagebuffer, "Mapeditor for Advanced Strategic Command : %s ; made %s ; %s", asc_release, __DATE__, __TIME__); +++ sprintf( startupmessagebuffer, "Mapeditor for Advanced Strategic Command : %s ; made %s ; %s", asc_release); ++ return ASCString(startupmessagebuffer); ++ } ++ diff --cc debian/patches/series index 38edaa7,0000000..55077d0 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,1 -1,0 +1,1 @@@ - spelling-errors.patch ++reproducible-build.patch diff --cc debian/rules index 07961fe,0000000..9a6a22b mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,7 -1,0 +1,12 @@@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - export DEB_BUILD_OPTIONS = nocheck + +%: + dh $@ --parallel --with autotools_dev ++ ++override_dh_auto_test: ++ # Do nothing here to prevent a FTBFS ++ ++get-orig-source: ++ uscan --verbose --download-current-version --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/asc.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
