[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.2.10-1-5-gefcbab9

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 0356914b0deb0c84ac9b4272df62746ffe9d63a7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jun 7 23:57:02 2011 +0200

    Adjust conflict on haskell-agda-doc to exclude the dummy package (Closes: #629572)

diff --git a/debian/changelog b/debian/changelog
index 9ba2fa8..1fcc364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+agda (2.2.10-2) UNRELEASED; urgency=low
+
+  * Adjust conflict on haskell-agda-doc to exclude the dummy package (Closes:
+    #629572)
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 07 Jun 2011 23:56:30 +0200
+
 agda (2.2.10-1) unstable; urgency=low
 
   * [60c4b8a] Imported Upstream version 2.2.10
diff --git a/debian/control b/debian/control
index 13b6633..3560c80 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,7 @@ Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Replaces: haskell-agda-doc
-Conflicts: haskell-agda-doc
+Conflicts: haskell-agda-doc (<< 2.2.6-5)
 Provides: haskell-agda-doc
 Description: dependently typed functional programming language - documentation
  Agda is a dependently typed functional programming language: It has inductive

-- 
Packaging for Agda