haskell-yesod-form: New upstream version 1.2.0.

4 files changed, 15 insertions, 37 deletions

diff --git a/p/haskell-yesod-form/debian/changelog b/p/haskell-yesod-form/debian/changelog
index a4f51319b..bb285bc3f 100644
--- a/p/haskell-yesod-form/debian/changelog
+++ b/p/haskell-yesod-form/debian/changelog
@@ -1,3 +1,9 @@
+haskell-yesod-form (1.2.0-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Sun, 18 Nov 2012 12:37:50 -0500
+
 haskell-yesod-form (1.1.3-1) experimental; urgency=low
 
   [ Joachim Breitner ]
diff --git a/p/haskell-yesod-form/debian/control b/p/haskell-yesod-form/debian/control
index 04db744e4..a0e925a40 100644
--- a/p/haskell-yesod-form/debian/control
+++ b/p/haskell-yesod-form/debian/control
@@ -8,6 +8,11 @@ Build-Depends: debhelper (>= 7)
   , haskell-devscripts (>= 0.8.13)
   , ghc
   , ghc-prof
+  , libghc-aeson-dev
+  , libghc-aeson-prof
+  , libghc-attoparsec-dev (>> 0.10)
+  , libghc-attoparsec-dev (<< 0.11)
+  , libghc-attoparsec-prof
   , libghc-blaze-builder-dev (>> 0.2.1.4)
   , libghc-blaze-builder-dev (<< 0.4)
   , libghc-blaze-builder-prof
@@ -36,8 +41,8 @@ Build-Depends: debhelper (>= 7)
   , libghc-shakespeare-css-dev (>> 1.0)
   , 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
   , ghc-ghci
   , libghc-text-dev (>> 0.9)
@@ -59,6 +64,8 @@ Build-Depends: debhelper (>= 7)
   , libghc-yesod-persistent-dev (<< 1.2)
   , libghc-yesod-persistent-prof
 Build-Depends-Indep: ghc-doc
+  , libghc-aeson-doc
+  , libghc-attoparsec-doc
   , libghc-blaze-builder-doc
   , libghc-blaze-html-doc
   , libghc-blaze-markup-doc
diff --git a/p/haskell-yesod-form/debian/patches/dont-confuse-haddock.diff b/p/haskell-yesod-form/debian/patches/dont-confuse-haddock.diff
deleted file mode 100644
index 144564326..000000000
--- a/p/haskell-yesod-form/debian/patches/dont-confuse-haddock.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: yesod-form-1.1.3/Yesod/Form/Types.hs
-===================================================================
---- yesod-form-1.1.3.orig/Yesod/Form/Types.hs	2012-09-24 14:15:01.000000000 +0000
-+++ yesod-form-1.1.3/Yesod/Form/Types.hs	2012-10-21 18:27:22.601582777 +0000
-@@ -125,11 +125,12 @@
-
- data Field sub master a = Field
-     { fieldParse :: [Text] -> GHandler sub master (Either (SomeMessage master) (Maybe a))
--    , fieldView :: Text -- ^ ID
--                -> Text -- ^ Name
--                -> [(Text, Text)] -- ^ Attributes
--                -> Either Text a -- ^ Either (invalid text) or (legitimate result)
--                -> Bool -- ^ Required?
-+      -- | ID, Name, Attributes, Either (invalid text) or (legitimate result), Required?
-+    , fieldView :: Text --
-+                -> Text --
-+                -> [(Text, Text)] --
-+                -> Either Text a --
-+                -> Bool --
-                 -> GWidget sub master ()
-     }
-
-Index: yesod-form-1.1.3/Yesod/Form/Functions.hs
-===================================================================
---- yesod-form-1.1.3.orig/Yesod/Form/Functions.hs	2012-09-24 14:15:01.000000000 +0000
-+++ yesod-form-1.1.3/Yesod/Form/Functions.hs	2012-10-21 18:28:55.472901040 +0000
-@@ -202,7 +202,7 @@
-                         FormFailure [renderMessage m langs MsgCsrfWarning]
-                 _ -> res
-             where (Just [t1]) === (Just t2) = TE.encodeUtf8 t1 `constTimeEq` TE.encodeUtf8 t2
--                  Nothing     === Nothing   = True   -- ^ It's important to use constTimeEq
-+                  Nothing     === Nothing   = True   -- It's important to use constTimeEq
-                   _           === _         = False  -- in order to avoid timing attacks.
-     return ((res', xml), enctype)
diff --git a/p/haskell-yesod-form/debian/patches/series b/p/haskell-yesod-form/debian/patches/series
deleted file mode 100644
index 0e2f064f4..000000000
--- a/p/haskell-yesod-form/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dont-confuse-haddock.diff