haskell-yesod: New upstream version 1.1.4.

4 files changed, 113 insertions, 48 deletions

diff --git a/p/haskell-yesod/debian/changelog b/p/haskell-yesod/debian/changelog
index f3240b314..08f9f00a6 100644
--- a/p/haskell-yesod/debian/changelog
+++ b/p/haskell-yesod/debian/changelog
@@ -1,10 +1,14 @@
-haskell-yesod (1.0.1.6-3) UNRELEASED; urgency=low
+haskell-yesod (1.1.4-1) experimental; urgency=low
 
-  * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
+  [ Joachim Breitner ]
+  * Depend on haskell-devscripts 0.8.13 to ensure this package is built
     against experimental
   * Bump standards version, no change
 
- -- Joachim Breitner <nomeata@debian.org>  Sat, 13 Oct 2012 14:14:23 +0200
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Sun, 18 Nov 2012 15:03:26 -0500
 
 haskell-yesod (1.0.1.6-2) unstable; urgency=low
 
diff --git a/p/haskell-yesod/debian/control b/p/haskell-yesod/debian/control
index 64f99cb18..32c12d42b 100644
--- a/p/haskell-yesod/debian/control
+++ b/p/haskell-yesod/debian/control
@@ -10,95 +10,165 @@ Build-Depends: debhelper (>= 7)
   , ghc-prof
   , libghc-attoparsec-dev (>> 0.10)
   , libghc-attoparsec-prof
+  , libghc-base64-bytestring-dev
+  , libghc-base64-bytestring-prof
   , libghc-blaze-builder-dev (>> 0.2.1.4)
   , libghc-blaze-builder-dev (<< 0.4)
   , libghc-blaze-builder-prof
-  , libghc-blaze-html-dev (>> 0.4.1.3)
-  , libghc-blaze-html-dev (<< 0.5)
+  , libghc-blaze-html-dev (>> 0.5)
+  , libghc-blaze-html-dev (<< 0.6)
   , libghc-blaze-html-prof
-  , libghc-fast-logger-dev (>> 0.0.2)
-  , libghc-fast-logger-dev (<< 0.1)
-  , libghc-fast-logger-prof
-  , libghc-hamlet-dev (>> 1.0)
-  , libghc-hamlet-dev (<< 1.1)
+  , libghc-blaze-markup-dev (>> 0.5.1)
+  , libghc-blaze-markup-dev (<< 0.6)
+  , libghc-blaze-markup-prof
+  , libghc-conduit-dev (>> 0.5)
+  , libghc-conduit-dev (<< 0.6)
+  , libghc-conduit-prof
+  , libghc-file-embed-dev
+  , libghc-file-embed-prof
+  , libghc-fsnotify-dev (>> 0.0)
+  , libghc-fsnotify-dev (<< 0.1)
+  , libghc-fsnotify-prof
+  , libghc-ghc-paths-dev (>> 0.1)
+  , libghc-ghc-paths-prof
+  , libghc-hamlet-dev (>> 1.1)
+  , libghc-hamlet-dev (<< 1.2)
   , libghc-hamlet-prof
-  , libghc-http-types-dev (>> 0.6.1)
-  , libghc-http-types-dev (<< 0.7)
+  , libghc-http-conduit-dev
+  , libghc-http-conduit-prof
+  , libghc-http-reverse-proxy-dev (>> 0.1.0.4)
+  , libghc-http-reverse-proxy-prof
+  , libghc-http-types-dev (>> 0.7)
+  , libghc-http-types-dev (<< 0.8)
   , libghc-http-types-prof
+  , libghc-lifted-base-dev
+  , libghc-lifted-base-prof
   , libghc-monad-control-dev (>> 0.3)
   , libghc-monad-control-dev (<< 0.4)
   , libghc-monad-control-prof
+  , libghc-network-dev
+  , libghc-network-prof
+  , libghc-optparse-applicative-dev (>> 0.4)
+  , libghc-optparse-applicative-dev (<< 0.5)
+  , libghc-optparse-applicative-prof
   , libghc-parsec3-dev
   , libghc-parsec3-prof
