[Pkg-haskell-commits] darcs: darcs: Historic import 2.3.0-1.

Trent W. Buck trentbuck at gmail.com
Sat Mar 6 11:45:31 UTC 2010


Sun Aug 16 14:40:53 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Historic import 2.3.0-1.
  Ignore-this: dc896445e90e087b248928e7a942e86f

    M ./README.source +7
    M ./changelog +13
    M ./clean +6
    M ./control -15 +19
    M ./copyright -10 +6
    R ./darcs.doc-base
    R ./darcs.links
    A ./disabled.doc-base
    A ./disabled.links
    A ./patches/
    A ./patches/extra-license-file
    A ./patches/manpage-cleanup
    A ./patches/no-hspwd
    A ./patches/no-libHSdarcs
    A ./patches/series
    A ./patches/spelling-error-in-binary
    A ./patches/use-sensible-editor
    M ./rules -14 +15
    M ./watch -2 +1

Sun Aug 16 14:40:53 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Historic import 2.3.0-1.
  Ignore-this: dc896445e90e087b248928e7a942e86f
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2010-03-06 11:45:31.850302723 +0000
+++ new-darcs/changelog	2010-03-06 11:45:31.878304209 +0000
@@ -1,3 +1,16 @@
+darcs (2.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use sensible-editor and sensible-pager (Closes: #501101).
+  * Use the "default-mta" alias to appease Ubuntu maintainers.
+  * Bump curl dependency to 7.19.1 and manually activate pipelining.
+  * Remove useless hyperlink sentence from Description (Closes: #522564).
+  * Disable .doc-base, since PDF/HTML manual is broken upstream.
+  * Bump Standards-Version to 3.8.2.
+    * Section changed (was "devel", now "vcs").
+
+ -- Trent W. Buck <trentbuck at gmail.com>  Mon, 17 Aug 2009 00:40:53 +1000
+
 darcs (2.2.0-1) unstable; urgency=low
 
   * New upstream release.
diff -rN -u old-darcs/clean new-darcs/clean
--- old-darcs/clean	2010-03-06 11:45:31.850302723 +0000
+++ new-darcs/clean	2010-03-06 11:45:31.858303148 +0000
@@ -15,3 +15,9 @@
 doc/manual/WARNINGS
 doc/manual/*.tex
 doc/manual/*.pl
+
+# We compile Setup in order to run ./Setup clean (since runghc/ghci
+# doesn't work on some architectures).  Therefore we remove Setup's
+# build code here.  Sigh.
+Setup Setup.hi Setup.o
+Distribution/ShellHarness.hi Distribution/ShellHarness.o
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control	2010-03-06 11:45:31.850302723 +0000
+++ new-darcs/control	2010-03-06 11:45:31.874303997 +0000
@@ -1,43 +1,47 @@
 Source: darcs
-Section: devel
+Section: vcs
 Priority: optional
 Maintainer: Trent W. Buck <trentbuck at gmail.com>
 Uploaders: Isaac Jones <ijones at debian.org>,
  Petr Rockai <mornfall at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends:
- debhelper (>= 7),
- ghc6 (>= 6.8.2-7),
- libcurl4-gnutls-dev,
+# I don't specify lower bounds that can't be violated in Debian.
+# Note that ghc6 (>= 6.10.4) excludes Lenny libs built against 6.8.
+Build-Depends: debhelper (>= 7.0.50), quilt, ghc6 (>= 6.10.4),
+ libcurl4-gnutls-dev (>= 7.19.1),
+ libghc6-hashed-storage-dev,
+ libghc6-haskeline-dev,
  libghc6-html-dev,
  libghc6-http-dev,
+ libghc6-mmap-dev,
+ libghc6-mtl-dev,
+ libghc6-network-dev,
+ libghc6-parsec2-dev,
  libghc6-regex-compat-dev,
- libghc6-utf8-string-dev
+ libghc6-terminfo-dev,
+ libghc6-utf8-string-dev,
+ libghc6-zlib-dev
 Homepage: http://darcs.net/
 Vcs-Darcs: http://repos.mornfall.net/darcs/debian
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 
 Package: darcs
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: exim4 | mail-transport-agent
+Recommends: default-mta | mail-transport-agent
 Description: a distributed, interactive, smart revision control system
  Darcs is a free, open source revision control system.  It is:
  .
   * Distributed: Every user has access to the full command set,
     removing boundaries between server and client or committer and
     non-committers.
- .
   * Interactive: Darcs is easy to learn and efficient to use because
     it asks you questions in response to simple commands, giving you
     choices in your work flow. You can choose to record one change in
     a file, while ignoring another. As you update from upstream, you
     can review each patch name, even the full "diff" for interesting
     patches.
- .
   * Smart: Originally developed by physicist David Roundy, darcs is
-    based on a unique algebra of patches.
- .
-    This smartness lets you respond to changing demands in ways that
-    would otherwise not be possible. Learn more about spontaneous
-    branches with darcs.
+    based on a unique algebra of patches. This smartness lets you
+    respond to changing demands in ways that would otherwise not be
+    possible.
diff -rN -u old-darcs/copyright new-darcs/copyright
--- old-darcs/copyright	2010-03-06 11:45:31.846302511 +0000
+++ new-darcs/copyright	2010-03-06 11:45:31.862303360 +0000
@@ -1,22 +1,18 @@
 Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=227
-Upstream-Name: darcs
-Upstream-Maintainer: David Roundy <droundy at abridgegame.org>
-Upstream-Source: http://abridgegame.org
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
+Name: Darcs
+Maintainer: Eric Kow <kowey at darcs.net>, darcs-users at darcs.net
+Source: http://darcs.net/
 
 Files: *
 Copyright: © 2002-2005, David Roundy
-License: GPL-any
- You are free to distribute this software under the terms of
- the GNU General Public License.
+License: GPL-1+
  On Debian systems, the complete text of the GNU General Public
  License can be found in /usr/share/common-licenses/GPL file.
 
 Files: debian/*
 Copyright: © 2003-2005, David Roundy <droundy at abridgegame.org>
 Copyright: © 2008, Trent W. Buck <trentbuck at gmail.com>
-License: GPL-any
- You are free to distribute this software under the terms of
- the GNU General Public License.
+License: GPL-1+
  On Debian systems, the complete text of the GNU General Public
  License can be found in /usr/share/common-licenses/GPL file.
diff -rN -u old-darcs/darcs.doc-base new-darcs/darcs.doc-base
--- old-darcs/darcs.doc-base	2010-03-06 11:45:31.846302511 +0000
+++ new-darcs/darcs.doc-base	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Document: darcs-doc
-Title: Darcs User Manual
-Author: David Roundy
-Abstract: The user manual for the Darcs revision control system.
-Section: Programming
-
-Format: html
-Index: /usr/share/doc/darcs/manual/darcs.html
-Files: /usr/share/doc/darcs/manual/*.html
-
-Format: pdf
-Files: /usr/share/doc/darcs/manual.pdf.gz
diff -rN -u old-darcs/darcs.links new-darcs/darcs.links
--- old-darcs/darcs.links	2010-03-06 11:45:31.846302511 +0000
+++ new-darcs/darcs.links	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/doc/darcs/manual/darcs_print.pdf.gz usr/share/doc/darcs/manual.pdf.gz
diff -rN -u old-darcs/disabled.doc-base new-darcs/disabled.doc-base
--- old-darcs/disabled.doc-base	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/disabled.doc-base	2010-03-06 11:45:31.858303148 +0000
@@ -0,0 +1,12 @@
+Document: darcs-doc
+Title: Darcs User Manual
+Author: David Roundy
+Abstract: The user manual for the Darcs revision control system.
+Section: Programming
+
+Format: html
+Index: /usr/share/doc/darcs/manual/darcs.html
+Files: /usr/share/doc/darcs/manual/*.html
+
+Format: pdf
+Files: /usr/share/doc/darcs/manual.pdf.gz
diff -rN -u old-darcs/disabled.links new-darcs/disabled.links
--- old-darcs/disabled.links	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/disabled.links	2010-03-06 11:45:31.858303148 +0000
@@ -0,0 +1 @@
+usr/share/doc/darcs/manual/darcs_print.pdf.gz usr/share/doc/darcs/manual.pdf.gz
diff -rN -u old-darcs/patches/extra-license-file new-darcs/patches/extra-license-file
--- old-darcs/patches/extra-license-file	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/extra-license-file	2010-03-06 11:45:31.858303148 +0000
@@ -0,0 +1,13 @@
+Prevent cabal installing COPYING in a quick and dirty way.
+Index: darcs-2.3.0/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
+@@ -1,7 +1,6 @@
+ Name:           darcs
+ version:        2.3.0
+ License:        GPL
+-License-file:   COPYING
+ Author:         David Roundy <droundy at darcs.net>, <darcs-users at darcs.net>
+ Maintainer:     <darcs-users at darcs.net>
+ 
diff -rN -u old-darcs/patches/manpage-cleanup new-darcs/patches/manpage-cleanup
--- old-darcs/patches/manpage-cleanup	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/manpage-cleanup	2010-03-06 11:45:31.858303148 +0000
@@ -0,0 +1,66 @@
+Escape hyphens and backslashes when creating the manpage.
+This avoids numerous groff/man warnings from lintian.
+This patch has since been submitted and accepted upstream.
+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 old-darcs/patches/no-hspwd new-darcs/patches/no-hspwd
--- old-darcs/patches/no-hspwd	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/no-hspwd	2010-03-06 11:45:31.858303148 +0000
@@ -0,0 +1,17 @@
+Darcs 2.3b1 shipped without hspwd.hs, which is used by "./Setup test".
+It replaces pwd(1) on systems with a broken implementation of same.
+Since Debian doesn't have a broken pwd(1), just remove the use of
+hspwd so "./Setup test" still works.
+Index: darcs-2.3.0~beta1/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
+ fi
+ }
+-
+-pwd() {
+-    ghc --make "$TESTS_WD/hspwd.hs"
+-    "$TESTS_WD/hspwd"
+-}
diff -rN -u old-darcs/patches/no-libHSdarcs new-darcs/patches/no-libHSdarcs
--- old-darcs/patches/no-libHSdarcs	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/no-libHSdarcs	2010-03-06 11:45:31.858303148 +0000
@@ -0,0 +1,401 @@
+I have unilaterally decided to disable compilation and installation of
+libHSdarcs.  My reasons are as follows:
+
+ - no API exists yet; it's just exposing Darcs' internals;
+
+ - no Debian packages need it yet; and
+
+ - at this point, I don't want to spend time learning how to package
+   Haskell libraries properly.  Particularly, I don't want to regress
+   from dh(1) to CDBS :-(
+
+If you want libHSdarcs, file a wishlist bug explaining why you need
+it.  Until then, please get the library via cabal-install.  Sorry for
+the inconvenience!
+Index: darcs-2.3.0/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
+     c-sources:      src/win32/send_email.c
+ 
+--- ----------------------------------------------------------------------
+--- darcs library
+--- ----------------------------------------------------------------------
+-
+-Library
+-  hs-source-dirs:   src
+-  include-dirs:     src
+-
+-  exposed-modules:  CommandLine
+-                    Crypt.SHA256
+-                    Darcs.ArgumentDefaults
+-                    Darcs.Arguments
+-                    Darcs.Bug
+-                    Darcs.CheckFileSystem
+-                    Darcs.ColorPrinter
+-                    Darcs.Commands
+-                    Darcs.Commands.Add
+-                    Darcs.Commands.AmendRecord
+-                    Darcs.Commands.Annotate
+-                    Darcs.Commands.Apply
+-                    Darcs.CommandsAux
+-                    Darcs.Commands.Changes
+-                    Darcs.Commands.Check
+-                    Darcs.Commands.Convert
+-                    Darcs.Commands.Diff
+-                    Darcs.Commands.Dist
+-                    Darcs.Commands.Get
+-                    Darcs.Commands.GZCRCs
+-                    Darcs.Commands.Help
+-                    Darcs.Commands.Init
+-                    Darcs.Commands.MarkConflicts
+-                    Darcs.Commands.Move
+-                    Darcs.Commands.Optimize
+-                    Darcs.Commands.Pull
+-                    Darcs.Commands.Push
+-                    Darcs.Commands.Put
+-                    Darcs.Commands.Record
+-                    Darcs.Commands.Remove
+-                    Darcs.Commands.Repair
+-                    Darcs.Commands.Replace
+-                    Darcs.Commands.Revert
+-                    Darcs.Commands.Rollback
+-                    Darcs.Commands.Send
+-                    Darcs.Commands.SetPref
+-                    Darcs.Commands.Show
+-                    Darcs.Commands.ShowAuthors
+-                    Darcs.Commands.ShowBug
+-                    Darcs.Commands.ShowContents
+-                    Darcs.Commands.ShowFiles
+-                    Darcs.Commands.ShowIndex
+-                    Darcs.Commands.ShowRepo
+-                    Darcs.Commands.ShowTags
+-                    Darcs.Commands.Tag
+-                    Darcs.Commands.TrackDown
+-                    Darcs.Commands.TransferMode
+-                    Darcs.Commands.Unrecord
+-                    Darcs.Commands.Unrevert
+-                    Darcs.Commands.WhatsNew
+-                    Darcs.Compat
+-                    Darcs.Diff
+-                    Darcs.Email
+-                    Darcs.External
+-                    Darcs.FilePathMonad
+-                    Darcs.Flags
+-                    Darcs.Global
+-                    Darcs.Gorsvet
+-                    Darcs.Hopefully
+-                    Darcs.IO
+-                    Darcs.Lock
+-                    Darcs.Match
+-                    Darcs.Ordered
+-                    Darcs.Patch
+-                    Darcs.Patch.Apply
+-                    Darcs.Patch.Bundle
+-                    Darcs.Patch.Check
+-                    Darcs.Patch.Choices
+-                    Darcs.Patch.Commute
+-                    Darcs.Patch.Core
+-                    Darcs.Patch.Depends
+-                    Darcs.Patch.FileName
+-                    Darcs.Patch.Info
+-                    Darcs.Patch.Match
+-                    Darcs.Patch.MatchData
+-                    Darcs.Patch.Non
+-                    Darcs.Patch.Patchy
+-                    Darcs.Patch.Permutations
+-                    Darcs.Patch.Prim
+-                    Darcs.Patch.Properties
+-                    Darcs.Patch.Read
+-                    Darcs.Patch.ReadMonads
+-                    Darcs.Patch.Real
+-                    Darcs.Patch.Set
+-                    Darcs.Patch.Show
+-                    Darcs.Patch.TouchesFiles
+-                    Darcs.Patch.Viewing
+-                    Darcs.Population
+-                    Darcs.PopulationData
+-                    Darcs.PrintPatch
+-                    Darcs.ProgressPatches
+-                    Darcs.RemoteApply
+-                    Darcs.RepoPath
+-                    Darcs.Repository
+-                    Darcs.Repository.ApplyPatches
+-                    Darcs.Repository.Cache
+-                    Darcs.Repository.Checkpoint
+-                    Darcs.Repository.DarcsRepo
+-                    Darcs.Repository.Format
+-                    Darcs.Repository.HashedIO
+-                    Darcs.Repository.HashedRepo
+-                    Darcs.Repository.Internal
+-                    Darcs.Repository.InternalTypes
+-                    Darcs.Repository.Motd
+-                    Darcs.Repository.Prefs
+-                    Darcs.Repository.Pristine
+-                    Darcs.Repository.Repair
+-                    Darcs.Resolution
+-                    Darcs.RunCommand
+-                    Darcs.Sealed
+-                    Darcs.SelectChanges
+-                    Darcs.Show
+-                    Darcs.SignalHandler
+-                    Darcs.SlurpDirectory
+-                    Darcs.SlurpDirectory.Internal
+-                    Darcs.Test
+-                    Darcs.TheCommands
+-                    Darcs.URL
+-                    Darcs.Utils
+-                    DateMatcher
+-                    English
+-                    Exec
+-                    ByteStringUtils
+-                    HTTP
+-                    IsoDate
+-                    Lcs
+-                    OldDate
+-                    Printer
+-                    Progress
+-                    RegChars
+-                    SHA1
+-                    Ssh
+-                    URL
+-                    UTF8
+-                    Workaround
+-
+-  other-modules:    ThisVersion
+-
+-  c-sources:        src/atomic_create.c
+-                    src/fpstring.c
+-                    src/c_compat.c
+-                    src/maybe_relink.c
+-                    src/umask.c
+-                    src/Crypt/sha2.c
+-  cc-options:       -D_REENTRANT
+-
+-  if os(windows)
+-    hs-source-dirs: src/win32
+-    include-dirs:   src/win32
+-    other-modules:  CtrlC
+-                    System.Posix
+-                    System.Posix.Files
+-                    System.Posix.IO
+-    cpp-options:    -DWIN32
+-
+-  if os(solaris)
+-    cc-options:     -DHAVE_SIGINFO_H
+-
+-  build-depends:   base          < 4,
+-                   regex-compat >= 0.71 && < 0.94,
+-                   mtl          >= 1.0 && < 1.2,
+-                   parsec       >= 2.0 && < 3.1,
+-                   html         == 1.0.*,
+-                   filepath     == 1.1.*,
+-                   haskeline    >= 0.6.1 && < 0.7,
+-                   hashed-storage >= 0.3.6 && < 0.4
+-
+-  if !os(windows)
+-    build-depends: unix >= 1.0 && < 2.4
+-
+-  build-depends: base >= 3,
+-                   old-time   == 1.0.*,
+-                   directory  == 1.0.*,
+-                   process    == 1.0.*,
+-                   containers >= 0.1 && < 0.3,
+-                   array      >= 0.1 && < 0.3,
+-                   random     == 1.0.*
+-
+-  -- We need optimizations, regardless of what Hackage says
+-  ghc-options:      -Wall -O2 -funbox-strict-fields
+-  ghc-prof-options: -prof -auto-all
+-
+-  if flag(curl)
+-    extra-libraries:   curl
+-    includes: [...incomplete...]



More information about the Pkg-haskell-commits mailing list