[Pkg-haskell-commits] darcs: haskell-unordered-containers: Merge from unstable

[Joachim Breitner]

Thu Mar 21 19:09:07 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: 1462ca257103d95be52766fe6fb6a85b

    M ./changelog +19
    M ./control -6 +5
    M ./rules +2

Thu Mar 21 19:09:07 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge from unstable
  Ignore-this: 1462ca257103d95be52766fe6fb6a85b
diff -rN -u old-haskell-unordered-containers//changelog new-haskell-unordered-containers//changelog
--- old-haskell-unordered-containers//changelog	2013-03-21 19:09:43.915021579 +0000
+++ new-haskell-unordered-containers//changelog	2013-03-21 19:09:43.915021579 +0000
@@ -1,3 +1,22 @@
+haskell-unordered-containers (0.2.2.1-2) experimental; urgency=low
+
+  * Previous upload should have gone to experimental; fixing
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 21 Oct 2012 15:51:29 +0200
+
+haskell-unordered-containers (0.2.2.1.is.really.0.2.1.0-1) unstable; urgency=low
+
+  * Revert to 0.2.2.1 to allow migration to testing. Undo:
+    + Enable test suite 
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 21 Mar 2013 19:55:03 +0100
+
+haskell-unordered-containers (0.2.2.1-2~sid) unstable; urgency=low
+
+  * Sid-compatible re-upload
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 21 Oct 2012 16:47:40 +0200
+
 haskell-unordered-containers (0.2.2.1-1) unstable; urgency=low
 
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
diff -rN -u old-haskell-unordered-containers//control new-haskell-unordered-containers//control
--- old-haskell-unordered-containers//control	2013-03-21 19:09:43.903031161 +0000
+++ new-haskell-unordered-containers//control	2013-03-21 19:09:43.919022232 +0000
@@ -9,13 +9,12 @@
   , ghc
   , ghc-prof
   , libghc-hashable-dev (>> 1.0.1.1)
-  , libghc-hashable-dev (<< 1.2)
   , libghc-hashable-prof
-#  , libghc-quickcheck2-dev (>> 2.4.0.1)
-#  , libghc-test-framework-dev (>> 0.3.3)
-#  , libghc-test-framework-dev (<< 0.6)
-#  , libghc-test-framework-quickcheck2-dev (>> 0.2.9)
-#  , libghc-test-framework-quickcheck2-dev (>> 0.3)
+  , libghc-quickcheck2-dev (>> 2.4.0.1)
+  , libghc-hunit-dev
+  , libghc-test-framework-dev (>> 0.3.3)
+  , libghc-test-framework-quickcheck2-dev (>> 0.2.9)
+  , libghc-test-framework-hunit-dev 
 Build-Depends-Indep: ghc-doc
   , libghc-hashable-doc
 Standards-Version: 3.9.4
diff -rN -u old-haskell-unordered-containers//rules new-haskell-unordered-containers//rules
--- old-haskell-unordered-containers//rules	2013-03-21 19:09:43.903031161 +0000
+++ new-haskell-unordered-containers//rules	2013-03-21 19:09:43.919022232 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_ENABLE_TESTS := yes
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk