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

[Trent W. Buck]

Sat May  8 10:52:24 UTC 2010  Trent W. Buck <trentbuck at gmail.com>
  * Rebase patches.
  Ignore-this: e79ba8139df0c39a726fd2230eb6f1d3

    M ./changelog +1
    M ./patches/extra-license-file -4 +4
    M ./patches/no-hspwd -3 +3
    M ./patches/no-libHSdarcs -4 +4
    M ./patches/use-sensible-editor -3 +3

Sat May  8 10:52:24 UTC 2010  Trent W. Buck <trentbuck at gmail.com>
  * Rebase patches.
  Ignore-this: e79ba8139df0c39a726fd2230eb6f1d3
diff -rN -u -purd old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2010-05-08 14:02:43.044151255 +0000
+++ new-darcs/changelog	2010-05-08 14:02:43.056151884 +0000
@@ -3,6 +3,7 @@ darcs (2.4.1-1) UNRELEASED; urgency=low
   * New upstream release
   * Temporary build-conflict on hlint (Closes: #579270).
   * Rebase build dependencies.
+  * Rebase patches.
 
  -- Trent W. Buck <trentbuck at gmail.com>  Fri, 07 May 2010 15:43:18 +1000
 
diff -rN -u -purd old-darcs/patches/extra-license-file new-darcs/patches/extra-license-file
--- old-darcs/patches/extra-license-file	2010-05-08 14:02:43.044151255 +0000
+++ new-darcs/patches/extra-license-file	2010-05-08 14:02:43.052151675 +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/darcs.cabal
+Index: darcs-2.4.1/darcs.cabal
 ===================================================================
---- darcs-2.4.orig/darcs.cabal	2010-03-18 16:26:20.319119816 +1100
-+++ darcs-2.4/darcs.cabal	2010-03-18 18:56:34.327120654 +1100
+--- darcs-2.4.1.orig/darcs.cabal	2010-04-13 05:42:42.000000000 +1000
++++ darcs-2.4.1/darcs.cabal	2010-05-07 15:48:40.371169582 +1000
 @@ -1,7 +1,6 @@
  Name:           darcs
- version:        2.4
+ version:        2.4.1
  License:        GPL
 -License-file:   COPYING
  Author:         David Roundy <droundy at darcs.net>, <darcs-users at darcs.net>
diff -rN -u -purd old-darcs/patches/no-hspwd new-darcs/patches/no-hspwd
--- old-darcs/patches/no-hspwd	2010-05-08 14:02:43.044151255 +0000
+++ new-darcs/patches/no-hspwd	2010-05-08 14:02:43.052151675 +0000
@@ -4,10 +4,10 @@ Description:    Don't use (missing) hspw
  Darcs 2.3b1 shipped without hspwd.hs, which broke ./Setup test.
  Since Debian's pwd builtin isn't buggy, simply use it.
  Not forwarded because a working pwd builtin is Debian-specific.
-Index: darcs-2.4/tests/lib
+Index: darcs-2.4.1/tests/lib
 ===================================================================
---- darcs-2.4.orig/tests/lib	2010-03-18 18:59:12.066124123 +1100
-+++ darcs-2.4/tests/lib	2010-03-18 18:59:15.182117792 +1100
+--- darcs-2.4.1.orig/tests/lib	2010-04-13 05:42:42.000000000 +1000
++++ darcs-2.4.1/tests/lib	2010-05-07 15:48:45.428146112 +1000
 @@ -12,11 +12,6 @@
  fi
  }
diff -rN -u -purd old-darcs/patches/no-libHSdarcs new-darcs/patches/no-libHSdarcs
--- old-darcs/patches/no-libHSdarcs	2010-05-08 14:02:43.044151255 +0000
+++ new-darcs/patches/no-libHSdarcs	2010-05-08 14:02:43.048151465 +0000
@@ -2,10 +2,10 @@ Author:         Ganesh Sittampalam <gane
 Forwarded:      http://bugs.darcs.net/patch184
 Bug:            http://bugs.darcs.net/issue1508
 Description:    add cabal flag to control build of darcs library
-Index: darcs-2.4/darcs.cabal
+Index: darcs-2.4.1/darcs.cabal
 ===================================================================
---- darcs-2.4.orig/darcs.cabal	2010-03-20 23:05:08.904664322 +1100
-+++ darcs-2.4/darcs.cabal	2010-03-20 23:05:10.405659478 +1100
+--- darcs-2.4.1.orig/darcs.cabal	2010-05-07 15:48:40.371169582 +1000
++++ darcs-2.4.1/darcs.cabal	2010-05-07 15:48:43.436170000 +1000
 @@ -97,6 +97,10 @@
    description: Use GADT type witnesses.
    default:     False
@@ -17,7 +17,7 @@ Index: darcs-2.4/darcs.cabal
  flag color
    description: Use ansi color escapes.
  
-@@ -152,6 +156,11 @@
+@@ -155,6 +159,11 @@
  -- ----------------------------------------------------------------------
  
  Library
diff -rN -u -purd old-darcs/patches/use-sensible-editor new-darcs/patches/use-sensible-editor
--- old-darcs/patches/use-sensible-editor	2010-05-08 14:02:43.044151255 +0000
+++ new-darcs/patches/use-sensible-editor	2010-05-08 14:02:43.048151465 +0000
@@ -9,10 +9,10 @@ Description:    use editor(1) and pager(
  uncheck the "standard" tasksel task.
  .
  Not forwarded because editor(1) and pager(1) are Debian-specific.
-Index: darcs-2.4/src/Darcs/Utils.hs
+Index: darcs-2.4.1/src/Darcs/Utils.hs
 ===================================================================
---- darcs-2.4.orig/src/Darcs/Utils.hs	2010-02-27 05:10:07.000000000 +1100
-+++ darcs-2.4/src/Darcs/Utils.hs	2010-03-18 19:00:13.179131358 +1100
+--- darcs-2.4.1.orig/src/Darcs/Utils.hs	2010-04-13 05:42:42.000000000 +1000
++++ darcs-2.4.1/src/Darcs/Utils.hs	2010-05-07 15:48:47.044167762 +1000
 @@ -209,18 +209,12 @@
  run_editor f = do
    ed <- get_editor