README.md

@@ -71,9 +71,9 @@ Debian Haskell Tools
 We provide tools for a number of repeated tasks, such as tagging, upgrading,
 knowing what to build and what to upgrade, etc. They are provided in the
 `pkg-haskell-tools` package, available in sid, or at
-ssh://git.debian.org/git/pkg-haskell/pkg-haskell-tools.git
-(git://anonscm.debian.org/pkg-haskell/pkg-haskell-tools.git for
-non-Debian-developers).
+git@salsa.debian.org:haskell-team/pkg-haskell-tools.git
+(git://salsa.debian.org/haskell-team/pkg-haskell-tools.git for
+read-only access).
 
 All tools are under the `dht` prefix, and it has a manpage (man dht) or at
 <file:///usr/share/doc/pkg-haskell-tools/dht.html>.

p/agda/debian/changelog

-agda (2.5.3-6) UNRELEASED; urgency=medium
+agda (2.5.4.1-3) unstable; urgency=medium
 
+  * Remove build dependency on non-existing libghc-edisoncore-dev.
+    The correct package is libghc-edison-core-dev.
+  * Remove build dependency on *-prof packages.
+    No profiling package is being built.
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Sat, 20 Oct 2018 23:22:18 +0300
+
+agda (2.5.4.1-2) unstable; urgency=medium
+
+  * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3)
+  * Remove build dependency on libghc-text-dev (provided by ghc-8.4.3)
+  * Remove build dependency on libghc-stm-dev (provided by ghc-8.4.3)
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 01 Oct 2018 17:50:16 +0300
+
+agda (2.5.4.1-1) unstable; urgency=medium
+
+  [ Clint Adams ]
   * Set Rules-Requires-Root to no.
 
- -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400
+  [ Ilias Tsitsimpis ]
+  * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Sun, 30 Sep 2018 11:01:07 +0300
 
 agda (2.5.3-5) unstable; urgency=medium
 

p/agda/debian/control

@@ -9,16 +9,13 @@ Build-Depends:
  cpphs (>= 1.20.2),
  debhelper (>= 10),
  dh-elpa,
- ghc (>= 8),
+ ghc (>= 8.4.3),
  happy,
  haskell-devscripts (>= 0.13),
- ghc-prof,
- libghc-async-dev (>= 2.0.2),
- libghc-async-dev (<< 2.2),
- libghc-async-prof,
+ libghc-async-dev (>= 2.2),
+ libghc-async-dev (<< 2.3),
  libghc-blaze-html-dev (>= 0.8),
  libghc-blaze-html-dev (<< 0.10),
- libghc-blaze-html-prof,
  libghc-boxes-dev (>= 0.1.3),
  libghc-boxes-dev (<< 0.2),
  libghc-boxes-dev (>= 0.1.3),
@@ -27,55 +24,32 @@ Build-Depends:
  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),
  libghc-equivalence-dev (<< 0.4),
  libghc-equivalence-dev (>= 0.2.5),
  libghc-filemanip-dev (<< 0.4),
  libghc-filemanip-dev (>= 0.3.6.3),
  libghc-geniplate-mirror-dev (<< 0.8),
- libghc-geniplate-mirror-dev (>= 0.6.0.6),
+ libghc-gitrev-dev (>= 1.3.1),
  libghc-gitrev-dev (<< 2.0),
  libghc-gitrev-dev (>= 1.2),
  libghc-hashable-dev (<< 1.3),
- libghc-hashable-dev (>= 1.2.1.0),
- libghc-hashtables-dev,
- libghc-ieee754-dev (<< 0.9),
+ libghc-hashtables-dev (>= 1.2.0.2),
+ libghc-hashtables-dev (<< 1.3),
  libghc-ieee754-dev (>= 0.7.8),
  libghc-ieee754-dev (<< 0.9),
- libghc-ieee754-prof,
- libghc-monadplus-dev (>= 1.4),
- libghc-monadplus-dev (<< 1.5),
- libghc-monadplus-prof,
- libghc-mtl-dev (>= 2.2.1),
- libghc-mtl-dev (<< 2.3),
- libghc-mtl-prof,
  libghc-murmur-hash-dev (>= 0.1),
  libghc-murmur-hash-dev (<< 0.2),
