[Pkg-haskell-commits] darcs: darcs: Refresh or delete quilt patches.
Trent W. Buck
trentbuck at gmail.com
Sat Mar 20 16:46:51 UTC 2010
Sat Mar 20 12:14:44 UTC 2010 Trent W. Buck <trentbuck at gmail.com>
* Refresh or delete quilt patches.
Ignore-this: 384bffb73c7c405feed897036a0834e0
M ./changelog +1
M ./patches/extra-license-file -4 +4
R ./patches/make-threaded-optional
R ./patches/manpage-cleanup
M ./patches/no-hspwd -6 +9
M ./patches/no-libHSdarcs -59 +43
M ./patches/series -3
R ./patches/spelling-error-in-binary
M ./patches/use-sensible-editor -15 +13
Sat Mar 20 12:14:44 UTC 2010 Trent W. Buck <trentbuck at gmail.com>
* Refresh or delete quilt patches.
Ignore-this: 384bffb73c7c405feed897036a0834e0
diff -rN -u -purd old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog 2010-03-20 16:46:51.729122950 +0000
+++ new-darcs/changelog 2010-03-20 16:46:51.745123792 +0000
@@ -11,6 +11,7 @@ darcs (2.4-1) UNRELEASED; urgency=low
[ Trent W. Buck ]
* New upstream release.
* Avoid mmap 0.5 (see http://bugs.darcs.net/issue1753).
+ * Refresh or delete quilt patches.
-- Trent W. Buck <trentbuck at gmail.com> Thu, 18 Mar 2010 14:39:32 +1100
diff -rN -u -purd old-darcs/patches/extra-license-file new-darcs/patches/extra-license-file
--- old-darcs/patches/extra-license-file 2010-03-20 16:46:51.729122950 +0000
+++ new-darcs/patches/extra-license-file 2010-03-20 16:46:51.737123371 +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.3.0/darcs.cabal
+Index: darcs-2.4/darcs.cabal
===================================================================
---- darcs-2.3.0.orig/darcs.cabal 2009-08-03 14:26:04.336565560 +1000
-+++ darcs-2.3.0/darcs.cabal 2009-08-03 14:26:09.599065319 +1000
+--- 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
@@ -1,7 +1,6 @@
Name: darcs
- version: 2.3.0
+ version: 2.4
License: GPL
-License-file: COPYING
Author: David Roundy <droundy at darcs.net>, <darcs-users at darcs.net>
diff -rN -u -purd old-darcs/patches/make-threaded-optional new-darcs/patches/make-threaded-optional
--- old-darcs/patches/make-threaded-optional 2010-03-20 16:46:51.729122950 +0000
+++ new-darcs/patches/make-threaded-optional 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-Author: Trent W. Buck <trentbuck at gmail.com>
-Forwarded: http://bugs.darcs.net/patch22
-Bug: http://bugs.darcs.net/issue1554
-Bug-Debian: http://bugs.debian.org/541848
-Description: Resolve issue1554: allow opt-out of -threaded (fix ARM builds).
- GHC doesn't support -threaded on some architectures.
- This patch allows -f-threaded, so Darcs will compile again.
-Index: darcs-2.3.0/darcs.cabal
-===================================================================
---- darcs-2.3.0.orig/darcs.cabal 2009-11-01 21:19:58.451735608 +1100
-+++ darcs-2.3.0/darcs.cabal 2009-11-01 21:20:00.271735867 +1100
-@@ -100,6 +100,10 @@
- flag terminfo
- description: Use the terminfo package for enhanced console support.
-
-+flag threaded
-+ description: Use threading and SMP support.
-+ default: True
-+
- flag type-witnesses
- description: Use GADT type witnesses.
- default: False
-@@ -154,8 +158,10 @@
- src/Crypt/sha2.c
-
- -- We need optimizations, regardless of what Hackage says
-- ghc-options: -Wall -O2 -funbox-strict-fields -threaded
-+ ghc-options: -Wall -O2 -funbox-strict-fields
- ghc-prof-options: -prof -auto-all
-+ if flag(threaded)
-+ ghc-options: -threaded
-
- if !flag(zlib)
- extra-libraries: z
diff -rN -u -purd old-darcs/patches/manpage-cleanup new-darcs/patches/manpage-cleanup
--- old-darcs/patches/manpage-cleanup 2010-03-20 16:46:51.729122950 +0000
+++ new-darcs/patches/manpage-cleanup 1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-Author: Trent W. Buck <trentbuck at gmail.com>
-Bug-Debian: http://lintian.debian.org/tags/manpage-has-errors-from-man.html
-Bug-Debian: http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
-Forwarded: yes
-Description: Avoid unescaped hyphens and backslashes in manpage.
- Fixes these bugs:
-
- W: darcs: manpage-has-errors-from-man darcs.1.gz:
- 297: a tab character is not allowed in an escape name
- I: darcs: hyphen-used-as-minus-sign darcs.1.gz (87 times)
-
-Index: darcs-2.3.0/src/Darcs/Commands/Help.lhs
-===================================================================
---- darcs-2.3.0.orig/src/Darcs/Commands/Help.lhs 2009-08-03 16:10:27.186565722 +1000
-+++ darcs-2.3.0/src/Darcs/Commands/Help.lhs 2009-08-03 16:17:57.629065518 +1000
-@@ -162,7 +162,7 @@
- ".TP 3", "\\(bu",
- "Distributed: Every user has access to the full",
- "command set, removing boundaries between server and",
-- "client or committer and non-committers.",
-+ "client or committer and non\\(hycommitters.",
- ".TP", "\\(bu",
- "Interactive: Darcs is easy to learn and efficient to",
- "use because it asks you questions in response to",
-@@ -183,14 +183,14 @@
- "Each command's most important options are listed in the",
- ".B COMMANDS",
- "section. For a full list of all options accepted by",
-- "a particular command, run `darcs", ".I command", "--help'.",
-- ".SS " ++ helpOnMatchers, -- FIXME: this is a kludge.
-+ "a particular command, run `darcs", ".I command", "\\-\\-help'.",
-+ ".SS " ++ escape helpOnMatchers, -- FIXME: this is a kludge.
- ".SH COMMANDS",
- unlines commands,
- unlines environment,
- ".SH FILES",
- ".SS \"_darcs/prefs/binaries\"",
-- unlines binaries_file_help,
-+ escape $ unlines binaries_file_help,
- ".SH BUGS",
- "At http://bugs.darcs.net/ you can find a list of known",
- "bugs in Darcs. Unknown bugs can be reported at that",
-@@ -244,7 +244,7 @@
- render prefix c =
- [".B darcs " ++ prefix ++ command_name c] ++
- (map mangle_args $ command_extra_arg_help c) ++
-- [".RS 4", command_help c, ".RE"]
-+ [".RS 4", escape $ command_help c, ".RE"]
-
- -- | Now I'm showing off: mangle the extra arguments of Darcs commands
- -- so as to use the ideal format for manpages, italic words and roman
-@@ -260,7 +260,21 @@
-
- environment :: [String]
- environment = ".SH ENVIRONMENT" : concat
-- [(".SS \"" ++ andClauses ks ++ "\"") : ds
-+ [(".SS \"" ++ andClauses ks ++ "\"") : map escape ds
- | (ks, ds) <- environmentHelp]
-
-+ -- | Copied from Preproc.escape_latex_specials.
-+ escape :: String -> String
-+ escape = minus . bs -- Order is important
-+ where
-+ minus = replace "-" "\\-"
-+ bs = replace "\\" "\\\\"
-+
-+ replace :: Eq a => [a] -> [a] -> [a] -> [a]
-+ replace _ _ [] = []
-+ replace find repl s =
-+ if take (length find) s == find
-+ then repl ++ (replace find repl (drop (length find) s))
-+ else [head s] ++ replace find repl (tail s)
-+
- \end{code}
diff -rN -u -purd old-darcs/patches/no-hspwd new-darcs/patches/no-hspwd
--- old-darcs/patches/no-hspwd 2010-03-20 16:46:51.725122739 +0000
+++ new-darcs/patches/no-hspwd 2010-03-20 16:46:51.729122950 +0000
@@ -4,16 +4,19 @@ 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.3.0~beta1/tests/lib
+Index: darcs-2.4/tests/lib
===================================================================
---- darcs-2.3.0~beta1.orig/tests/lib 2009-06-25 13:32:06.996566001 +1000
-+++ darcs-2.3.0~beta1/tests/lib 2009-06-25 13:32:20.036565523 +1000
-@@ -11,8 +11,3 @@
- exit 0
+--- 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
+@@ -12,11 +12,6 @@
fi
}
--
+
-pwd() {
- ghc --make "$TESTS_WD/hspwd.hs"
- "$TESTS_WD/hspwd"
-}
+-
+ # switch locale to latin9 if supported if there's a locale command, skip test
+ # otherwise
+ switch_to_latin9_locale () {
diff -rN -u -purd old-darcs/patches/no-libHSdarcs new-darcs/patches/no-libHSdarcs
--- old-darcs/patches/no-libHSdarcs 2010-03-20 16:46:51.725122739 +0000
+++ new-darcs/patches/no-libHSdarcs 2010-03-20 16:46:51.745123792 +0000
@@ -13,15 +13,14 @@ Description: Disable libHSdarcs.
in the meantime use "cabal install".
.
Not forwarded because upstream prefer to wait for a proper fix in Cabal 1.8.
-Index: darcs-2.3.0/darcs.cabal
+Index: darcs-2.4/darcs.cabal
===================================================================
---- darcs-2.3.0.orig/darcs.cabal 2009-08-03 15:11:11.556565825 +1000
-+++ darcs-2.3.0/darcs.cabal 2009-08-03 15:11:13.069071056 +1000
-@@ -142,269 +142,6 @@
- cpp-options: -DWIN32
+--- darcs-2.4.orig/darcs.cabal 2010-03-18 18:58:34.351120535 +1100
++++ darcs-2.4/darcs.cabal 2010-03-18 18:58:42.883123161 +1100
+@@ -148,262 +148,6 @@
c-sources: src/win32/send_email.c
---- ----------------------------------------------------------------------
+ -- ----------------------------------------------------------------------
--- darcs library
--- ----------------------------------------------------------------------
-
@@ -86,16 +85,14 @@ Index: darcs-2.3.0/darcs.cabal
- Darcs.FilePathMonad
- Darcs.Flags
- Darcs.Global
-- Darcs.Gorsvet
- Darcs.Hopefully
- Darcs.IO
- Darcs.Lock
- Darcs.Match
-- Darcs.Ordered
+- Darcs.Witnesses.Ordered
- Darcs.Patch
- Darcs.Patch.Apply
- Darcs.Patch.Bundle
-- Darcs.Patch.Check
- Darcs.Patch.Choices
- Darcs.Patch.Commute
- Darcs.Patch.Core
@@ -105,6 +102,7 @@ Index: darcs-2.3.0/darcs.cabal
- Darcs.Patch.Match
- Darcs.Patch.MatchData
- Darcs.Patch.Non
+- Darcs.Patch.OldDate
- Darcs.Patch.Patchy
- Darcs.Patch.Permutations
- Darcs.Patch.Prim
@@ -112,8 +110,10 @@ Index: darcs-2.3.0/darcs.cabal
- Darcs.Patch.Read
- Darcs.Patch.ReadMonads
- Darcs.Patch.Real
+- Darcs.Patch.RegChars
- Darcs.Patch.Set
- Darcs.Patch.Show
+- Darcs.Patch.Split
- Darcs.Patch.TouchesFiles
- Darcs.Patch.Viewing
- Darcs.Population
@@ -131,20 +131,24 @@ Index: darcs-2.3.0/darcs.cabal
- Darcs.Repository.HashedIO
- Darcs.Repository.HashedRepo
- Darcs.Repository.Internal
+- Darcs.Repository.LowLevel
+- Darcs.Repository.Merge
- Darcs.Repository.InternalTypes
- Darcs.Repository.Motd
- Darcs.Repository.Prefs
- Darcs.Repository.Pristine
- Darcs.Repository.Repair
+- Darcs.Repository.State
- Darcs.Resolution
- Darcs.RunCommand
-- Darcs.Sealed
+- Darcs.Witnesses.Sealed
- Darcs.SelectChanges
-- Darcs.Show
+- Darcs.Witnesses.Show
- Darcs.SignalHandler
- Darcs.SlurpDirectory
- Darcs.SlurpDirectory.Internal
- Darcs.Test
+- Darcs.Test.Patch.Check
- Darcs.TheCommands
- Darcs.URL
- Darcs.Utils
@@ -155,21 +159,18 @@ Index: darcs-2.3.0/darcs.cabal
- HTTP
- IsoDate
- Lcs
-- OldDate
- Printer
- Progress
-- RegChars
+- Ratified
- SHA1
- Ssh
- URL
-- UTF8
- Workaround
-
-- other-modules: ThisVersion
+- other-modules: Version
-
- c-sources: src/atomic_create.c
- src/fpstring.c
-- src/c_compat.c
- src/maybe_relink.c
- src/umask.c
- src/Crypt/sha2.c
@@ -194,23 +195,29 @@ Index: darcs-2.3.0/darcs.cabal
- html == 1.0.*,
- filepath == 1.1.*,
- haskeline >= 0.6.1 && < 0.7,
-- hashed-storage >= 0.3.6 && < 0.4
+- hashed-storage >= 0.4.7 && < 0.5
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.4
+- build-depends: unix >= 1.0 && < 2.5
-
- build-depends: base >= 3,
+- bytestring >= 0.9.0 && < 0.10,
+- utf8-string == 0.3.*,
- old-time == 1.0.*,
- directory == 1.0.*,
- process == 1.0.*,
-- containers >= 0.1 && < 0.3,
-- array >= 0.1 && < 0.3,
+- containers >= 0.1 && < 0.4,
+- array >= 0.1 && < 0.4,
- random == 1.0.*
-
+-
- -- We need optimizations, regardless of what Hackage says
-- ghc-options: -Wall -O2 -funbox-strict-fields
+- ghc-options: -Wall -O2 -funbox-strict-fields -fwarn-tabs
- ghc-prof-options: -prof -auto-all
-
+- if flag(hpc)
+- ghc-prof-options: -fhpc
+-
- if flag(curl)
- extra-libraries: curl
- includes: curl/curl.h
@@ -230,26 +237,14 @@ Index: darcs-2.3.0/darcs.cabal
- cpp-options: -DHAVE_HTTP
- x-have-http:
-
-- if !flag(curl) && !flag(http)
+- if (!flag(curl) && !flag(http)) || flag(deps-only)
- buildable: False
-
- if flag(mmap) && !os(windows)
- build-depends: mmap >= 0.2
- cpp-options: -DHAVE_MMAP
-
-- if flag(bytestring)
-- build-depends: bytestring >= 0.9.0 && < 0.10
-- cpp-options: -DHAVE_BYTESTRING
--
-- if flag(zlib)
-- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
-- cpp-options: -DHAVE_HASKELL_ZLIB
-- else
-- extra-libraries: z
--
-- if flag(utf8-string)
-- build-depends: utf8-string == 0.3.*
-- cpp-options: -DHAVE_UTF8STRING
+- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
-
- -- The terminfo package cannot be built on Windows.
- if flag(terminfo) && !os(windows)
@@ -268,6 +263,7 @@ Index: darcs-2.3.0/darcs.cabal
- UndecidableInstances,
- DeriveDataTypeable,
- GADTs,
+- ImpredicativeTypes,
- TypeOperators,
- ExistentialQuantification,
- FlexibleContexts,
@@ -281,13 +277,10 @@ Index: darcs-2.3.0/darcs.cabal
- MultiParamTypeClasses
-
--- ----------------------------------------------------------------------
---- darcs itself
---- ----------------------------------------------------------------------
--
- Executable darcs
- main-is: darcs.hs
- hs-source-dirs: src
-@@ -526,112 +263,3 @@
+ -- darcs itself
+ -- ----------------------------------------------------------------------
+
+@@ -524,103 +268,3 @@
RankNTypes,
GeneralizedNewtypeDeriving,
MultiParamTypeClasses
@@ -302,14 +295,15 @@ Index: darcs-2.3.0/darcs.cabal
- include-dirs: src
- c-sources: src/atomic_create.c
- src/fpstring.c
-- src/c_compat.c
- src/maybe_relink.c
- src/umask.c
- src/Crypt/sha2.c
-
- -- We need optimizations, regardless of what Hackage says
-- ghc-options: -Wall -O2 -funbox-strict-fields -threaded
+- ghc-options: -Wall -O2 -funbox-strict-fields
- ghc-prof-options: -prof -auto-all
+- if flag(threaded)
+- ghc-options: -threaded
-
- if !flag(test)
- buildable: False
@@ -328,9 +322,6 @@ Index: darcs-2.3.0/darcs.cabal
- test-framework-quickcheck2 >= 0.2.2
-
-
-- if !flag(zlib)
-- extra-libraries: z
--
- cc-options: -D_REENTRANT
-
- if os(windows)
@@ -347,29 +338,22 @@ Index: darcs-2.3.0/darcs.cabal
- cc-options: -DHAVE_SIGINFO_H
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.4
+- build-depends: unix >= 1.0 && < 2.5
-
- build-depends: base >= 3,
+- bytestring >= 0.9.0 && < 0.10,
- old-time == 1.0.*,
- directory == 1.0.*,
- process == 1.0.*,
-- containers >= 0.1 && < 0.3,
-- array >= 0.1 && < 0.3,
+- containers >= 0.1 && < 0.4,
+- array >= 0.1 && < 0.4,
- random == 1.0.*
-
- if flag(mmap) && !os(windows)
- build-depends: mmap >= 0.2
- cpp-options: -DHAVE_MMAP
-
-- if flag(bytestring)
-- build-depends: bytestring >= 0.9.0 && < 0.10
-- cpp-options: -DHAVE_BYTESTRING
--
-- if flag(zlib)
-- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
-- cpp-options: -DHAVE_HASKELL_ZLIB
-- else
-- extra-libraries: z
+- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
-
- -- The terminfo package cannot be built on Windows.
- if flag(terminfo) && !os(windows)
diff -rN -u -purd old-darcs/patches/series new-darcs/patches/series
--- old-darcs/patches/series 2010-03-20 16:46:51.721122528 +0000
+++ new-darcs/patches/series 2010-03-20 16:46:51.729122950 +0000
@@ -1,7 +1,4 @@
extra-license-file
-spelling-error-in-binary
no-libHSdarcs
no-hspwd
use-sensible-editor
-manpage-cleanup
-make-threaded-optional
diff -rN -u -purd old-darcs/patches/spelling-error-in-binary new-darcs/patches/spelling-error-in-binary
--- old-darcs/patches/spelling-error-in-binary 2010-03-20 16:46:51.721122528 +0000
+++ new-darcs/patches/spelling-error-in-binary 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Author: Trent W. Buck <trentbuck at gmail.com>
-Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
-Forwarded: yes
-Description: Typo: s/comand/command/.
-Index: darcs-2.3.0/src/Darcs/Commands/WhatsNew.lhs
-===================================================================
---- darcs-2.3.0.orig/src/Darcs/Commands/WhatsNew.lhs 2009-08-03 13:55:18.469071072 +1000
-+++ darcs-2.3.0/src/Darcs/Commands/WhatsNew.lhs 2009-08-03 13:55:22.939065549 +1000
-@@ -73,7 +73,7 @@
- "By default, `darcs whatsnew' uses Darcs' internal format for changes.\n" ++
- "To see some context (unchanged lines) around each change, use the\n" ++
- "--unified option. To view changes in conventional `diff' format, use\n" ++
-- "the `darcs diff' comand; but note that `darcs whatsnew' is faster.\n" ++
-+ "the `darcs diff' command; but note that `darcs whatsnew' is faster.\n" ++
- "\n" ++
- "This command exits unsuccessfully (returns a non-zero exit status) if\n" ++
- "there are no unrecorded changes.\n"
diff -rN -u -purd old-darcs/patches/use-sensible-editor new-darcs/patches/use-sensible-editor
--- old-darcs/patches/use-sensible-editor 2010-03-20 16:46:51.721122528 +0000
+++ new-darcs/patches/use-sensible-editor 2010-03-20 16:46:51.729122950 +0000
@@ -9,24 +9,22 @@ 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.3.0~beta1/src/Darcs/Utils.hs
+Index: darcs-2.4/src/Darcs/Utils.hs
===================================================================
---- darcs-2.3.0~beta1.orig/src/Darcs/Utils.hs 2009-06-24 17:13:28.000000000 +1000
-+++ darcs-2.3.0~beta1/src/Darcs/Utils.hs 2009-06-25 13:01:58.149068271 +1000
-@@ -187,12 +187,6 @@
+--- darcs-2.4.orig/src/Darcs/Utils.hs 2010-02-27 05:10:07.000000000 +1100
++++ darcs-2.4/src/Darc[...incomplete...]
More information about the Pkg-haskell-commits
mailing list