[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.3.0-1
Iain Lane
laney at debian.org
Wed Nov 23 16:54:37 UTC 2011
The following commit has been merged in the master branch:
commit 3798aeeeee0c0468039ec9070afcf796aca3135a
Author: Iain Lane <laney at debian.org>
Date: Wed Nov 23 13:54:01 2011 +0000
Remove all patches. They are all now upstream.
diff --git a/debian/patches/0001-Compatibility-with-Alex-2.3.5-and-GHC-7.0.3.patch b/debian/patches/0001-Compatibility-with-Alex-2.3.5-and-GHC-7.0.3.patch
deleted file mode 100644
index 258539c..0000000
--- a/debian/patches/0001-Compatibility-with-Alex-2.3.5-and-GHC-7.0.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Date: Sun, 22 May 2011 17:26:58 +0100
-Subject: Compatibility with Alex 2.3.5 and GHC 7.0.3
-
----
- src/full/Agda/Syntax/Parser/Lexer.x | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/full/Agda/Syntax/Parser/Lexer.x b/src/full/Agda/Syntax/Parser/Lexer.x
-index 83a5285..e3959cf 100644
---- a/src/full/Agda/Syntax/Parser/Lexer.x
-+++ b/src/full/Agda/Syntax/Parser/Lexer.x
-@@ -1,5 +1,5 @@
- {
--{-# OPTIONS_GHC -fno-warn-deprecated-flags #-}
-+{-# OPTIONS_GHC -fno-warn-deprecated-flags -XBangPatterns #-}
- {-| The lexer is generated by Alex (<http://www.haskell.org/alex>) and is an
- adaptation of GHC's lexer. The main lexing function 'lexer' is called by
- the "Agda.Syntax.Parser.Parser" to get the next token from the input.
---
diff --git a/debian/patches/0002-Compatibility-with-src-exts-1.11.patch b/debian/patches/0002-Compatibility-with-src-exts-1.11.patch
deleted file mode 100644
index ca28c24..0000000
--- a/debian/patches/0002-Compatibility-with-src-exts-1.11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Date: Sun, 22 May 2011 17:26:58 +0100
-Subject: Compatibility with src-exts 1.11
-
----
- Agda.cabal | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Agda.cabal b/Agda.cabal
-index 5675dbe..f6a347b 100644
---- a/Agda.cabal
-+++ b/Agda.cabal
-@@ -77,7 +77,7 @@ library
- build-depends: epic >= 0.1.7 && < 0.2
- build-depends: mtl == 2.0.*,
- QuickCheck >= 2.3 && < 2.5,
-- haskell-src-exts >= 1.9.6 && < 1.10,
-+ haskell-src-exts >= 1.9.6 && < 1.12,
- containers >= 0.1.0 && < 1,
- pretty >= 1 && < 2,
- directory >= 1.0 && < 1.2,
---
diff --git a/debian/patches/0003-Compatibility-with-syb-0.4.patch b/debian/patches/0003-Compatibility-with-syb-0.4.patch
deleted file mode 100644
index 32e8a36..0000000
--- a/debian/patches/0003-Compatibility-with-syb-0.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Date: Sun, 22 May 2011 17:26:58 +0100
-Subject: Compatibility with syb 0.4
-
----
- Agda.cabal | 2 +-
- src/full/Agda/Interaction/Highlighting/Generate.hs | 1 -
- src/full/Agda/Utils/Generics.hs | 15 +++++++++++++--
- 3 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/Agda.cabal b/Agda.cabal
-index f6a347b..3d65b4c 100644
---- a/Agda.cabal
-+++ b/Agda.cabal
-@@ -90,7 +90,7 @@ library
- process >= 1.0.1.0 && < 2,
- haskeline >= 0.6.3.2 && < 0.7,
- xhtml == 3000.2.*,
-- syb >= 0.1 && < 0.3
-+ syb >= 0.1 && < 0.4
- build-tools: happy >= 1.15 && < 2,
- alex >= 2.0.1 && < 3
- extensions: CPP
-diff --git a/src/full/Agda/Interaction/Highlighting/Generate.hs b/src/full/Agda/Interaction/Highlighting/Generate.hs
-index 5a1d6d1..bde09f6 100644
---- a/src/full/Agda/Interaction/Highlighting/Generate.hs
-+++ b/src/full/Agda/Interaction/Highlighting/Generate.hs
-@@ -37,7 +37,6 @@ import Control.Monad.Trans
- import Control.Monad.State
- import Control.Applicative
- import Data.Monoid
--import Data.Generics
- import Data.Function
- import Agda.Utils.Generics
- import Agda.Utils.FileName
-diff --git a/src/full/Agda/Utils/Generics.hs b/src/full/Agda/Utils/Generics.hs
-index 4cd0e24..a78b1ef 100644
---- a/src/full/Agda/Utils/Generics.hs
-+++ b/src/full/Agda/Utils/Generics.hs
-@@ -1,9 +1,20 @@
- {-# LANGUAGE Rank2Types #-}
--{-| Contains some generic utility functions.
-+{-| Contains some generic utility functions and reexports certain
-+ definitions from "Data.Generics".
- -}
--module Agda.Utils.Generics where
-+module Agda.Utils.Generics
-+ ( module Data.Generics
-+ , isString
-+ , everythingBut
-+ , everywhereBut'
-+ , everywhereButM'
-+ ) where
-
-+-- The explicit import list is included in order to support several
-+-- versions of syb; one version of syb contains a definition named
-+-- everythingBut.
- import Data.Generics
-+ (GenericQ, mkQ, extQ, gmapQ, GenericT, gmapT, GenericM, gmapM)
-
- isString :: GenericQ Bool
- isString = mkQ False (const True :: String -> Bool)
---
diff --git a/debian/patches/0004-Add-an-alexGetByte-function-for-alex-3.0-compatibili.patch b/debian/patches/0004-Add-an-alexGetByte-function-for-alex-3.0-compatibili.patch
deleted file mode 100644
index 46bf152..0000000
--- a/debian/patches/0004-Add-an-alexGetByte-function-for-alex-3.0-compatibili.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Iain Lane <laney at debian.org>
-Date: Sat, 3 Sep 2011 22:01:39 +0100
-Subject: Add an alexGetByte function for alex-3.0 compatibility
-
----
- Agda.cabal | 2 +-
- src/full/Agda/Syntax/Parser/Alex.hs | 13 +++++++++++++
- 2 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/Agda.cabal b/Agda.cabal
-index 3d65b4c..a4fdc37 100644
---- a/Agda.cabal
-+++ b/Agda.cabal
-@@ -92,7 +92,7 @@ library
- xhtml == 3000.2.*,
- syb >= 0.1 && < 0.4
- build-tools: happy >= 1.15 && < 2,
-- alex >= 2.0.1 && < 3
-+ alex >= 2.0.1
- extensions: CPP
- exposed-modules: Agda.Main
- Agda.ImpossibleTest
-diff --git a/src/full/Agda/Syntax/Parser/Alex.hs b/src/full/Agda/Syntax/Parser/Alex.hs
-index 603944b..b53ecad 100644
---- a/src/full/Agda/Syntax/Parser/Alex.hs
-+++ b/src/full/Agda/Syntax/Parser/Alex.hs
-@@ -6,6 +6,7 @@ module Agda.Syntax.Parser.Alex
- ( -- * Alex requirements
- AlexInput(..)
- , alexInputPrevChar
-+ , alexGetByte
- , alexGetChar
- -- * Lex actions
- , LexAction, LexPredicate
-@@ -17,6 +18,8 @@ module Agda.Syntax.Parser.Alex
- where
-
- import Control.Monad.State
-+import Data.Word (Word8)
-+import Data.Char (ord)
-
- import Agda.Syntax.Position
- import Agda.Syntax.Parser.Monad
-@@ -35,6 +38,16 @@ data AlexInput = AlexInput
- alexInputPrevChar :: AlexInput -> Char
- alexInputPrevChar = lexPrevChar
-
-+-- for alex-3
-+alexGetByte :: AlexInput -> Maybe (Word8, AlexInput)
-+alexGetByte (AlexInput { lexInput = [] }) = Nothing
-+alexGetByte (AlexInput { lexInput = c:s, lexPos = p }) =
-+ Just (fromIntegral $ ord c, AlexInput
-+ { lexInput = s
-+ , lexPos = movePos p c
-+ , lexPrevChar = c
-+ }
-+ )
- -- | Lex a character. No surprises.
- alexGetChar :: AlexInput -> Maybe (Char, AlexInput)
- alexGetChar (AlexInput { lexInput = [] }) = Nothing
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2857bfa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-Compatibility-with-Alex-2.3.5-and-GHC-7.0.3.patch
-0002-Compatibility-with-src-exts-1.11.patch
-0003-Compatibility-with-syb-0.4.patch
-0004-Add-an-alexGetByte-function-for-alex-3.0-compatibili.patch
--
Packaging for Agda
More information about the Pkg-haskell-commits
mailing list