-  , libghc-shakespeare-css-dev (>> 1.0)
+  , libghc-project-template-dev (>> 0.1)
+  , libghc-project-template-prof
+  , libghc-resourcet-dev (>> 0.3)
+  , libghc-resourcet-dev (<< 0.5)
+  , libghc-resourcet-prof
+  , libghc-shakespeare-dev (>> 1.0.2)
+  , libghc-shakespeare-dev (<< 1.1)
+  , libghc-shakespeare-prof
+  , libghc-shakespeare-css-dev (>> 1.0.2)
   , libghc-shakespeare-css-dev (<< 1.1)
   , libghc-shakespeare-css-prof
-  , libghc-shakespeare-js-dev (>> 1.0)
-  , libghc-shakespeare-js-dev (<< 1.1)
+  , libghc-shakespeare-js-dev (>> 1.0.2)
+  , libghc-shakespeare-js-dev (<< 1.2)
   , libghc-shakespeare-js-prof
   , libghc-shakespeare-text-dev (>> 1.0)
   , libghc-shakespeare-text-dev (<< 1.1)
   , libghc-shakespeare-text-prof
+  , libghc-split-dev (>> 0.2)
+  , libghc-split-dev (<< 0.3)
+  , libghc-split-prof
+  , libghc-system-fileio-dev (>> 0.3)
+  , libghc-system-fileio-dev (<< 0.4)
+  , libghc-system-fileio-prof
+  , libghc-system-filepath-dev (>> 0.4)
+  , libghc-system-filepath-dev (<< 0.5)
+  , libghc-system-filepath-prof
+  , libghc-tar-dev (>> 0.4)
+  , libghc-tar-dev (<< 0.5)
+  , libghc-tar-prof
   , ghc-ghci
   , libghc-text-dev (>> 0.11)
-  , libghc-text-dev (<< 0.12)
   , libghc-text-prof
   , libghc-transformers-dev (>> 0.2.2)
   , libghc-transformers-dev (<< 0.4)
   , libghc-transformers-prof
   , libghc-unix-compat-dev (>> 0.2)
-  , libghc-unix-compat-dev (<< 0.4)
+  , libghc-unix-compat-dev (<< 0.5)
   , libghc-unix-compat-prof
-  , libghc-wai-dev (>> 1.2)
-  , libghc-wai-dev (<< 1.3)
+  , libghc-unordered-containers-dev
+  , libghc-unordered-containers-prof
+  , libghc-wai-dev (>> 1.3)
+  , libghc-wai-dev (<< 1.4)
   , libghc-wai-prof
-  , libghc-wai-extra-dev (>> 1.2)
-  , libghc-wai-extra-dev (<< 1.3)
+  , libghc-wai-extra-dev (>> 1.3)
+  , libghc-wai-extra-dev (<< 1.4)
   , libghc-wai-extra-prof
-  , libghc-wai-logger-dev (>> 0.1.2)
-  , libghc-wai-logger-prof
-  , libghc-warp-dev (>> 1.2)
-  , libghc-warp-dev (<< 1.3)
+  , libghc-warp-dev (>> 1.3)
+  , libghc-warp-dev (<< 1.4)
   , libghc-warp-prof
-  , libghc-yesod-auth-dev (>> 1.0)
-  , libghc-yesod-auth-dev (<< 1.1)
+  , libghc-yaml-dev (>> 0.8)
+  , libghc-yaml-dev (<< 0.9)
+  , libghc-yaml-prof
+  , libghc-yesod-auth-dev (>> 1.1)
+  , libghc-yesod-auth-dev (<< 1.2)
   , libghc-yesod-auth-prof
-  , libghc-yesod-core-dev (>> 1.0)
-  , libghc-yesod-core-dev (<< 1.1)
+  , libghc-yesod-core-dev (>> 1.1.5)
+  , libghc-yesod-core-dev (<< 1.2)
   , libghc-yesod-core-prof
-  , libghc-yesod-form-dev (>> 1.0)
-  , libghc-yesod-form-dev (<< 1.1)
+  , libghc-yesod-default-dev (>> 1.1.1)
+  , libghc-yesod-default-dev (<< 1.2)
+  , libghc-yesod-default-prof
+  , libghc-yesod-form-dev (>> 1.1)
+  , libghc-yesod-form-dev (<< 1.3)
   , libghc-yesod-form-prof
