[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.2.10-3-2-gaf671fe

[Iain Lane]

The following commit has been merged in the master branch:
commit 16d953e06e57acb193e48e0a1b41bb61ece037ff
Author: Iain Lane <laney at debian.org>
Date:   Wed Jun 8 09:34:15 2011 +0100

    Remove old left-around patches

diff --git a/debian/patches/ghc-alex b/debian/patches/ghc-alex
deleted file mode 100644
index 5309415..0000000
--- a/debian/patches/ghc-alex
+++ /dev/null
@@ -1,9 +0,0 @@
---- agda-2.2.10.orig/src/full/Agda/Syntax/Parser/Lexer.x
-+++ agda-2.2.10/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/src-exts-1.11 b/debian/patches/src-exts-1.11
deleted file mode 100644
index 6c47899..0000000
--- a/debian/patches/src-exts-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
---- agda-2.2.10.orig/Agda.cabal
-+++ agda-2.2.10/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.11,
-                     containers >= 0.1.0 && < 1,
-                     pretty >= 1 && < 2,
-                     directory >= 1.0 && < 1.2,
diff --git a/debian/patches/syb-0.4 b/debian/patches/syb-0.4
deleted file mode 100644
index 93af74f..0000000
--- a/debian/patches/syb-0.4
+++ /dev/null
@@ -1,46 +0,0 @@
---- agda-2.2.10.orig/Agda.cabal
-+++ agda-2.2.10/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
---- agda-2.2.10.orig/src/full/Agda/Interaction/Highlighting/Generate.hs
-+++ agda-2.2.10/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
---- agda-2.2.10.orig/src/full/Agda/Utils/Generics.hs
-+++ agda-2.2.10/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)

-- 
Packaging for Agda