- libghc-murmur-hash-dev (>= 0.1),
- libghc-mtl-dev,
- libghc-parallel-dev (<< 3.3),
- libghc-parallel-dev (>= 3.2.0.4),
+ libghc-regex-tdfa-dev (>= 1.2.2),
  libghc-regex-tdfa-dev (<< 1.3),
- libghc-regex-tdfa-prof,
- libghc-stm-dev (>= 2.4.4),
- libghc-stm-dev (<< 2.5),
- libghc-stm-prof,
  libghc-strict-dev (>= 0.3.2),
  libghc-strict-dev (<< 0.4),
- libghc-strict-prof,
- libghc-text-dev (>= 0.11.3.1),
- libghc-text-dev (<< 1.3),
- libghc-text-prof,
  libghc-unordered-containers-dev (>= 0.2.5.0),
  libghc-unordered-containers-dev (<< 0.3),
- libghc-unordered-containers-prof,
  libghc-uri-encode-dev (>= 1.5.0.4),
  libghc-uri-encode-dev (<< 1.6),
- libghc-uri-encode-prof,
  libghc-zlib-dev (>= 0.4.0.1),
  libghc-zlib-dev (<< 0.7),
- libghc-zlib-prof,
  alex,
  happy,
 Build-Depends-Indep: ghc-doc,
@@ -84,7 +58,6 @@ Build-Depends-Indep: ghc-doc,
  libghc-blaze-html-doc,
  libghc-boxes-doc,
  libghc-data-hash-doc,
- libghc-edison-core-doc,
  libghc-edit-distance-doc,
  libghc-equivalence-doc,
  libghc-geniplate-mirror-doc,
@@ -92,14 +65,9 @@ Build-Depends-Indep: ghc-doc,
  libghc-hashable-doc,
  libghc-hashtables-doc,
  libghc-ieee754-doc,
- libghc-monadplus-doc,
- libghc-mtl-doc,
  libghc-murmur-hash-doc,
- libghc-parallel-doc,
  libghc-regex-tdfa-doc,
- libghc-stm-doc,
  libghc-strict-doc,
- libghc-text-doc,
  libghc-unordered-containers-doc,
  libghc-uri-encode-doc,
  libghc-zlib-doc,

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/agda/debian/patches/var-lib-agda

 See https://github.com/agda/agda/issues/2804
 
-Index: agda/src/full/Agda/Interaction/Library.hs
+Index: b/src/full/Agda/Interaction/Library.hs
 ===================================================================
---- agda.orig/src/full/Agda/Interaction/Library.hs	2017-10-13 21:58:48.432139892 -0400
-+++ agda/src/full/Agda/Interaction/Library.hs	2017-10-13 22:39:44.970695744 -0400
-@@ -215,13 +215,20 @@
+--- a/src/full/Agda/Interaction/Library.hs
++++ b/src/full/Agda/Interaction/Library.hs
+@@ -225,13 +225,19 @@ getInstalledLibraries
    -> LibM [AgdaLibFile] -- ^ Content of library files.  (Might have empty @LibName@s.)
  getInstalledLibraries overrideLibFile = mkLibM [] $ do
      file <- lift $ getLibrariesFile overrideLibFile
--    ifNotM (lift $ doesFileExist file) (return []) $ {-else-} do
-+    userlibs <- ifNotM (lift $ doesFileExist file) (return []) $ {-else-} do
-       ls    <- lift $ stripCommentLines <$> readFile file
+-    if not (lfExists file) then return [] else do
++    userlibs <- if not (lfExists file) then return [] else do
+       ls    <- lift $ stripCommentLines <$> readFile (lfPath file)
        files <- lift $ sequence [ (i, ) <$> expandEnvironmentVariables s | (i, s) <- ls ]
        parseLibFiles (Just file) files
-+
 +    systemlibs <- ifNotM (lift $ doesDirectoryExist systemLibDir) (return []) $ do
 +      files <- lift $ filter isLibFile <$> listDirectory systemLibDir
 +      parseLibFiles Nothing $ zip [1..] $ map (systemLibDir </>) files

p/alex/debian/changelog

-alex (3.2.4-4) UNRELEASED; urgency=medium
+alex (3.2.4-4) unstable; urgency=medium
 
+  [ Clint Adams ]
   * Set Rules-Requires-Root to no.
 
- -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400
+  [ Ilias Tsitsimpis ]
+  * Bump debhelper compat level to 10
+  * debian/get_version.hs: Updated for Cabal 2.2
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Wed, 03 Oct 2018 14:48:22 +0300
 
 alex (3.2.4-3) unstable; urgency=medium
 

