[Pkg-haskell-commits] darcs: gitit: Fixing bug and removing patches.

[Giovanni Mascellani]

Thu Jun  9 17:53:22 UTC 2011  Giovanni Mascellani <gio at debian.org>
  * Fixing bug and removing patches.
  Ignore-this: 740b529481f702529d6e8d0313ade59a

    M ./changelog -1 +3
    R ./patches/
    R ./patches/series
    R ./patches/sha-version

Thu Jun  9 17:53:22 UTC 2011  Giovanni Mascellani <gio at debian.org>
  * Fixing bug and removing patches.
  Ignore-this: 740b529481f702529d6e8d0313ade59a
diff -rN -u old-gitit//changelog new-gitit//changelog
--- old-gitit//changelog	2011-06-09 17:53:55.716279090 +0000
+++ new-gitit//changelog	2011-06-09 17:53:55.720282722 +0000
@@ -1,6 +1,8 @@
 gitit (0.8.0.1-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release:
+    + Fixed file upload bug (closes: #629643);
+    + debian/patches: removed, integrated upstream.
 
  -- Giovanni Mascellani <gio at debian.org>  Thu, 09 Jun 2011 19:49:18 +0200
 
diff -rN -u old-gitit//patches/series new-gitit//patches/series
--- old-gitit//patches/series	2011-06-09 17:53:55.716279090 +0000
+++ new-gitit//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-sha-version
diff -rN -u old-gitit//patches/sha-version new-gitit//patches/sha-version
--- old-gitit//patches/sha-version	2011-06-09 17:53:55.716279090 +0000
+++ new-gitit//patches/sha-version	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Subject: Fix dependency version on SHA
-From: Giovanni Mascellani <gio at debian.org>
-Forwarded: yes
-
-The cabal description file declares a dependency against SHA < 1.5,
-which is not needed because Gitit is able to use version 1.5.0.0
-(present in Debian at the moment) too. This patch relaxes the
-versioned dependency.
-
-Index: gitit-0.8/gitit.cabal
-===================================================================
---- gitit-0.8.orig/gitit.cabal	2011-05-27 18:34:42.000000000 +0200
-+++ gitit-0.8/gitit.cabal	2011-05-27 18:35:11.000000000 +0200
-@@ -130,7 +130,7 @@
-                      bytestring,
-                      random,
-                      utf8-string >= 0.3 && < 0.4,
--                     SHA > 1 && < 1.5, HTTP >= 4000.0 && < 4000.2,
-+                     SHA > 1, HTTP >= 4000.0 && < 4000.2,
-                      HStringTemplate >= 0.6 && < 0.7,
-                      network >= 2.1.0.0 && < 2.4,
-                      old-locale >= 1,