[Pkg-haskell-commits] darcs: darcs: Historic import 2.0.0-3.

Petr Rockai mornfall at debian.org
Sat Mar 6 11:45:24 UTC 2010


Wed May 28 09:58:22 UTC 2008  Petr Rockai <mornfall at debian.org>
  * Historic import 2.0.0-3.
  Ignore-this: c582b7b5d0b3994c1f844553f4ee9605

    M ./NEWS.upstream -262
    M ./changelog +9
    M ./control -1 +2
    R ./patches/debian-changes-2.0.0-2
    R ./patches/series
    M ./rules -1 +9

Wed May 28 09:58:22 UTC 2008  Petr Rockai <mornfall at debian.org>
  * Historic import 2.0.0-3.
  Ignore-this: c582b7b5d0b3994c1f844553f4ee9605
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2010-03-06 11:45:24.161894769 +0000
+++ new-darcs/changelog	2010-03-06 11:45:24.273900712 +0000
@@ -1,3 +1,12 @@
+darcs (2.0.0-3) unstable; urgency=low
+
+  * Flip maintainer to Trent, add Isaac and myself to Uploaders.
+  * Fix the clean target in debian/rules to produce a clean diff.
+  * Remove unmaintained debian/NEWS.upstream.
+  * Upload to unstable.
+
+ -- Petr Rockai <mornfall at debian.org>  Wed, 28 May 2008 11:58:22 +0200
+
 darcs (2.0.0-2) unstable; urgency=low
 
   * Refer to texlive instead of tetex (vastly reducing build deps).
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control	2010-03-06 11:45:24.157894557 +0000
+++ new-darcs/control	2010-03-06 11:45:24.273900712 +0000
@@ -1,7 +1,8 @@
 Source: darcs
 Section: devel
 Priority: optional
-Maintainer: Isaac Jones <ijones at debian.org>
+Maintainer: Trent W. Buck <trentbuck at gmail.com>
+Uploaders: Isaac Jones <ijones at debian.org>, Petr Rockai <mornfall at debian.org>
 Build-Depends: debhelper (>> 4.0), ghc6 (>= 6.8), libghc6-html-dev (>= 1.0.1.1-2), libghc6-http-dev (>= 30010004-2), libghc6-parsec-dev, libghc6-regex-compat-dev, libghc6-http-dev, libghc6-mtl-dev, libghc6-quickcheck-dev, libcurl4-openssl-dev (>= 7.18.0-1) | libcurl4-gnutls-dev (>= 7.18.0-1), libkrb5-dev, texlive, tex4ht | latex2html
 Standards-Version: 3.7.2
 