p/alex/debian/compat

-9
+10

p/alex/debian/control

@@ -10,7 +10,7 @@ Rules-Requires-Root: no
 Build-Depends: alex <!stage1>,
                autoconf,
                cdbs (>= 0.4.59),
-               debhelper (>= 9.20141010),
+               debhelper (>= 10),
                docbook-utils,
                docbook-xml,
                docbook-xsl,

p/alex/debian/get_version.hs

@@ -3,12 +3,12 @@ module Main (main) where
 
 import Distribution.Package
 import Distribution.PackageDescription
-import Distribution.PackageDescription.Parse ( readPackageDescription )
+import Distribution.PackageDescription.Parsec ( readGenericPackageDescription )
 import Distribution.Simple.Utils
 import Distribution.Verbosity
 import Distribution.Version
 
 main :: IO ()
 main = do Right fp <- findPackageDesc "."
-          pd <- readPackageDescription normal fp
+          pd <- readGenericPackageDescription normal fp
           putStr $ showVersion $ pkgVersion $ package $ packageDescription pd

p/allure/debian/allure.desktop

@@ -5,7 +5,7 @@ Type=Application
 Name=Allure of the Stars
 Comment=Explore an abandoned spaceship with a party of adventurers
 Keywords=game;strategy;tactics;roguelike;scifi;
-Exec=allure
+Exec=Allure
 Icon=allure
 Terminal=false
 Categories=Game;

p/allure/debian/allure.install

@@ -11,4 +11,4 @@
 ./README.md usr/share/allure/.
 dist-ghc/build/Allure/Allure usr/games
 debian/allure.desktop /usr/share/applications
-debian/allure.png /usr/share/icons
+debian/allure.png /usr/share/icons/hicolor/96x96/apps

p/allure/debian/changelog

+allure (0.8.3.0-4) UNRELEASED; urgency=medium
+
+  * Fix lintian and appstream warnings about allure.desktop
+
+ -- Mikolaj Konarski <mikolaj.konarski@funktory.com>  Fri, 26 Oct 2018 11:00:24 +0200
+
 allure (0.8.3.0-3) unstable; urgency=medium
 
+  [ Mikolaj Konarski ]
   * Attempt to force 'cabal test' to run
   * Add an icon and .desktop file
 
- -- Mikolaj Konarski <mikolaj.konarski@funktory.com>  Fri, 20 Jul 2018 02:05:45 +0200
+  [ Ilias Tsitsimpis ]
+  * Remove build dependency on libghc-text-dev (provided by ghc-8.4.3)
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 01 Oct 2018 13:47:24 +0300
 
 allure (0.8.3.0-2) unstable; urgency=medium
 

p/allure/debian/control

@@ -7,7 +7,7 @@ Rules-Requires-Root: no
 Build-Depends: debhelper (>= 10),
  haskell-devscripts-minimal | haskell-devscripts (>= 0.8),
  cdbs,
- ghc,
+ ghc (>= 8.4.3),
  ghc-prof,
  libghc-lambdahack-dev (>= 0.8.3.0),
  libghc-lambdahack-dev (<< 0.8.4.0),
@@ -15,7 +15,6 @@ Build-Depends: debhelper (>= 10),
  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),
 Standards-Version: 4.1.4
 Homepage: http://allureofthestars.com

p/bnfc/debian/changelog

-bnfc (2.8.1-5) UNRELEASED; urgency=medium
+bnfc (2.8.1-6) unstable; urgency=medium
 
+  * Patch to build with ghc-8.4
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Thu, 04 Oct 2018 14:53:27 +0300
+
+bnfc (2.8.1-5) unstable; urgency=medium
+
+  [ Clint Adams ]
   * Set Rules-Requires-Root to no.
 
- -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400
+  [ Ilias Tsitsimpis ]
+  * Bump debhelper compat level to 10
+  * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3)
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 01 Oct 2018 13:33:20 +0300
 
 bnfc (2.8.1-4) unstable; urgency=medium
 

p/bnfc/debian/compat

-9
+10

p/bnfc/debian/control

@@ -9,12 +9,11 @@ Rules-Requires-Root: no
 Build-Depends:
  alex,
  cdbs,
