[Pkg-haskell-commits] darcs: hdbc-odbc: Merge

[Joachim Breitner]

Thu Feb  7 19:15:49 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
  Ignore-this: 6be0adfd424844646fc2f984ca3d8651

    M ./changelog +2

Thu Feb  7 19:15:49 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
  Ignore-this: 6be0adfd424844646fc2f984ca3d8651
diff -rN -u old-hdbc-odbc//changelog new-hdbc-odbc//changelog
--- old-hdbc-odbc//changelog	2013-02-07 20:42:50.563721026 +0000
+++ new-hdbc-odbc//changelog	2013-02-07 20:42:50.579720253 +0000
@@ -5,6 +5,8 @@
   * Change Vcs headers to Darcs
   * Add watch file
   * New upstream release
+  * debian/patches/avoid-haddock-confusion: Avoid a bug(?) in haddock
+  * Fix -doc build dependencies 
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 04 Jan 2013 16:06:30 +0100