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

[Joachim Breitner]

Mon Mar 11 13:32:55 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: 1b42697912a72d857cb8c59c15fd8ead

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

Mon Mar 11 13:32:55 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: 1b42697912a72d857cb8c59c15fd8ead
diff -rN -u old-haskell-persistent-template//changelog new-haskell-persistent-template//changelog
--- old-haskell-persistent-template//changelog	2013-03-11 13:33:01.342142384 +0000
+++ new-haskell-persistent-template//changelog	2013-03-11 13:33:01.342142384 +0000
@@ -1,3 +1,33 @@
+haskell-persistent-template (1.1.2.4-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Tue, 26 Feb 2013 22:29:57 -0500
+
+haskell-persistent-template (1.1.1-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Thu, 20 Dec 2012 23:41:37 -0500
+
+haskell-persistent-template (1.0.0.2-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>  Sat, 20 Oct 2012 11:48:42 -0400
+
+haskell-persistent-template (0.9.0.2-2) unstable; urgency=low
+
+  * Cater for bogus persistent version
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Mar 2013 14:14:13 +0100
+
 haskell-persistent-template (0.9.0.2-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-persistent-template//control new-haskell-persistent-template//control
--- old-haskell-persistent-template//control	2013-03-11 13:33:01.334022456 +0000
+++ new-haskell-persistent-template//control	2013-03-11 13:33:01.346253985 +0000
@@ -14,8 +14,8 @@
   , libghc-monad-control-dev (>> 0.2)
   , libghc-monad-control-dev (<< 0.4)
   , libghc-monad-control-prof
-  , libghc-persistent-dev (>> 0.9)
-  , libghc-persistent-dev (<< 0.10)
+  , libghc-persistent-dev (>> 1.1.2)
+  , libghc-persistent-dev (<< 1.2)
   , libghc-persistent-prof
   , libghc-text-dev (>> 0.5)
   , libghc-text-dev (<< 1.0)