hunk ./build-deps.patch 1 ---- haskell-cgi/debian/control~ 2008-03-09 08:03:18.000000000 -0700 -+++ haskell-cgi/debian/control 2008-03-09 13:11:56.000000000 -0700 -@@ -3,7 +3,7 @@ - Priority: optional - Maintainer: Ian Lynagh (wibble) - Standards-Version: 3.7.3 --Build-Depends: debhelper (>= 5), haddock (>= 0.8-2), hscolour, haskell-utils (>= 1.10), ghc6 (>= 6.8.2), ghc6 (<< 6.8.2+), ghc6-prof (>= 6.8.2), ghc6-prof (<< 6.8.2+), ghc6-doc (>= 6.8.2), ghc6-doc (<< 6.8.2+), libghc6-network-dev (= 2.1.0.0-2), libghc6-parsec-dev (= 2.1.0.0-2), libghc6-mtl-dev (= 1.1.0.0-2), libghc6-xhtml-dev (= 3000.0.2.1-2), libghc6-network-prof (= 2.1.0.0-2), libghc6-parsec-prof (= 2.1.0.0-2), libghc6-mtl-prof (= 1.1.0.0-2), libghc6-xhtml-prof (= 3000.0.2.1-2), libghc6-network-doc (= 2.1.0.0-2), libghc6-parsec-doc (= 2.1.0.0-2), libghc6-mtl-doc (= 1.1.0.0-2), libghc6-xhtml-doc (= 3000.0.2.1-2) -+Build-Depends: debhelper (>= 5), haddock (>= 0.8-2), hscolour, haskell-utils (>= 1.11), ghc6 (>= 6.8.2), ghc6 (<< 6.8.2+), ghc6-prof (>= 6.8.2), ghc6-prof (<< 6.8.2+), ghc6-doc (>= 6.8.2), ghc6-doc (<< 6.8.2+), libghc6-network-dev, libghc6-parsec-dev, libghc6-mtl-dev, libghc6-xhtml-dev, libghc6-network-prof, libghc6-parsec-prof, libghc6-mtl-prof, libghc6-xhtml-prof, libghc6-network-doc, libghc6-parsec-doc, libghc6-mtl-doc, libghc6-xhtml-doc - - Package: libghc6-cgi-dev - Section: libdevel ---- haskell-cgi/debian/control.in.orig 2008-03-09 08:03:18.000000000 -0700 -+++ haskell-cgi/debian/control.in 2008-03-09 13:17:54.000000000 -0700 -@@ -3,7 +3,7 @@ - Priority: optional - Maintainer: ${maintainer} - Standards-Version: 3.7.3 --Build-Depends: &{canonicalise-comma-list:debhelper (>= 5), haddock (>= 0.8-2), hscolour, haskell-utils (>= 1.10), ${impl:ghc6:lib:build_deps}, ${cabal:deps:ghc6:dev}, ${cabal:deps:ghc6:prof}, ${cabal:deps:ghc6:doc}, ${c_dev_libs}, ${extra_build_deps}} -+Build-Depends: &{canonicalise-comma-list:debhelper (>= 5), haddock (>= 0.8-2), hscolour, haskell-utils (>= 1.10), ${impl:ghc6:lib:build_deps}, ${cabal:bdeps:ghc6:dev}, ${cabal:bdeps:ghc6:prof}, ${cabal:deps:ghc6:doc}, ${c_dev_libs}, ${extra_build_deps}} - - Package: ${this:ghc6:dev} - Section: libdevel rmfile ./build-deps.patch hunk ./changelog 1 +haskell-cgi (6) unstable; urgency=low + + * Remove everything, add a patch to build under ghc 6.13. + + -- David Fox Tue, 05 Jan 2010 09:18:04 -0800 + hunk ./docarch.diff 1 ---- x/debian/control.in~ 2008-09-21 06:03:13.000000000 -0700 -+++ x/debian/control.in 2008-09-21 06:20:02.000000000 -0700 -@@ -27,7 +27,7 @@ - - Package: ${this:ghc6:doc} - Section: doc --Architecture: all -+Architecture: any - Depends: &{canonicalise-comma-list:\${shlibs:Depends}, \${misc:Depends}, ${impl:ghc6:lib:doc_deps}, ${cabal:deps:ghc6:doc}} - Suggests: &{canonicalise-comma-list:${this:ghc6:dev}, ${this:ghc6:prof}} - Description: ${short_description}; documentation ---- x/debian/control~ 2008-09-21 06:03:13.000000000 -0700 -+++ x/debian/control 2008-09-21 06:19:57.000000000 -0700 -@@ -30,7 +30,7 @@ - - Package: libghc6-cgi-doc - Section: doc --Architecture: all -+Architecture: any - Depends: ${shlibs:Depends}, ${misc:Depends}, ghc6-doc (>= 6.8.2), libghc6-network-doc (= 2.1.0.0-2), libghc6-parsec-doc (= 2.1.0.0-2), libghc6-mtl-doc (= 1.1.0.0-2), libghc6-xhtml-doc (= 3000.0.2.1-2) - Suggests: libghc6-cgi-dev, libghc6-cgi-prof - Description: Haskell CGI library for GHC; documentation rmfile ./docarch.diff addfile ./ghc613.diff hunk ./ghc613.diff 1 +--- cgi/cgi.cabal~ 2010-01-05 09:18:32.000000000 -0800 ++++ cgi/cgi.cabal 2010-01-05 09:06:46.000000000 -0800 +@@ -29,15 +29,7 @@ + Extensions: MultiParamTypeClasses + ghc-options: -Wall + +- Build-depends: network>=2.0, parsec >= 2.0, mtl >= 1.0, xhtml >= 3000.0.0 +- If flag(split-base) +- Build-depends: base == 3.*, old-time, old-locale, containers +- Else +- Build-depends: base < 3 +- If flag(bytestring-in-base) +- Build-depends: base >= 2 && < 3 +- Else +- Build-depends: base < 2 || == 3.*, bytestring ++ Build-depends: base, bytestring, containers, old-time, old-locale, network>=2.0, parsec >= 2.0, mtl >= 1.0, xhtml >= 3000.0.0 + + --Executable: printinput + --Main-Is: printinput.hs +--- haskell-cgi-3001.1.7.1/Network/CGI/Compat.hs~ 2010-01-05 09:19:23.000000000 -0800 ++++ haskell-cgi-3001.1.7.1/Network/CGI/Compat.hs 2010-01-05 09:07:55.000000000 -0800 +@@ -20,7 +20,7 @@ + ) where + + import Control.Concurrent (forkIO) +-import Control.Exception as Exception (Exception,throw,catch,finally) ++import Control.OldException as Exception (Exception,throw,catch,finally) + import Control.Monad (unless) + import Control.Monad.Trans (MonadIO, liftIO) + import qualified Data.Map as Map +--- haskell-cgi-3001.1.7.1/Network/CGI/Monad.hs~ 2010-01-05 09:19:15.000000000 -0800 ++++ haskell-cgi-3001.1.7.1/Network/CGI/Monad.hs 2010-01-05 09:07:13.000000000 -0800 +@@ -27,7 +27,7 @@ + throwCGI, catchCGI, tryCGI, handleExceptionCGI, + ) where + +-import Control.Exception as Exception (Exception, try, throwIO) ++import Control.OldException as Exception (Exception, try, throwIO) + import Control.Monad (liftM) + import Control.Monad.Error (MonadError(..)) + import Control.Monad.Reader (ReaderT(..), asks) +--- haskell-cgi-3001.1.7.1/Network/CGI.hs~ 2010-01-05 09:19:04.000000000 -0800 ++++ haskell-cgi-3001.1.7.1/Network/CGI.hs 2010-01-05 09:08:15.000000000 -0800 +@@ -94,7 +94,7 @@ + , module Network.CGI.Compat + ) where + +-import Control.Exception (Exception(..)) ++import Control.OldException (Exception(..)) + import Control.Monad (liftM) + import Control.Monad.Trans (MonadIO, liftIO) + import Data.Char (toUpper) hunk ./haddock21.diff 1 ---- x/debian/rules~ 2008-05-26 23:59:23.000000000 +0000 -+++ x/debian/rules 2008-06-01 15:48:38.000000000 +0000 -@@ -34,7 +34,7 @@ - $(GHC) --make Setup.*hs -o setup-ghc - ./setup-ghc configure --ghc --with-compiler=$(GHC) --prefix=/usr --docdir=/usr/share/doc/ghc6-doc/libraries/$(CABAL_PACKAGE) --htmldir=/usr/share/doc/ghc6-doc/libraries/$(CABAL_PACKAGE) $(CONFIGURE_OPTS) - ./setup-ghc build -- ./setup-ghc haddock --hyperlink-source -+ ./setup-ghc haddock - - touch $@ - rmfile ./haddock21.diff hunk ./relax.diff 1 ---- a/debian/control~ 2008-08-29 05:52:21.000000000 -0700 -+++ b/debian/control 2008-08-29 06:06:45.000000000 -0700 -@@ -3,12 +3,12 @@ - Priority: optional - Maintainer: Ian Lynagh (wibble) - Standards-Version: 3.7.3 --Build-Depends: debhelper (>= 5), haddock (>= 0.8-2), hscolour, haskell-utils (>= 1.11), ghc6 (>= 6.8.2), ghc6 (<< 6.8.2+), ghc6-prof (>= 6.8.2), ghc6-prof (<< 6.8.2+), ghc6-doc (>= 6.8.2), ghc6-doc (<< 6.8.2+), libghc6-network-dev, libghc6-parsec-dev, libghc6-mtl-dev, libghc6-xhtml-dev, libghc6-network-prof, libghc6-parsec-prof, libghc6-mtl-prof, libghc6-xhtml-prof, libghc6-network-doc, libghc6-parsec-doc, libghc6-mtl-doc, libghc6-xhtml-doc -+Build-Depends: debhelper (>= 5), haddock (>= 0.8-2), hscolour, haskell-utils (>= 1.11), ghc6 (>= 6.8.2), ghc6-prof (>= 6.8.2), ghc6-doc (>= 6.8.2), libghc6-network-dev, libghc6-parsec-dev, libghc6-mtl-dev, libghc6-xhtml-dev, libghc6-network-prof, libghc6-parsec-prof, libghc6-mtl-prof, libghc6-xhtml-prof, libghc6-network-doc, libghc6-parsec-doc, libghc6-mtl-doc, libghc6-xhtml-doc - - Package: libghc6-cgi-dev - Section: libdevel - Architecture: any --Depends: ghc6 (>= 6.8.2), ghc6 (<< 6.8.2+), ${shlibs:Depends}, ${misc:Depends}, libghc6-network-dev (= 2.1.0.0-2), libghc6-parsec-dev (= 2.1.0.0-2), libghc6-mtl-dev (= 1.1.0.0-2), libghc6-xhtml-dev (= 3000.0.2.1-2) -+Depends: ghc6 (>= 6.8.2), ${shlibs:Depends}, ${misc:Depends}, libghc6-network-dev (= 2.1.0.0-2), libghc6-parsec-dev (= 2.1.0.0-2), libghc6-mtl-dev (= 1.1.0.0-2), libghc6-xhtml-dev (= 3000.0.2.1-2) - Suggests: libghc6-cgi-prof, libghc6-cgi-doc - Description: Haskell CGI library for GHC - This package provides a library for the Haskell programming language. -@@ -19,7 +19,7 @@ - Package: libghc6-cgi-prof - Section: libdevel - Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends}, libghc6-cgi-dev, ghc6-prof (>= 6.8.2), ghc6-prof (<< 6.8.2+), libghc6-network-prof (= 2.1.0.0-2), libghc6-parsec-prof (= 2.1.0.0-2), libghc6-mtl-prof (= 1.1.0.0-2), libghc6-xhtml-prof (= 3000.0.2.1-2) -+Depends: ${shlibs:Depends}, ${misc:Depends}, libghc6-cgi-dev, ghc6-prof (>= 6.8.2), libghc6-network-prof (= 2.1.0.0-2), libghc6-parsec-prof (= 2.1.0.0-2), libghc6-mtl-prof (= 1.1.0.0-2), libghc6-xhtml-prof (= 3000.0.2.1-2) - Suggests: libghc6-cgi-doc - Description: Haskell CGI library for GHC; profiling libraries - This package provides a library for the Haskell programming language, -@@ -31,7 +31,7 @@ - Package: libghc6-cgi-doc - Section: doc - Architecture: all --Depends: ${shlibs:Depends}, ${misc:Depends}, ghc6-doc (>= 6.8.2), ghc6-doc (<< 6.8.2+), libghc6-network-doc (= 2.1.0.0-2), libghc6-parsec-doc (= 2.1.0.0-2), libghc6-mtl-doc (= 1.1.0.0-2), libghc6-xhtml-doc (= 3000.0.2.1-2) -+Depends: ${shlibs:Depends}, ${misc:Depends}, ghc6-doc (>= 6.8.2), libghc6-network-doc (= 2.1.0.0-2), libghc6-parsec-doc (= 2.1.0.0-2), libghc6-mtl-doc (= 1.1.0.0-2), libghc6-xhtml-doc (= 3000.0.2.1-2) - Suggests: libghc6-cgi-dev, libghc6-cgi-prof - Description: Haskell CGI library for GHC; documentation - This package provides the documentation for a library for the Haskell rmfile ./relax.diff hunk ./series 1 -build-deps.patch -update.diff -haddock21.diff -relax.diff -docarch.diff +ghc613.diff hunk ./update.diff 1 ---- x/debian/rules~ 2008-03-09 08:03:18.000000000 -0700 -+++ x/debian/rules 2008-03-10 05:05:11.000000000 -0700 -@@ -27,7 +27,7 @@ - endif - - build: build-stamp --build-stamp: -+build-stamp: update-generated-files - dh_testdir - - update-haskell-control --check rmfile ./update.diff