diff -rN -u old-darcs/NEWS.upstream new-darcs/NEWS.upstream
--- old-darcs/NEWS.upstream	2010-03-06 11:45:24.161894769 +0000
+++ new-darcs/NEWS.upstream	2010-03-06 11:45:24.233898590 +0000
@@ -1,262 +0,0 @@
-darcs (1.0.3rc1-1) unstable; urgency=low
-
-  * Upstream News (From Tomasz Zielonka)
-  * Since our last formal release, there has been a surge of interest in
-    darcs, which has been reflected in the steady flow of patch submissions,
-    bug reports and group discussion. Thanks to all of our many
-    contributors!
-
-  * One of the most visible changes from 1.0.2 is the new colorization and
-    escaping of printed patches, implemented by Tommy Pettersson. It can
-    protect from maliciously inserted special characters and will show
-    trailing spaces. Fine-grained customisation is possible through use of
-    environment variables.
-
-  * The other nice new feature, also implemented by Tommy, is the enhanced
-    interface for unrecord and unpull, similar to that in pull. It allows to
-    unrecord/unpull several patches at once, taking dependencies into
-    account.
-
-  * Benedikt Schmidt improved the add command to automatically add all
-    parent directories of the added file. He also added --sendmail-command
-    option to 'send' - it allows the user to send patch bundles with a
-    program of his/her own choice.
-
-  * Karel Gardas implemented an often requested change to whatsnew, namely
-    that --look-for-adds implies --summary.
-
-  * A number of bugs have been fixed since the previous release, most
-    notably the mysterious "createDirectory bug" or the bug that made darcs
-    insist that there is a conflict when there was none.
-
-  * More than ten people contributed to darcs' test suite. Apart from adding
-    and improving tests there was much work on improving the darcs testing
-    framework by Mark Stosberg, Michael Schwern and Tommy Pettersson.
-
-  * This version of darcs can be compiled with GHC 6.2.2 or with the
-    recently released GHC 6.4.
-
-  * For more details see the ChangeLog or, if you are more curious, the
-    output of "darcs changes --from-tag 1.0.2".
-
-  * There is much exciting development happening in the unstable darcs
-    branch which won't make it into darcs 1.0.3. Josef Svenningsson
-    implemented a 'put' command. Benedikt Schmidt implemented a faster
-    diffing algorithm. David Roundy and Ian Lynagh are working hard on
-    speeding up darcs and they have very promising results.
-
-  * As I said, we won't put these improvements into 1.0.3 and until the
-    final release we'll only add bugfixes, etc. But don't worry, we plan to
-    release the next version of darcs with all this good stuff soon
-    afterwards.
-
-
- -- Isaac Jones <ijones at debian.org>  Wed, 11 May 2005 22:31:32 -0700
-
-darcs (1.0.0-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-
-  * I'm pleased to announce the release of darcs version 1.0.0.  The
-    chances since 1.0.0rc4 consist of a few documentation fixes, a compile
-    error when configured with --enable-antimemoize, and a fix for a bug
-    which showed up only when working with international characters.
-
-  * In addition, I'd like to announce the availabilty of a darcs mirror of
-    the linux kernel repository, which is available at
-    http://darcs.net/linux.html
-
-  * This mirror is sponsored by Aktiom Networks (http://aktiom.net/),
-    which hosts the darcs.net web server.
-
- -- Isaac Jones <ijones at debian.org>  Mon, 15 Nov 2004 7:54:18 -0500
-
-darcs (1.0.0rc4-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-
-  * I've just released the fourth (and final?) release candidate for darcs
-    1.0.0.  I hope to release 1.0.0 Very Soon Now, but don't let that stop
-    you from downloading the tarball and testing it out.
-
-  * Various bugs have been fixed since 1.0.0rc3, most notably in the build
-    system which was particularly broken for that release.  As far as new
-    features, the biggest changes are probably in the darcs.cgi system and
-    dealing with renamed files.
-
- -- Isaac Jones <ijones at debian.org>  Mon, 15 Nov 2004 7:53:20 -0500
-
-darcs (1.0.0rc3-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-  
-  * Alas, this time there are some real bugs fixed.  In particular, there
-    was a bug in the commutation of file renames and file adds that in
-    theory could lead to repository corruption, if you managed to reorder
-    the rename and the add, and then do a merge.  A few minor
-    non-repository-endangering bugs were also fixed.  Quite a bit of
-    documentation was updated, thanks to several contributors.  Support in
-    the interactive patch selection process for they'a' key which selects
-    all remaining patches was added.
-
-  * Hopefully soon I'll be comfortable calling this darcs 1.0.0, but this
-    was a somewhat discouraging round, since quite a few bugs showed up.
-    On the other hand, most were old bugs, not recently introduced, so at
-    least we seem to be converging on a bug-free darcs.
-
- -- Isaac Jones <ijones at debian.org>  Sun,  3 Oct 2004 18:30:52 -0400
-
-darcs (1.0.0rc2-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-
-  * I'm pleased to announce the availablity of the second darcs 1.0.0
-    release candidate.  There have been a few minor bugfixes, a new
-    "reportbug" command was added, and a few miscellaneous interface
-    improvements were made.
-
-  * The "antimemoization" feature which was intended to improve memory
-    usage has received mixed reports of its effectiveness/ineffectiveness,
-    so it's not enabled by default.  However, I'm still interested in
-    evaluating it as at least an optional way of improving memory usage
-    for large repos.  So more testing would be welcome.
-
- -- Isaac Jones <ijones at debian.org>  Thu, 16 Sep 2004 13:39:25 -0400
-
-darcs (1.0.0rc1-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-  
-  * I've just tagged and tarred up darcs 1.0.0rc1 (the "Baby Tai" release,
-    since my nephew will arrive for a visit later today--he lives in
-    California, so I don't see him as often as I'd like).
-  
-  * This release fixes a few minor bugs,
-
-  * adds a --reverse option to changes, and make darcs push finally work
-    on windows systems.
-
-  * An --exact-version option was added to darcs itself, which returns a
-    "context" from which the precise version of darcs with which it was
-    compiled can be recreated (provided there were no unrecorded changes).
-
-  * There were also a few improvements to the darcs.cgi script (thanks
-    especially to Will Glozer, its author).
-
- -- Isaac Jones <ijones at debian.org>  Tue, 17 Aug 2004 11:39:16 -0400
-
-darcs (0.9.23-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-
-  * This time, fortunately, there isn't much exciting.  Version 0.9.22
-    didn't have any particularly serious bugs, apart from an unfixed
-    hard-to-reproduce problem that shows up on windows and the Mac which
-    has yet to be resolved.  Hopefully 0.9.23 will also be relatively
-    boring in this respect.
-  
-  * Darcs now requires ghc 6.2.  Let me know if this is a problem, and
-    I'll add support at least for ghc 6.0.1.
-
-  * New features include:
-    - A new rerecord command, which allows you to add new changes to an
-    existing recorded command.  As with unrecord and friends, you don't
-    want to do this if other people already may have pulled the change.  I
-    already find this command extremely helpful.
-
-    - Support for a "message of the day".
-
-    - A new (still primitive) resolve command.
-
- -- Isaac Jones <ijones at debian.org>  Tue,  3 Aug 2004 16:53:46 -0400
-
-darcs (0.9.22-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): 
-
-  * This release fixes a number of bugs.  Most notably, it fixes the bug
-    in which darcs claimed to not get a lock on machines with both a long
-    hostname and PIDs having more than four digits.  It also fixes a bug
-    that caused darcs to generate incorrect timestamps.  A couple of bugs
-    were fixed in the interactive selection of patches which match a
-    pattern specified on the command line.
-
-  * On the feature side, the changes are pretty small.  A small change,
-    but surprisingly helpful, is the addition of number "(1/3)" indicating
-    which patch you looking at out of how many, in interactive commands
-    (thanks to Ian for this change).  Binary patches are no longer dumped
-    to the screen. Backslashes are now accepted as directory separators on
-    the command line under windows. The "--summary" output now displays
-    move changes appropriately.
-
-  * Patch bundles (created with "send") are now created with a hash of
-    their contents.  This insulates darcs from mailer corruption of
-    patches, but also will prevent certain hacks that were previously
-    possible (although not recommending) for dealing with the newline
-    issue on windows.
-
-  * Finally, a preliminary "--context" command was added to changes and
-    get, which allows you to create a "context" file using changes
-    --context, and then later specify that file with get --context to
-    recreate the original repository state.  The idea is that this
-    "context" can be embedded in a binary during the build process (of any
-    program under darcs), and then included in bug reports, so the precise
-    version that showed the bug can easily be duplicated.  Feedback on
-    this feature by anyone who is interested in using it would be
-    appreciated.  Expect this option to change (perhaps even in name) over
-    the next version or so...
-
- -- Isaac Jones <ijones at debian.org>  Sat, 26 Jun 2004 15:28:44 -0400
-
-darcs (0.9.20-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): I've just released darcs version
-    0.9.20.  Not much new here, just a number of bugfixes, some better
-    error reporting and improved XML output via annotate and changes.
-
- -- Isaac Jones <ijones at debian.org>  Wed, 26 May 2004 23:57:59 -0400
-
-darcs (0.9.19-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): This is mostly a bugfix release,
-    fixing several bugs that had sneaked into version 0.9.18.  The only
-    new feature is the addition of a --summary option to darcs changes.
-
- -- Isaac Jones <ijones at debian.org>  Sun, 11 Apr 2004 16:27:57 -0400
-
-darcs (0.9.18-1) unstable; urgency=low
-
-  * Upstream News (From David Roundy): The most notable change in this
-    release is that functionality provided by the old "push" command has
-    been split into two commands: "send" for sending patch bundles by
-    email, and "push", which supports the functionality of the former
-    "push --and-apply" or "push --and-apply-as" commands.
-
-    Win32 support has been improved.  (SNIP)
-
-    Along with these major changes go a lot of code cleanups, bug fixes
-    and even performance improvements.  A big thanks to all those who sent
-    in bug reports, patches and feature requests!
-
- -- Isaac Jones <ijones at debian.org>  Sun,  4 Apr 2004 00:15:47 -0500
-
-darcs (0.9.17-1) unstable; urgency=low
-
-  * Upstream News: There aren't many changes this time around because
-    (thanks to helpful reports) I found a couple of minor (no corruption)
-    but annoying bugs soon after releasing version 0.9.16.
-
-    The first bug was an annoying permissions bug that lead darcs to
-    occasionally remove read access by other users from its files.  The
-    second was a problem in apply where the --no-test flag would cause
-    darcs to fail.
-
-    On the plus side, support was added for giving file or directory
-    arguments to record, whatsnew and changes to restrict their output to
-    either the files listed, or any files in the directories given as
-    arguments.  Support for similar behavior had already (before 0.9.16)
-    been added to diff.  Still remaining to be extended in this way is
-    revert and perhaps some other commands that I haven't thought of.
-
-
- -- Isaac Jones <ijones at debian.org>  Sat, 21 Feb 2004 22:05:43 -0500
diff -rN -u old-darcs/patches/debian-changes-2.0.0-2 new-darcs/patches/debian-changes-2.0.0-2
--- old-darcs/patches/debian-changes-2.0.0-2	2010-03-06 11:45:24.157894557 +0000
+++ new-darcs/patches/debian-changes-2.0.0-2	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
---- darcs-2.0.0.orig/GNUmakefile
-+++ darcs-2.0.0/GNUmakefile
-@@ -231,6 +231,9 @@ installserver:	tools/cgi/darcs.cgi
- 	$(INSTALL_DATA) tools/cgi/xslt/*.xslt $(DESTDIR)$(datadir)/darcs/xslt/
- 	$(INSTALL_DATA) tools/cgi/xslt/errors.xml $(DESTDIR)$(datadir)/darcs/xslt/
- 	$(INSTALL_DATA) tools/cgi/xslt/styles.css $(DESTDIR)$(datadir)/darcs/xslt/styles.css
-+	test -d $(DESTDIR)$(datadir)/doc/darcs-server || \
-+		$(INSTALL) -d $(DESTDIR)$(datadir)/doc/darcs-server
-+	$(INSTALL_DATA) tools/cgi/README $(DESTDIR)$(datadir)/doc/darcs-server/README
- 
- # Debian policy doesn't allow symlinks as configuration files.
- #	test -e $(DESTDIR)$(sysconfdir)/darcs/styles.css || \
---- darcs-2.0.0.orig/configure.ac
-+++ darcs-2.0.0/configure.ac
-@@ -306,7 +306,7 @@ if test "$with_docs" = "yes"; then
- 		fi
- 	else
- 		TARGETS="$TARGETS doc/manual/index.html"
--		MAKEMANUAL="cd doc/manual && $HTLATEX ../../src/darcs.tex && ln -sf darcs.html index.html"
-+		MAKEMANUAL="cd doc/manual && TEX4HTENV=/etc/tex4ht/tex4ht.env $HTLATEX ../../src/darcs.tex && ln -sf darcs.html index.html"
- 	fi
- 	else
- 	TARGETS="$TARGETS doc/manual/index.html"
---- darcs-2.0.0.orig/src/Darcs/Utils.lhs
-+++ darcs-2.0.0/src/Darcs/Utils.lhs
-@@ -177,6 +177,7 @@ edit_file :: String -> IO ExitCode
- edit_file f = do
-   ed <- get_editor
-   exec_interactive ed f
-+             `ortryrunning` exec_interactive "vi" f
-              `ortryrunning` exec_interactive "emacs" f
-              `ortryrunning` exec_interactive "emacs -nw" f
-              `ortryrunning` exec_interactive "nano" f
-@@ -184,7 +185,7 @@ get_editor :: IO String
- get_editor = getEnv "DARCS_EDITOR" `catchall`
-              getEnv "DARCSEDITOR" `catchall`
-              getEnv "VISUAL" `catchall`
--             getEnv "EDITOR" `catchall` return "vi"
-+             getEnv "EDITOR" `catchall` return "sensible-editor"
- \end{code}
- 
- \begin{code}
-@@ -196,7 +197,7 @@ view_file f = do
-              `ortryrunning` exec_interactive "more" f
- get_viewer :: IO String
- get_viewer = getEnv "DARCS_PAGER" `catchall`
--             getEnv "PAGER" `catchall` return "less"
-+             getEnv "PAGER" `catchall` return "pager"
- \end{code}
- 
- \begin{code}
diff -rN -u old-darcs/patches/series new-darcs/patches/series
--- old-darcs/patches/series	2010-03-06 11:45:24.157894557 +0000
+++ new-darcs/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian-changes-2.0.0-2
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules	2010-03-06 11:45:24.157894557 +0000
+++ new-darcs/rules	2010-03-06 11:45:24.273900712 +0000
@@ -24,9 +24,17 @@
 	rm -f manual/*
 	rm -f xine-out.wav authors
 	$(MAKE) distclean
-	rm -f .depend doc/darcs.1 darcs_print.ps doc/index.html \
+	rm -f darcs_print.ps doc/index.html \
 	  Workaround.hs.beginning Workaround.hs.ending \
 	  Workaround.hs.prefix
+	# FIXME, index.html is in tarball but borked by build...
+	rm -f doc/manual/{darcs,index}.html
+	rm -f doc/manual/darcs.{idv,dvi,log,xref,4ct,aux,lg}
+	rm -f doc/manual/darcs[0-9].html doc/manual/darcs[0-9][0-9].html
+	rm -f doc/manual/darcs[0-6]x.png
+	rm -f doc/manual/darcs.tmp
+	rm -f src/darcs_print.pdf src/patch-theory.pdf
+	rm -f microbench
 	dh_clean
 
 install: DH_OPTIONS=





More information about the Pkg-haskell-commits mailing list