packages feed

LambdaHack 0.8.1.0 → 0.8.1.1

raw patch · 8 files changed

+196/−49 lines, 8 filesdep ~asyncPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: async

API changes (from Hackage documentation)

Files

CHANGELOG.md view
@@ -1,3 +1,10 @@+## [v0.8.1.1](https://github.com/LambdaHack/LambdaHack/compare/v0.8.1.0...v0.8.1.1)++- no player-visible changes+- make it possible to compile with old async package+- rewrite copyright information according to Debian format+- make github display the correct main license+ ## [v0.8.1.0](https://github.com/LambdaHack/LambdaHack/compare/v0.8.0.0...v0.8.1.0)  - no player-visible changes
+ COPYLEFT view
@@ -0,0 +1,157 @@+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/+Upstream-Name: LambdaHack+Upstream-Contact: Mikolaj Konarski <mikolaj.konarski@funktory.com>+Source: https://hackage.haskell.org/package/LambdaHack++Files: *+Copyright: 2008-2011 Andres Loeh+           2010-2018 Mikolaj Konarski and others (see git history)+License: BSD-3-clause++Files: GameDefinition/fonts/*.fon+Copyright: 1997-2016 Leon Marrick+           1997-2016 Sheldon Simms III+           1997-2016 Nick McConnell+           2016-2018 Mikolaj Konarski+License: GPL-2++Files: GameDefinition/fonts/Fix15Mono-Bold.woff+Copyright: 2012-2015 The Mozilla Foundation and Telefonica S.A+           2016-2018 Mikolaj Konarski+License: OFL-1.1++Files: debian/*+Copyright: held by the contributors mentioned in debian/changelog+License: BSD-3-clause++License: BSD-3-clause+ Redistribution and use in source and binary forms, with or without+ modification, are permitted provided that the following conditions+ are met:+ 1. Redistributions of source code must retain the above copyright notice, this+    list of conditions and the following disclaimer.+ 2. Redistributions in binary form must reproduce the above copyright notice,+    this list of conditions and the following disclaimer in the documentation+    and/or other materials provided with the distribution.+ 3. Neither the name of the copyright holder nor the names of its+    contributors may be used to endorse or promote products derived from+    this software without specific prior written permission.+ .+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.++License: GPL-2+ This program is free software; you can redistribute it+ and/or modify it under the terms of the GNU General Public+ License, version 2, as published by the Free Software Foundation+ .+ 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 package; if not, write to the Free+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,+ Boston, MA  02110-1301 USA+ .+ On Debian systems, the full text of the GNU General Public+ License version 2 can be found in the file+ `/usr/share/common-licenses/GPL-2'.++License: OFL-1.1+ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+ .+ PREAMBLE+ The goals of the Open Font License (OFL) are to stimulate worldwide+ development of collaborative font projects, to support the font+ creation efforts of academic and linguistic communities, and to+ provide a free and open framework in which fonts may be shared and+ improved in partnership with others.+ .+ The OFL allows the licensed fonts to be used, studied, modified and+ redistributed freely as long as they are not sold by themselves. The+ fonts, including any derivative works, can be bundled, embedded,+ redistributed and/or sold with any software provided that any+ reserved names are not used by derivative works. The fonts and+ derivatives, however, cannot be released under any other type of+ license. The requirement for fonts to remain under this license+ does not apply to any document created using the fonts or their+ derivatives.+ .+ DEFINITIONS+ Font Software refers to the set of files released by the+ Copyright Holder(s) under this license and clearly marked as such.+ This may include source files, build scripts and documentation.+ .+ Reserved Font Name refers to any names specified as such after+ the copyright statement(s).+ .+ Original Version refers to the collection of Font Software+ components as distributed by the Copyright Holder(s).+ .+ Modified Version refers to any derivative made by adding to,+ deleting, or substituting in part or in whole any of the components+ of the Original Version, by changing formats or by porting the Font+ Software to a new environment.+ .+ Author refers to any designer, engineer, programmer, technical+ writer or other person who contributed to the Font Software.+ .+ PERMISSION & CONDITIONS+ Permission is hereby granted, free of charge, to any person+ obtaining a copy of the Font Software, to use, study, copy, merge,+ embed, modify, redistribute, and sell modified and unmodified copies+ of the Font Software, subject to the following conditions:+ .+ 1) Neither the Font Software nor any of its individual components,+    in Original or Modified Versions, may be sold by itself.+ .+ 2) Original or Modified Versions of the Font Software may be bundled,+    redistributed and/or sold with any software, provided that each+    copy contains the above copyright notice and this license. These+    can be included either as stand-alone text files, human-readable+    headers or in the appropriate machine-readable metadata fields+    within text or binary files as long as those fields can be easily+    viewed by the user.+ .+ 3) No Modified Version of the Font Software may use the Reserved Font+    Name(s) unless explicit written permission is granted by the+    corresponding Copyright Holder. This restriction only applies to+    the primary font name as presented to the users.+ .+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the+    Font Software shall not be used to promote, endorse or advertise+    any Modified Version, except to acknowledge the contribution(s)+    of the Copyright Holder(s) and the Author(s) or with their+    explicit written permission.+ .+ 5) The Font Software, modified or unmodified, in part or in whole,+    must be distributed entirely under this license, and must not be+    distributed under any other license. The requirement for fonts to+    remain under this license does not apply to any document created+    using the Font Software.+ .+ TERMINATION+ This license becomes null and void if any of the above conditions+ are not met.+ .+ DISCLAIMER+ THE FONT SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL+ THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+ LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR+ CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR+ OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT+ SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
CREDITS view
@@ -13,13 +13,13 @@ Sheldon Simms III and Nick McConnell and released by them under GNU GPL version 2. Any further modifications by authors of LambdaHack are also released under GNU GPL version 2. The licence file is at-GameDefinition/fonts/LICENSE.16x16x+GameDefinition/fonts/LICENSE.16x16x in the source code tree.  Font Fix15Mono-Bold.woff is a modified version of https://github.com/mozilla/Fira/blob/master/ttf/FiraMono-Bold.ttf that is copyright 2012-2015, The Mozilla Foundation and Telefonica S.A. The modified font is released under the SIL Open Font License, as seen in-GameDefinition/fonts/LICENSE.Fix15Mono-Bold+GameDefinition/fonts/LICENSE.Fix15Mono-Bold in the source code tree. Modifications were performed with font editor FontForge and are as follows: * straighten and enlarge #, enlarge %, &, ', +, \,, -, :, ;, O, _, ` * centre a few other glyphs
GameDefinition/Main.hs view
@@ -49,11 +49,13 @@   a <- async $ tieKnot serverOptions   resOrEx <- waitCatch a   let unwrapEx e = case Ex.fromException e of+#if MIN_VERSION_async(2,2,1)         Just (ExceptionInLinkedThread _ ex) -> unwrapEx ex+#endif         _ -> e   case resOrEx of     Right () -> return ()     Left e -> case Ex.fromException $ unwrapEx e of       Just ExitSuccess ->         exitSuccess  -- we are in the main thread, so here it really exits-      _ -> Ex.throwIO e+      _ -> Ex.throwIO $ unwrapEx e
LICENSE view
@@ -1,47 +1,26 @@-Fonts 16x16x.fon, 8x8x.fon and 8x8xb.fon are are taken from-https://github.com/angband/angband, copyrighted by Leon Marrick,-Sheldon Simms III and Nick McConnell and released by them under-GNU GPL version 2. Any further modifications by authors of LambdaHack-are also released under GNU GPL version 2. The licence file is at-GameDefinition/fonts/LICENSE.16x16x--Font Fix15Mono-Bold.woff is a modified version of-https://github.com/mozilla/Fira/blob/master/ttf/FiraMono-Bold.ttf-that is copyright 2012-2015, The Mozilla Foundation and Telefonica S.A.-The modified font is released under the SIL Open Font License, as seen in-GameDefinition/fonts/LICENSE.Fix15Mono-Bold--The whole LambdaHack is licensed under the BSD3 licence, as follows.- BSD 3-Clause License -Copyright (c) 2008--2011 Andres Loeh-Copyright (c) 2010--2018 Mikolaj Konarski and others (see git history)- All rights reserved.  Redistribution and use in source and binary forms, with or without-modification, are permitted provided that the following conditions are met:--* Redistributions of source code must retain the above copyright notice, this-  list of conditions and the following disclaimer.--* Redistributions in binary form must reproduce the above copyright notice,-  this list of conditions and the following disclaimer in the documentation-  and/or other materials provided with the distribution.--* Neither the name of the copyright holder nor the names of its-  contributors may be used to endorse or promote products derived from-  this software without specific prior written permission.+modification, are permitted provided that the following conditions+are met:+1. Redistributions of source code must retain the above copyright notice, this+   list of conditions and the following disclaimer.+2. Redistributions in binary form must reproduce the above copyright notice,+   this list of conditions and the following disclaimer in the documentation+   and/or other materials provided with the distribution.+3. Neither the name of the copyright holder nor the names of its+   contributors may be used to endorse or promote products derived from+   this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF-SUCH DAMAGE.+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
LambdaHack.cabal view
@@ -5,7 +5,7 @@ -- PVP summary:+-+------- breaking API changes --             | | +----- minor or non-breaking API additions --             | | | +--- code changes with no API change-version:       0.8.1.0+version:       0.8.1.1 synopsis:      A game engine library for tactical squad ASCII roguelike dungeon crawlers description:   LambdaHack is a Haskell game engine library for ASCII roguelike                games of arbitrary theme, size and complexity, with optional@@ -44,7 +44,7 @@ homepage:      https://lambdahack.github.io bug-reports:   http://github.com/LambdaHack/LambdaHack/issues license:       BSD3-license-file:  LICENSE+license-file:  COPYLEFT tested-with:   GHC==8.0.2, GHC==8.2.2, GHC==8.4.3 data-files:    GameDefinition/config.ui.default,                GameDefinition/fonts/16x16x.fon,@@ -57,6 +57,7 @@                README.md,                CHANGELOG.md,                LICENSE,+               COPYLEFT,                CREDITS extra-source-files: GameDefinition/MainMenu.ascii,                     GameDefinition/PLAYING.md,@@ -228,7 +229,7 @@   other-modules:      Paths_LambdaHack   build-depends:                       assert-failure >= 0.1.2 && < 0.2,-                      async      >= 2.2.1,+                      async      >= 2,                       base       >= 4.9 && < 99,                       base-compat >= 0.8.0,                       binary     >= 0.8,@@ -329,7 +330,7 @@                       template-haskell >= 2.6,                        assert-failure >= 0.1.2 && < 0.2,-                      async      >= 2.2.1,+                      async      >= 2,                       base       >= 4.9 && < 99,                       base-compat >= 0.8.0,                       binary     >= 0.8,@@ -402,7 +403,7 @@                       template-haskell >= 2.6,                        assert-failure >= 0.1.2 && < 0.2,-                      async      >= 2.2.1,+                      async      >= 2,                       base       >= 4.9 && < 99,                       base-compat >= 0.8.0,                       binary     >= 0.8,
Makefile view
@@ -214,6 +214,7 @@ 	cp README.md LambdaHackTheGame 	cp CHANGELOG.md LambdaHackTheGame 	cp LICENSE LambdaHackTheGame+	cp COPYLEFT LambdaHackTheGame 	cp CREDITS LambdaHackTheGame  build-binary: build-binary-common
README.md view
@@ -231,7 +231,7 @@ For more information, visit the wiki[4] and see [PLAYING.md](https://github.com/LambdaHack/LambdaHack/blob/master/GameDefinition/PLAYING.md), [CREDITS](https://github.com/LambdaHack/LambdaHack/blob/master/CREDITS)-and [LICENSE](https://github.com/LambdaHack/LambdaHack/blob/master/LICENSE).+and [COPYLEFT](https://github.com/LambdaHack/LambdaHack/blob/master/COPYLEFT).  Have fun!