[Pkg-haskell-commits] darcs: haskell-yesod-persistent: Merge from unstable

[Joachim Breitner]

Mon Mar 11 15:03:22 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: d971dff68e76a67748e7960fa5070454

    M ./changelog +24
    M ./control -2 +2

Mon Mar 11 15:03:22 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: d971dff68e76a67748e7960fa5070454
diff -rN -u old-haskell-yesod-persistent//changelog new-haskell-yesod-persistent//changelog
--- old-haskell-yesod-persistent//changelog	2013-03-11 15:03:30.555025395 +0000
+++ new-haskell-yesod-persistent//changelog	2013-03-11 15:03:30.559024820 +0000
@@ -1,3 +1,27 @@
+haskell-yesod-persistent (1.1.0.1-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Thu, 03 Jan 2013 21:01:48 -0500
+
+haskell-yesod-persistent (1.1.0-1) experimental; urgency=low
+
+  [ Joachim Breitner ]
+  * Depend on haskell-devscripts 0.8.13 to ensure this package is built
+    against experimental
+  * Bump standards version, no change
+
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sun, 21 Oct 2012 12:52:56 -0400
+
+haskell-yesod-persistent (1.0.0.1-2) unstable; urgency=low
+
+  * Cater for bogus persistent version
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Mar 2013 14:11:07 +0100
+
 haskell-yesod-persistent (1.0.0.1-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-yesod-persistent//control new-haskell-yesod-persistent//control
--- old-haskell-yesod-persistent//control	2013-03-11 15:03:30.555025395 +0000
+++ new-haskell-yesod-persistent//control	2013-03-11 15:03:30.559024820 +0000
@@ -8,8 +8,8 @@
   , haskell-devscripts (>= 0.8.13)
   , ghc
   , ghc-prof
-  , libghc-persistent-dev (>> 0.9)
-  , libghc-persistent-dev (<< 0.10)
+  , libghc-persistent-dev (>> 1.0)
+  , libghc-persistent-dev (<< 1.2)
   , libghc-persistent-prof
   , libghc-persistent-template-dev (>> 1.0)
   , libghc-persistent-template-dev (<< 1.2)