Merge branch 'master' into experimental

p/agda/debian/changelog

+agda (2.5.3-6) UNRELEASED; urgency=medium
+
+  * Set Rules-Requires-Root to no.
+
+ -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400
+
+agda (2.5.3-5) unstable; urgency=medium
+
+  * Patch for newer EdisonCore.
+
+ -- Clint Adams <clint@debian.org>  Sun, 29 Apr 2018 08:41:41 -0400
+
 agda (2.5.3-4) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]

p/agda/debian/control

@@ -2,6 +2,7 @@ Source: agda
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Priority: optional
 Section: haskell
+Rules-Requires-Root: no
 Build-Depends:
  alex,
  cdbs,
@@ -12,9 +13,6 @@ Build-Depends:
  happy,
  haskell-devscripts (>= 0.13),
  ghc-prof,
- libghc-edison-core-dev (>= 1.3.1.1),
- libghc-edison-core-dev (<< 1.3.2),
- libghc-edison-core-prof,
  libghc-async-dev (>= 2.0.2),
  libghc-async-dev (<< 2.2),
  libghc-async-prof,
@@ -26,8 +24,8 @@ Build-Depends:
  libghc-boxes-dev (>= 0.1.3),
  libghc-data-hash-dev (<< 0.3),
  libghc-data-hash-dev (>= 0.2.0.0),
- libghc-edison-core-dev (<< 1.3.2),
- libghc-edison-core-dev (>= 1.3.1.1),
+ libghc-edison-core-dev (>= 1.3.2.1),
+ libghc-edison-core-dev (<< 1.4),
  libghc-edit-distance-dev (<< 0.3),
  libghc-edit-distance-prof,
  libghc-equivalence-dev (>= 0.3.2),
@@ -108,7 +106,7 @@ Build-Depends-Indep: ghc-doc,
 Standards-Version: 4.1.4
 Homepage: http://wiki.portal.chalmers.se/agda/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/agda
-Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git
+Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/agda]
 
 Package: agda
 Architecture: all

p/agda/debian/patches/newer-deps

+--- a/Agda.cabal
++++ b/Agda.cabal
+@@ -132,7 +132,7 @@
+                 , data-hash >= 0.2.0.0 && < 0.3
+                 , deepseq >= 1.3.0.2 && < 1.5
+                 , directory >= 1.2.0.1 && < 1.4
+-                , EdisonCore >= 1.3.1.1 && < 1.3.2
++                , EdisonCore >= 1.3.2.1 && < 1.4
+                 , edit-distance >= 0.2.1.2 && < 0.3
+                 , equivalence >= 0.3.2 && < 0.4
+                 , filepath >= 1.3.0.1 && < 1.5

p/agda/debian/patches/series

 var-lib-agda
+newer-deps

p/alex/debian/changelog

+alex (3.2.4-4) UNRELEASED; urgency=medium
+
+  * Set Rules-Requires-Root to no.
+
+ -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400
+
+alex (3.2.4-3) unstable; urgency=medium
+
+  * Use Distribution.Version instead.
+
+ -- Clint Adams <clint@debian.org>  Thu, 12 Apr 2018 14:40:32 -0400
+
+alex (3.2.4-2) unstable; urgency=medium
+
+  * Hide Distribution.Version's showVersion in our get_version util.
+
+ -- Clint Adams <clint@debian.org>  Thu, 12 Apr 2018 10:32:23 -0400
+
 alex (3.2.4-1) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]

p/alex/debian/control

@@ -6,6 +6,7 @@ Uploaders: Joachim Breitner <nomeata@debian.org>,
            Dmitry Bogatov <KAction@gnu.org>
 Priority: optional
 Section: haskell
+Rules-Requires-Root: no
 Build-Depends: alex <!stage1>,
                autoconf,
                cdbs (>= 0.4.59),
@@ -22,7 +23,7 @@ Build-Depends: alex <!stage1>,
 Standards-Version: 4.1.4
 Homepage: http://www.haskell.org/alex/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/alex
-Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git
+Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/alex]
 
 Package: alex
 Architecture: any

p/alex/debian/get_version.hs

 
 module Main (main) where
 
-import Data.Version ( showVersion )
 import Distribution.Package
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Parse ( readPackageDescription )

p/allure/debian/allure.install

