[Git][haskell-team/DHG_packages][master] allure: Install the fonts and patch testsuite to use fonts in source dir

[Mikolaj Konarski]

Mikolaj Konarski pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
8aa0d624 by Mikolaj Konarski at 2020-06-16T19:10:43+02:00
allure: Install the fonts and patch testsuite to use fonts in source dir

- - - - -


5 changed files:

- p/allure/debian/allure.install
- p/allure/debian/changelog
- p/allure/debian/copyright
- + p/allure/debian/patches/fix-tests
- + p/allure/debian/patches/series


Changes:

=====================================
p/allure/debian/allure.install
=====================================
@@ -1,12 +1,15 @@
 ./CHANGELOG.md usr/share/allure/.
 ./CREDITS usr/share/allure/.
 ./GameDefinition/config.ui.default usr/share/allure/GameDefinition
-./GameDefinition/fonts/16x16x.fon usr/share/allure/GameDefinition/fonts
-./GameDefinition/fonts/8x8xb.fon usr/share/allure/GameDefinition/fonts
-./GameDefinition/fonts/8x8x.fon usr/share/allure/GameDefinition/fonts
+./GameDefinition/fonts/16x16x.fnt usr/share/allure/GameDefinition/fonts
+./GameDefinition/fonts/16x16xw.bdf usr/share/allure/GameDefinition/fonts
+./GameDefinition/fonts/16x16xw.woff usr/share/allure/GameDefinition/fonts
+./GameDefinition/fonts/8x8xb.fnt usr/share/allure/GameDefinition/fonts
+./GameDefinition/fonts/8x8x.fnt usr/share/allure/GameDefinition/fonts
 ./GameDefinition/fonts/Fix15Mono-Bold.woff usr/share/allure/GameDefinition/fonts
 ./GameDefinition/PLAYING.md usr/share/allure/GameDefinition
-./GameDefinition/InGameHelp.txt usr/share/allure/GameDefinition
+./GameDefinition/MoveKeys.txt usr/share/allure/GameDefinition
+./COPYLEFT usr/share/allure/.
 ./LICENSE usr/share/allure/.
 ./README.md usr/share/allure/.
 dist-ghc/build/Allure/Allure usr/games


=====================================
p/allure/debian/changelog
=====================================
@@ -2,6 +2,11 @@ allure (0.9.5.0-1) unstable; urgency=medium
 
   [ Mikolaj Konarski ]
   * Fix lintian and appstream warnings about allure.desktop
+  * Update allure.install and copyright for the new upstream release
+
+  [ Clint Adams ]
+  * Patch testsuite to use fonts in the source directory instead of
+    their installed locations.
 
   [ Sean Whitton ]
   * New upstream release


=====================================
p/allure/debian/copyright
=====================================
@@ -5,26 +5,26 @@ Source: https://hackage.haskell.org/package/Allure
 
 Files: *
 Copyright: 2008-2011 Andres Loeh
-           2010-2018 Mikolaj Konarski and others (see git history)
-License: AGPL-3+
+           2010-2019 Mikolaj Konarski and others (see git history)
+License: AGPL-3.0-or-later
 
-Files: GameDefinition/fonts/*.fon
+Files: GameDefinition/fonts/{*.fnt,*.bdf,16x16xw.woff}
 Copyright: 1997-2016 Leon Marrick
            1997-2016 Sheldon Simms III
            1997-2016 Nick McConnell
-           2016-2018 Mikolaj Konarski
-License: GPL-2
+           2016-2019 Mikolaj Konarski
+License: GPL-2.0-or-later
 
 Files: GameDefinition/fonts/Fix15Mono-Bold.woff
 Copyright: 2012-2015 The Mozilla Foundation and Telefonica S.A
-           2016-2018 Mikolaj Konarski
+           2016-2019 Mikolaj Konarski
 License: OFL-1.1
 
 Files: debian/*
 Copyright: held by the contributors mentioned in debian/changelog
-License: AGPL-3+
+License: AGPL-3.0-or-later
 
-License: AGPL-3+
+License: AGPL-3.0-or-later
                      GNU AFFERO GENERAL PUBLIC LICENSE
                         Version 3, 19 November 2007
  .
@@ -687,7 +687,7 @@ License: AGPL-3+
  For more information on this, and how to apply and follow the GNU AGPL, see
  <http://www.gnu.org/licenses/>.
 
-License: GPL-2
+License: GPL-2.0-or-later
  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


=====================================
p/allure/debian/patches/fix-tests
=====================================
@@ -0,0 +1,10 @@
+--- a/test/test.hs
++++ b/test/test.hs
+@@ -16,6 +16,6 @@
+   when (frontendName == "sdl") $ do
+     -- The hacky log priority 0 tells SDL frontend to init and quit at once,
+     -- for testing on CIs without graphics access.
+-    let args2 = words "--dbgMsgSer --logPriority 0 --newGame 3 --maxFps 100000 --benchmark --stopAfterFrames 50 --automateAll --keepAutomated --gameMode battle --setDungeonRng 7 --setMainRng 7"
++    let args2 = words "--dbgMsgSer --logPriority 0 --newGame 3 --maxFps 100000 --benchmark --stopAfterFrames 50 --automateAll --keepAutomated --gameMode battle --setDungeonRng 7 --setMainRng 7 --fontDir \"GameDefinition/fonts\""
+     serverOptions2 <- handleParseResult $ execParserPure defaultPrefs serverOptionsPI args2
+     tieKnot serverOptions2


=====================================
p/allure/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-tests



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/8aa0d6248945bba1e0212eca316793b805f74d2d

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/8aa0d6248945bba1e0212eca316793b805f74d2d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200616/33f1425a/attachment-0001.html>