[Pkg-haskell-commits] darcs: darcs: Rebase patches.

[Trent W. Buck]

Tue Apr 26 03:18:42 UTC 2011  Trent W. Buck <trentbuck at gmail.com>
  * Rebase patches.
  Ignore-this: b17fec3f5793fb0cd45d86d0d4164d16

    M ./patches/extra-license-file -4 +4
    M ./patches/skip-external.sh-test -2 +4

Tue Apr 26 03:18:42 UTC 2011  Trent W. Buck <trentbuck at gmail.com>
  * Rebase patches.
  Ignore-this: b17fec3f5793fb0cd45d86d0d4164d16
diff -rN -u -purd old-darcs/patches/extra-license-file new-darcs/patches/extra-license-file
--- old-darcs/patches/extra-license-file	2011-04-26 05:32:40.111567958 +0000
+++ new-darcs/patches/extra-license-file	2011-04-26 05:32:40.115568169 +0000
@@ -3,13 +3,13 @@ Forwarded:      not-needed
 Bug-Debian:     http://lintian.debian.org/tags/extra-license-file.html
 Description:    Prevent cabal installing COPYING in a quick and dirty way.
  Not forwarded because /usr/share/common-lincenses is Debian-specific.
-Index: darcs-2.4.3/darcs.cabal
+Index: darcs-2.5.2/darcs.cabal
 ===================================================================
---- darcs-2.4.3.orig/darcs.cabal	2010-05-09 23:23:32.000000000 +1000
-+++ darcs-2.4.3/darcs.cabal	2010-05-10 16:48:13.382446211 +1000
+--- darcs-2.5.2.orig/darcs.cabal	2011-03-13 22:40:47.000000000 +0000
++++ darcs-2.5.2/darcs.cabal	2011-04-26 01:23:37.515798788 +0000
 @@ -1,7 +1,6 @@
  Name:           darcs
- version:        2.4.4
+ version:        2.5.2
  License:        GPL
 -License-file:   COPYING
  Author:         David Roundy <droundy at darcs.net>, <darcs-users at darcs.net>
diff -rN -u -purd old-darcs/patches/skip-external.sh-test new-darcs/patches/skip-external.sh-test
--- old-darcs/patches/skip-external.sh-test	2011-04-26 05:32:40.107567746 +0000
+++ new-darcs/patches/skip-external.sh-test	2011-04-26 05:32:40.115568169 +0000
@@ -4,8 +4,10 @@ Author: Stefano Rivera <stefano at rivera.z
 Bug-Ubuntu: http://launchpad.net/bugs/636603
 Bug-Debian: http://bugs.debian.org/596606
 Last-Update: 2010-09-12
---- a/tests/external.sh
-+++ b/tests/external.sh
+Index: darcs-2.5.2/tests/external.sh
+===================================================================
+--- darcs-2.5.2.orig/tests/external.sh	2011-03-13 22:40:47.000000000 +0000
++++ darcs-2.5.2/tests/external.sh	2011-04-26 01:31:30.125798818 +0000
 @@ -1,5 +1,8 @@
  #!/usr/bin/env bash