- debhelper (>= 9),
- ghc (>= 8),
+ debhelper (>= 10),
+ ghc (>= 8.4.3),
  ghc-prof,
  happy,
  haskell-devscripts (>= 0.13),
- libghc-mtl-dev,
 Standards-Version: 4.1.4
 Homepage: http://bnfc.digitalgrammars.com/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/bnfc

p/bnfc/debian/patches/newer-base

+Index: b/src/BNFC/PrettyPrint.hs
+===================================================================
+--- a/src/BNFC/PrettyPrint.hs
++++ b/src/BNFC/PrettyPrint.hs
+@@ -8,6 +8,7 @@ module BNFC.PrettyPrint
+   ) where
+ 
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ -- | Pretty print separator with a dot
+ -- >>> "abc" <.> "py"
+Index: b/src/BNFC/Backend/C/CFtoCAbs.hs
+===================================================================
+--- a/src/BNFC/Backend/C/CFtoCAbs.hs
++++ b/src/BNFC/Backend/C/CFtoCAbs.hs
+@@ -48,6 +48,7 @@ import BNFC.Backend.Common.NamedVariable
+ import Data.Function (on)
+ import Data.List
+ import Data.Char(toLower)
++import Prelude hiding ((<>))
+ 
+ 
+ --The result is two files (.H file, .C file)
+Index: b/src/BNFC/Backend/C/CFtoCPrinter.hs
+===================================================================
+--- a/src/BNFC/Backend/C/CFtoCPrinter.hs
++++ b/src/BNFC/Backend/C/CFtoCPrinter.hs
+@@ -51,6 +51,7 @@ import Data.List
+ import Data.Char(toLower)
+ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --Produces (.h file, .c file)
+ cf2CPrinter :: CF -> (String, String)
+Index: b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
+===================================================================
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
+@@ -48,6 +48,7 @@ import BNFC.Backend.Common.OOAbstract
+ import Data.List
+ import Data.Char(toLower)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ 
+ --The result is two files (.H file, .C file)
+Index: b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
+===================================================================
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
+@@ -47,6 +47,7 @@ import Data.List
+ import Data.Char(toLower, toUpper)
+ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --Produces (.H file, .C file)
+ cf2CVisitSkel :: CF -> (String, String)
+Index: b/src/BNFC/Backend/CPP/NoSTL/RegToFlex.hs
+===================================================================
+--- a/src/BNFC/Backend/CPP/NoSTL/RegToFlex.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/RegToFlex.hs
+@@ -3,6 +3,7 @@ module BNFC.Backend.CPP.NoSTL.RegToFlex
+ -- modified from pretty-printer generated by the BNF converter
+ 
+ import AbsBNF
++import Prelude hiding ((<>))
+ 
+ -- the top-level printing method
+ printRegFlex :: Reg -> String
+Index: b/src/BNFC/Backend/CPP/PrettyPrinter.hs
+===================================================================
+--- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
++++ b/src/BNFC/Backend/CPP/PrettyPrinter.hs
+@@ -30,6 +30,7 @@ import BNFC.Backend.Common.StrUtils (ren
+ import Data.Char(toLower)
+ import BNFC.Backend.CPP.STL.STLUtils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --Produces (.H file, .C file)
+ cf2CPPPrinter :: Bool -> Maybe String -> CF -> (String, String)
+Index: b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
+===================================================================
+--- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
++++ b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
+@@ -54,6 +54,7 @@ import ErrM
+ import BNFC.Backend.CPP.STL.STLUtils
+ import BNFC.Backend.C.CFtoBisonC (startSymbol)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --This follows the basic structure of CFtoHappy.
+ 
+Index: b/src/BNFC/Backend/CSharp/RegToGPLEX.hs
+===================================================================
+--- a/src/BNFC/Backend/CSharp/RegToGPLEX.hs
++++ b/src/BNFC/Backend/CSharp/RegToGPLEX.hs
+@@ -3,6 +3,7 @@ module BNFC.Backend.CSharp.RegToGPLEX (p
+ -- modified from RegToFlex
+ 
+ import AbsBNF
++import Prelude hiding ((<>))
+ 
+ -- the top-level printing method
+ printRegGPLEX :: Reg -> String
+Index: b/src/BNFC/Backend/Common.hs
+===================================================================
+--- a/src/BNFC/Backend/Common.hs
++++ b/src/BNFC/Backend/Common.hs
+@@ -2,6 +2,7 @@ module BNFC.Backend.Common (renderListSe
+ -- Functions common to different backends
+ 
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ -- | Helper function for c-like languages that generates the code printing
+ -- the list separator according to the given precedence level:
+Index: b/src/BNFC/Backend/Common/NamedVariables.hs
+===================================================================
+--- a/src/BNFC/Backend/Common/NamedVariables.hs
++++ b/src/BNFC/Backend/Common/NamedVariables.hs
+@@ -73,6 +73,7 @@ import Data.List (nub)
+ import Text.PrettyPrint
+ import Control.Arrow (left, (&&&))
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+ 
+ type IVar = (String, Int)
+ --The type of an instance variable
+Index: b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
+===================================================================
+--- a/src/BNFC/Backend/Haskell/CFtoPrinter.hs
++++ b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
+@@ -27,6 +27,7 @@ import Data.Either (lefts)
+ import Data.List (sortBy)
+ import Data.Maybe (fromJust)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ -- derive pretty-printer from a BNF grammar. AR 15/2/2002
+ cf2Printer :: Bool -> Bool -> Bool -> String -> String -> CF -> String
+Index: b/src/BNFC/Backend/Haskell/ToCNF.hs
+===================================================================
+--- a/src/BNFC/Backend/Haskell/ToCNF.hs
++++ b/src/BNFC/Backend/Haskell/ToCNF.hs
+@@ -38,6 +38,7 @@ import Control.Applicative hiding (Const
+ import qualified Data.Map as M
+ import Data.Pair
+ import Text.PrettyPrint.HughesPJ hiding (first,(<>))
++import Prelude hiding ((<>))
+ 
+ -- Code generation
+ 
+Index: b/src/BNFC/Backend/Haskell/Utils.hs
+===================================================================
+--- a/src/BNFC/Backend/Haskell/Utils.hs
++++ b/src/BNFC/Backend/Haskell/Utils.hs
+@@ -8,6 +8,7 @@ module BNFC.Backend.Haskell.Utils
+ import Text.PrettyPrint
+ import BNFC.CF (Cat(..), identCat, normCat)
+ import BNFC.Utils (mkNames, NameStyle(..))
++import Prelude hiding ((<>))
+ 
+ -- | Create a valid parser function name for a given category
+ -- >>> parserName (Cat "Abcd")
+Index: b/src/BNFC/Backend/Java.hs
+===================================================================
+--- a/src/BNFC/Backend/Java.hs
++++ b/src/BNFC/Backend/Java.hs
+@@ -54,6 +54,7 @@ import BNFC.Backend.Java.CFtoFoldVisitor
+ import BNFC.Backend.Java.CFtoAllVisitor
+ import qualified BNFC.Backend.Common.Makefile as Makefile
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ -------------------------------------------------------------------
+ -- | Build the Java output.
+ -- FIXME: get everything to put the files in the right places.
+Index: b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
+===================================================================
+--- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
+@@ -27,6 +27,7 @@ import BNFC.Backend.Common.NamedVariable
+ import Data.List
+ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ cf2ComposVisitor :: String -> String -> CF -> String
+ cf2ComposVisitor packageBase packageAbsyn cf =
+Index: b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
+===================================================================
+--- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
+@@ -26,6 +26,7 @@ import BNFC.Utils ((+++))
+ import BNFC.Backend.Common.NamedVariables
+ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ cf2FoldVisitor :: String -> String -> CF -> String
+ cf2FoldVisitor packageBase packageAbsyn cf =
+Index: b/src/BNFC/Backend/Java/CFtoJLex15.hs
+===================================================================
+--- a/src/BNFC/Backend/Java/CFtoJLex15.hs
++++ b/src/BNFC/Backend/Java/CFtoJLex15.hs
+@@ -44,6 +44,7 @@ import BNFC.Backend.Java.RegToJLex
+ import BNFC.Utils ( (+++) )
+ import BNFC.Backend.Common.NamedVariables
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --The environment must be returned for the parser to use.
+ cf2jlex :: String -> CF -> Bool -> (Doc, SymEnv)
+Index: b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
+===================================================================
+--- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
+@@ -54,6 +54,7 @@ import Data.List
+ import Data.Char(toLower)
+ import Data.Maybe (mapMaybe)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --Produces abstract data types in Java.
+ --These follow Appel's "non-object oriented" version.
+Index: b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
+===================================================================
+--- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
+@@ -56,6 +56,7 @@ import Data.List
+ import Data.Char	( toLower, isSpace )
+ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --Produces the PrettyPrinter class.
+ --It will generate two methods "print" and "show"
+Index: b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
+===================================================================
+--- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
++++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
+@@ -46,6 +46,7 @@ import BNFC.Utils ((+++))
+ import BNFC.Backend.Common.NamedVariables
+ import Text.PrettyPrint
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+ 
+ --Produces a Skeleton using the Visitor Design Pattern.
+ --Thus the user can choose which Skeleton to use.
+Index: b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
+===================================================================
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
+@@ -27,6 +27,7 @@ import Data.List
+ import Data.Char
+ import Text.PrettyPrint hiding (render)
+ import qualified Text.PrettyPrint as PP
++import Prelude hiding ((<>))
+ 
+ import BNFC.CF
+ import AbsBNF
+Index: b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
+===================================================================
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
+@@ -28,6 +28,7 @@ import Data.Char(toLower)
+ import BNFC.Backend.OCaml.OCamlUtil
+ import BNFC.PrettyPrint
+ import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
++import Prelude hiding ((<>))
+ 
+ 
+ -- derive pretty-printer from a BNF grammar. AR 15/2/2002
+Index: b/src/BNFC/Backend/Pygments.hs
+===================================================================
+--- a/src/BNFC/Backend/Pygments.hs
++++ b/src/BNFC/Backend/Pygments.hs
+@@ -15,6 +15,7 @@ import BNFC.Lexing
+ import BNFC.Options hiding (Backend)
+ import BNFC.Utils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ makePygments :: SharedOptions -> CF -> Backend
+ makePygments opts cf = do
+Index: b/src/BNFC/Lexing.hs
+===================================================================
+--- a/src/BNFC/Lexing.hs
++++ b/src/BNFC/Lexing.hs
+@@ -6,6 +6,7 @@ import Data.List (inits)
+ import AbsBNF (Reg(..))
+ import PrintBNF
+ import BNFC.CF
++import Prelude hiding ((<>))
+ 
+ 
+ p :: Reg -> IO ()
+Index: b/src/BNFC/ToCNFCore.hs
+===================================================================
+--- a/src/BNFC/ToCNFCore.hs
++++ b/src/BNFC/ToCNFCore.hs
+@@ -41,6 +41,7 @@ import Data.Function (on)
+ import Data.Char (isAlphaNum,ord)
+ import Data.Pair
+ import Text.PrettyPrint.HughesPJ hiding (first,(<>))
++import Prelude hiding ((<>))
+ 
+ (f *** g) (a,b) = (f a, g b)
+ second g = id *** g
+Index: b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
+===================================================================
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
+@@ -23,6 +23,7 @@ import Text.PrettyPrint
+ 
+ import BNFC.CF
+ import BNFC.Backend.OCaml.OCamlUtil
++import Prelude hiding ((<>))
+ 
+ -- | OCaml comment
+ -- >>> comment "I'm a comment"
+Index: b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
+===================================================================
+--- a/src/BNFC/Backend/Haskell/CFtoTemplate.hs
++++ b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
+@@ -23,6 +23,7 @@ module BNFC.Backend.Haskell.CFtoTemplate
+ import BNFC.Backend.Haskell.Utils (catvars)
+ import BNFC.CF
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ type ModuleName = String
+ 
+Index: b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
+===================================================================
+--- a/src/BNFC/Backend/Haskell/CFtoAbstract.hs
++++ b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
+@@ -23,6 +23,7 @@ import BNFC.CF
+ import BNFC.Utils((+++))
+ import BNFC.Backend.Haskell.Utils (catToType, catvars)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ -- to produce a Haskell module
+ cf2Abstract :: Bool     -- ^ Use ByteString instead of String
+Index: b/src/BNFC/Backend/C/CFtoCSkel.hs
+===================================================================
+--- a/src/BNFC/Backend/C/CFtoCSkel.hs
++++ b/src/BNFC/Backend/C/CFtoCSkel.hs
+@@ -47,6 +47,7 @@ import Data.Char                ( toLowe
+ import Data.Either (lefts)
+ 
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+ --Produces (.H file, .C file)
+ cf2CSkel :: CF -> (String, String)

p/bnfc/debian/patches/series

+newer-base