+./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/Fix15Mono-Bold.woff usr/share/allure/GameDefinition/fonts
+./GameDefinition/PLAYING.md usr/share/allure/GameDefinition
+./GameDefinition/InGameHelp.txt usr/share/allure/GameDefinition
+./LICENSE usr/share/allure/.
+./README.md usr/share/allure/.
 dist-ghc/build/Allure/Allure usr/games

p/allure/debian/changelog

+allure (0.8.3.0-3) UNRELEASED; urgency=medium
+
+  * Attempt to force 'cabal test' to run
+
+ -- Mikolaj Konarski <mikolaj.konarski@funktory.com>  Fri, 06 Jul 2018 02:05:45 +0200
+
+allure (0.8.3.0-2) unstable; urgency=medium
+
+  * Install fonts, etc.
+
+ -- Mikolaj Konarski <mikolaj.konarski@funktory.com>  Tue, 03 Jul 2018 12:03:57 +0200
+
+allure (0.8.3.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Turn off optimization for architectures that take forever compiling
+
+ -- Mikolaj Konarski <mikolaj.konarski@funktory.com>  Mon, 02 Jul 2018 17:09:51 +0200
+
+allure (0.7.1.0-3) unstable; urgency=medium
+
+  [ Clint Adams ]
+  * Set Rules-Requires-Root to no.
+
+  [ Mikolaj Konarski ]
+  * Update copyright information
+  * Update package description
+  * Remove duplicate build-depends line
+  * Add Vcs-Browser and Vcs-Git fields
+
+ -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400
+
 allure (0.7.1.0-1) unstable; urgency=medium
 
   * New upstream release

p/allure/debian/control

 Source: allure
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Clint Adams <clint@debian.org>
+Uploaders: Clint Adams <clint@debian.org>, Mikolaj Konarski <mikolaj.konarski@funktory.com>
 Priority: optional
 Section: haskell
+Rules-Requires-Root: no
 Build-Depends: debhelper (>= 10),
  haskell-devscripts-minimal | haskell-devscripts (>= 0.8),
  cdbs,
  ghc,
  ghc-prof,
- libghc-lambdahack-dev (>= 0.7.1.0),
- libghc-lambdahack-dev (<< 0.7.2.0),
+ libghc-lambdahack-dev (>= 0.8.3.0),
+ libghc-lambdahack-dev (<< 0.8.4.0),
  libghc-async-dev (>= 2),
- libghc-enummapset-th-dev (>= 0.6.0.0),
+ libghc-enummapset-dev (>= 0.5.2.2),
  libghc-optparse-applicative-dev (>= 0.13),
  libghc-random-dev (>= 1.1),
  libghc-text-dev (>= 0.11.2.3),
  libghc-zlib-dev (>= 0.5.3.1),
- libghc-lambdahack-dev,
 Standards-Version: 4.1.4
 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]
 
 Package: allure
 Architecture: any
 Section: games
 Depends: ${haskell:Depends},
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Recommends: ${haskell:Recommends},
 Suggests: ${haskell:Suggests},
 Conflicts: ${haskell:Conflicts},
@@ -33,4 +35,15 @@ Provides: ${haskell:Provides},
 Description: near-future Sci-Fi roguelike and tactical squad game
  Allure of the Stars is a near-future Sci-Fi roguelike and tactical
  squad game.
-
+ .
+ Not a single picture in this game. You have to imagine everything
+ yourself, like with a book (a grown-up book, without pictures).
+ Once you learn to imagine things, though, you can keep exploring
+ and mastering the world and making up stories for a long time.
+ .
+ The game is written in Haskell using the free software LambdaHack engine.
+ Please see the changelog file for recent improvements
+ and the issue tracker for short-term plans. Long term goals
+ are high replayability and auto-balancing through procedural
+ content generation and persistent content modification
+ based on player behaviour. Contributions are welcome.

p/allure/debian/copyright

@@ -5,9 +5,21 @@ Source: https://hackage.haskell.org/package/Allure
 
 Files: *
 Copyright: 2008-2011 Andres Loeh
-           2010-2015 Mikolaj Konarski
+           2010-2018 Mikolaj Konarski and others (see git history)
 License: AGPL-3+
 
+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: AGPL-3+
@@ -674,3 +686,111 @@ License: AGPL-3+
  if any, to sign a "copyright disclaimer" for the program, if necessary.
  For more information on this, and how to apply and follow the GNU AGPL, see
  <http://www.gnu.org/licenses/>.
+
+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.
+ .