[Git][haskell-team/DHG_packages][master] 2 commits: allure: Fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674

Wed Nov 24 00:29:09 GMT 2021


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


Commits:
0e4c97c4 by Mikolaj Konarski at 2021-11-24T01:13:12+01:00
allure: Fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674

- - - - -
5888b0d2 by Mikolaj Konarski at 2021-11-24T01:28:09+01:00
haskell-lambdahack: Work around freetype 2.11 bug

(but I don't know what to do with the lintian error
that I probably introduced in the previous revision:
https://lintian.debian.org/sources/haskell-lambdahack)

- - - - -


11 changed files:

- p/allure/debian/allure.desktop
- p/allure/debian/changelog
- p/allure/debian/control
- p/allure/debian/patches/fix-tests
- p/allure/debian/patches/series
- + p/allure/debian/patches/workaround-freetype-2.11-bug.diff
- p/haskell-lambdahack/debian/changelog
- p/haskell-lambdahack/debian/control
- p/haskell-lambdahack/debian/patches/fix-tests
- p/haskell-lambdahack/debian/patches/series
- + p/haskell-lambdahack/debian/patches/workaround-freetype-2.11-bug.diff


Changes:

=====================================
p/allure/debian/allure.desktop
=====================================
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=Allure of the Stars
 Comment=Explore an abandoned spaceship with a party of adventurers
-Keywords=game;strategy;tactics;roguelike;scifi;
+Keywords=game;strategy;tactics;roguelike;ascii;scifi;
 Exec=Allure
 Icon=allure
 Terminal=false


=====================================
p/allure/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+allure (0.9.5.0-3) unstable; urgency=medium
+
+  * Add patch workaround-freetype-2.11-bug.diff (fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674)
+  * Fix some lintian warnings
+
+ -- Mikolaj Konarski <mikolaj.konarski at funktory.com>  Wed, 24 Nov 2021 01:05:03 +0100
+
 allure (0.9.5.0-2) unstable; urgency=medium
 
   * Include InGameHelp.txt instead of the mixed up MoveKeys.txt


=====================================
p/allure/debian/control
=====================================
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 10),
  libghc-primitive-prof,
  libghc-random-dev,
  libghc-random-prof,
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Homepage: http://allureofthestars.com
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/allure
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/allure]


=====================================
p/allure/debian/patches/fix-tests
=====================================
@@ -1,3 +1,4 @@
+Fix tests for the case of in-place font files.
 --- a/test/test.hs
 +++ b/test/test.hs
 @@ -16,6 +16,6 @@


=====================================
p/allure/debian/patches/series
=====================================
@@ -1 +1,2 @@
 fix-tests
+workaround-freetype-2.11-bug.diff


=====================================
p/allure/debian/patches/workaround-freetype-2.11-bug.diff
=====================================
@@ -0,0 +1,22 @@
+; This is a temporary hack around bitmap font breakage caused by
+; https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
+; see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674
+; In a couple of years this can be removed and the small bitmap fonts will work
+; fine again, too.
+--- a/GameDefinition/config.ui.default
++++ b/GameDefinition/config.ui.default
+@@ -39,7 +39,13 @@
+ ;sdlFontFile = "16x16xw.woff"
+ scalableFontSize = 16
+ sdlScalableSizeAdd = 0
+-sdlFontFile = "16x16xw.bdf"
++; This is a temporary hack around bitmap font breakage caused by
++; https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
++; see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674
++; In a couple of years this can be removed and the small bitmap fonts will work
++; fine again, too.
++;sdlFontFile = "16x16xw.bdf"
++sdlFontFile = "16x16xw.woff"
+ sdlBitmapSizeAdd = 0
+ ;sdlFontFile = "8x8xb.fnt"
+ ;sdlFontFile = "8x8x.fnt"


=====================================
p/haskell-lambdahack/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-lambdahack (0.9.5.0-4) unstable; urgency=medium
+
+  * Add patch workaround-freetype-2.11-bug.diff (the same bug as https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674)
+  * Fix some lintian warnings (but I don't know what to do with the lintian error that I probably introduced in the previous revision: https://lintian.debian.org/sources/haskell-lambdahack)
+
+ -- Mikolaj Konarski <mikolaj.konarski at funktory.com>  Wed, 24 Nov 2021 01:15:04 +0100
+
 haskell-lambdahack (0.9.5.0-3) unstable; urgency=medium
 
   * Include InGameHelp.txt instead of the mixed up MoveKeys.txt


=====================================
p/haskell-lambdahack/debian/control
=====================================
@@ -65,7 +65,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-vector-doc,
  libghc-vector-binary-instances-doc,
  libghc-zlib-doc,
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Homepage: https://github.com/LambdaHack/LambdaHack
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-lambdahack
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-lambdahack]


=====================================
p/haskell-lambdahack/debian/patches/fix-tests
=====================================
@@ -1,3 +1,4 @@
+Fix tests for the case of in-place font files.
 --- a/test/test.hs
 +++ b/test/test.hs
 @@ -16,6 +16,6 @@


=====================================
p/haskell-lambdahack/debian/patches/series
=====================================
@@ -1 +1,2 @@
 fix-tests
+workaround-freetype-2.11-bug.diff


=====================================
p/haskell-lambdahack/debian/patches/workaround-freetype-2.11-bug.diff
=====================================
@@ -0,0 +1,22 @@
+This is a temporary hack around bitmap font breakage caused by
+https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
+also see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674
+In a couple of years this can be removed and the small bitmap fonts will work
+fine again, too.
+--- a/GameDefinition/config.ui.default
++++ b/GameDefinition/config.ui.default
+@@ -33,7 +33,13 @@
+ ;sdlFontFile = "16x16xw.woff"
+ scalableFontSize = 16
+ sdlScalableSizeAdd = 0
+-sdlFontFile = "16x16xw.bdf"
++; This is a temporary hack around bitmap font breakage caused by
++; https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
++; see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997674
++; In a couple of years this can be removed and the small bitmap fonts will work
++; fine again, too.
++;sdlFontFile = "16x16xw.bdf"
++sdlFontFile = "16x16xw.woff"
+ sdlBitmapSizeAdd = 0
+ ;sdlFontFile = "8x8xb.fnt"
+ ;sdlFontFile = "8x8x.fnt"



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/3cea2dcf2945f692798aa845a966f5f3f82b37d5...5888b0d2a2c0faacec8c4c1391f03cf2b56e7d79

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/3cea2dcf2945f692798aa845a966f5f3f82b37d5...5888b0d2a2c0faacec8c4c1391f03cf2b56e7d79
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/20211124/eb4f6c90/attachment-0001.htm>