-  , libghc-yesod-json-dev (>> 1.0)
-  , libghc-yesod-json-dev (<< 1.1)
+  , libghc-yesod-json-dev (>> 1.1)
+  , libghc-yesod-json-dev (<< 1.2)
   , libghc-yesod-json-prof
-  , libghc-yesod-persistent-dev (>> 1.0)
-  , libghc-yesod-persistent-dev (<< 1.1)
+  , libghc-yesod-persistent-dev (>> 1.1)
+  , libghc-yesod-persistent-dev (<< 1.2)
   , libghc-yesod-persistent-prof
+  , libghc-zlib-dev (>> 0.5)
+  , libghc-zlib-dev (<< 0.6)
+  , libghc-zlib-prof
 Build-Depends-Indep: ghc-doc
   , libghc-attoparsec-doc
   , libghc-blaze-builder-doc
   , libghc-blaze-html-doc
-  , libghc-fast-logger-doc
+  , libghc-blaze-markup-doc
+  , libghc-conduit-doc
+  , libghc-file-embed-doc
+  , libghc-fsnotify-doc
+  , libghc-ghc-paths-doc
   , libghc-hamlet-doc
+  , libghc-http-conduit-doc
+  , libghc-http-reverse-proxy-doc
   , libghc-http-types-doc
+  , libghc-lifted-base-doc
   , libghc-monad-control-doc
+  , libghc-network-doc
+  , libghc-optparse-applicative-doc
   , libghc-parsec3-doc
+  , libghc-project-template-doc
+  , libghc-resourcet-doc
+  , libghc-shakespeare-doc
   , libghc-shakespeare-css-doc
   , libghc-shakespeare-js-doc
   , libghc-shakespeare-text-doc
+  , libghc-split-doc
+  , libghc-system-fileio-doc
+  , libghc-system-filepath-doc
+  , libghc-tar-doc
   , libghc-text-doc
   , libghc-transformers-doc
   , libghc-unix-compat-doc
+  , libghc-unordered-containers-doc
   , libghc-wai-doc
   , libghc-wai-extra-doc
-  , libghc-wai-logger-doc
   , libghc-warp-doc
+  , libghc-yaml-doc
   , libghc-yesod-auth-doc
   , libghc-yesod-core-doc
+  , libghc-yesod-default-doc
   , libghc-yesod-form-doc
   , libghc-yesod-json-doc
   , libghc-yesod-persistent-doc
+  , libghc-zlib-doc
 Standards-Version: 3.9.4
 Homepage: http://hackage.haskell.org/package/yesod
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-yesod
@@ -116,7 +186,9 @@ Recommends: ghc
   , libghc-yesod-static-dev
   , libghc-yesod-test-dev
   , libghc-yesod-form-dev
+  , libghc-aeson-dev
   , libghc-clientsession-dev
+  , libghc-data-default-dev
   , libghc-text-dev
   , libghc-persistent-dev
   , libghc-persistent-sqlite-dev
diff --git a/p/haskell-yesod/debian/patches/no-yesod-platform.diff b/p/haskell-yesod/debian/patches/no-yesod-platform.diff
deleted file mode 100644
index dc48ad100..000000000
--- a/p/haskell-yesod/debian/patches/no-yesod-platform.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/scaffold/project.cabal.cg
-+++ b/scaffold/project.cabal.cg
-@@ -50,7 +50,6 @@
-                 NoMonomorphismRestriction
-
-     build-depends: base                          >= 4          && < 5
--                 , yesod-platform                >= 1.0        && < 1.1
-                  , yesod                         >= 1.0        && < 1.1
-                  , yesod-core                    >= 1.0        && < 1.1
-                  , yesod-auth                    >= 1.0        && < 1.1
diff --git a/p/haskell-yesod/debian/patches/series b/p/haskell-yesod/debian/patches/series
deleted file mode 100644
index c0dd4fc68..000000000
--- a/p/haskell-yesod/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-no-yesod-platform.diff