[Pkg-haskell-commits] darcs: darcs: Historic import 2.1.0-1.
Trent W. Buck
trentbuck at gmail.com
Sat Mar 6 11:45:29 UTC 2010
Sun Oct 19 02:48:20 UTC 2008 Trent W. Buck <trentbuck at gmail.com>
* Historic import 2.1.0-1.
Ignore-this: 4b232557f8192b8ee90bfd82e2713f2
R ./NEWS.upstream
M ./README.source -2 +7
M ./TODO -5 +6
M ./changelog +29
A ./clean
M ./compat -1 +1
M ./control -22 +31
M ./copyright -11 +16
M ./darcs-server.dirs -1 +1
M ./darcs.doc-base +2
R ./darcs.install
A ./darcs.links
A ./debuild.opts
R ./patches/
R ./patches/fix-manpage.patch
R ./patches/obsolete.patch
M ./rules -27
M ./watch +1
Sun Oct 19 02:48:20 UTC 2008 Trent W. Buck <trentbuck at gmail.com>
* Historic import 2.1.0-1.
Ignore-this: 4b232557f8192b8ee90bfd82e2713f2
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/changelog 2010-03-06 11:45:28.930147778 +0000
@@ -1,3 +1,32 @@
+darcs (2.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Manpage patch included upstream, so remove patch support.
+ It can be re-added later if necessary.
+ * Warn user when remote host has darcs1 (Closes: #494109).
+ * fix fix_filepath to work with --repodir (Closes: #458629).
+ * darcs trackdown --set-scripts-executable (Closes: #462917).
+ * Abolish darcs-server binary package
+ (Closes: #498542, #489131, #339770, #486192).
+ * Symlink identical HTML files (Closes: #491875).
+ * Adopt "standard" copyright file format.
+ Note that this patch only changes the format! The
+ copyright and license information still needs to be
+ checked against current releases of Darcs; corrections
+ will be a separate patch.
+ * Correctly munge prerelease version strings.
+ * control:
+ * fix VCS URL.
+ * enable DMs listed in Uploaders to upload directly. For more
+ information, see http://wiki.debian.org/Maintainers
+ * refactor description field based on darcs homepage.
+ * bump Standards-Version to 3.8.0.
+ Add a Homepage field.
+ Hard-wrap long fields (Uploads, Build-Depends) for readability.
+ * Bump debhelper dependency so debian/clean works.
+
+ -- Trent W. Buck <trentbuck at gmail.com> Sun, 19 Oct 2008 13:48:20 +1100
+
darcs (2.0.2-3) unstable; urgency=low
* Bump ghc6 build-depends to >= 6.8.2-7 (Closes: #500563).
diff -rN -u old-darcs/clean new-darcs/clean
--- old-darcs/clean 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/clean 2010-03-06 11:45:28.930147778 +0000
@@ -0,0 +1,30 @@
+# The upstream makefile's "all" target rebuilds a bunch of files that
+# are included in the source tarball. This upsets dpkg-source -b if
+# you rerun dpkg-buildpackage, because it looks like they were
+# patched.
+#
+# It happens that the upstream makefile has a "distclean" target,
+# which is too liberal, and a "maintainer-clean" target, which is too
+# agressive; the latter deletes files that require _darcs to rebuild.
+#
+# Rather than patching upstream's distclean rule, we just extend the
+# clean target here. This is code duplication, but probably easier to
+# understand and maintain.
+
+# from upstream's maintainer-clean
+doc/darcs.1
+doc/manual/*.html
+doc/manual/darcs*.???
+
+# typo in upstream's distclean rule
+src/Workaround.hs
+
+# never cleaned upstream
+microbench
+.depend
+doc/manual/darcs.xref
+doc/manual/darcs.lg
+src/darcs_print.ps
+src/darcs_print.pdf
+src/patch-theory.ps
+src/patch-theory.pdf
diff -rN -u old-darcs/compat new-darcs/compat
--- old-darcs/compat 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/compat 2010-03-06 11:45:28.902146292 +0000
@@ -1 +1 @@
-4
+7
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/control 2010-03-06 11:45:28.930147778 +0000
@@ -2,30 +2,39 @@
Section: devel
Priority: optional
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), cdbs, patchutils, ghc6 (>= 6.8.2-7), libghc6-html-dev, libghc6-http-dev, libghc6-parsec-dev, libghc6-regex-compat-dev, libghc6-http-dev, libghc6-mtl-dev, libghc6-quickcheck-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libkrb5-dev, texlive, tex4ht
-Vcs-Darcs: http://repos.mornfall.net/debian-darcs
-Standards-Version: 3.7.2
+Uploaders: Isaac Jones <ijones at debian.org>,
+ Petr Rockai <mornfall at debian.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7), cdbs, ghc6 (>= 6.8.2-7),
+ libghc6-html-dev, libghc6-http-dev, libghc6-parsec-dev,
+ libghc6-regex-compat-dev, libghc6-http-dev, libghc6-mtl-dev,
+ libghc6-quickcheck-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev,
+ libkrb5-dev, texlive, tex4ht
+Homepage: http://darcs.net/
+Vcs-Darcs: http://repos.mornfall.net/darcs/debian
+Standards-Version: 3.8.0
Package: darcs
Architecture: any
Depends: ${shlibs:Depends}
Recommends: exim4 | mail-transport-agent
-Suggests: darcs-server
-Description: an advanced revision control system
- Darcs is a revision control system, along the lines of CVS or arch. That
- means that it keeps track of various revisions and branches of your
- project, allows for changes to propagate from one branch to another.
- Darcs is intended to be an ``advanced'' revision control system. There
- are, in particular, two senses in which it is supposed to be advanced: 1)
- each copy of the source is a fully functional branch, and 2) underlying
- darcs is a consistent and powerful theory of patches.
-
-Package: darcs-server
-Architecture: any
-Depends: darcs, sudo, xsltproc, ${shlibs:Depends}
-Recommends: apache2 | httpd, gnupg, exim4 | mail-transport-agent
-Description: a cgi script for browsing darcs repositories on the web
- This package contains the cgi script which allows users to
- conveniently browse your repositories on the web. Darcs is a
- revision control system, along the lines of CVS or arch.
+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.
diff -rN -u old-darcs/copyright new-darcs/copyright
--- old-darcs/copyright 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/copyright 2010-03-06 11:45:28.922147353 +0000
@@ -1,17 +1,22 @@
-This package was debianized by David Roundy <droundy at abridgegame.org> in
-March 2003.
+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
-It was downloaded from abridgegame.org
-
-Upstream Author: David Roundy <droundy at abridgegame.org>
-
-Copyright:
-
- This software is copyright (c) 2002-2005 David Roundy
-
+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.
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.
+ 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:28.894145867 +0000
+++ new-darcs/darcs.doc-base 2010-03-06 11:45:28.926147565 +0000
@@ -8,3 +8,5 @@
Index: /usr/share/doc/darcs/manual/index.html
Files: /usr/share/doc/darcs/manual/*.html
+Format: pdf
+Files: /usr/share/doc/darcs/manual/darcs.pdf.gz
diff -rN -u old-darcs/darcs.install new-darcs/darcs.install
--- old-darcs/darcs.install 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/darcs.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-debian/tmp/usr/bin/darcs
-debian/tmp/etc/bash_completion.d/darcs
-debian/tmp/usr/share/doc/darcs/examples
-debian/tmp/usr/share/doc/darcs/manual/*.html
-debian/tmp/usr/share/doc/darcs/manual/*.css
-debian/tmp/usr/share/doc/darcs/manual/*.png
-debian/tmp/usr/share/doc/darcs/manual/*.pdf
diff -rN -u old-darcs/darcs.links new-darcs/darcs.links
--- old-darcs/darcs.links 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/darcs.links 2010-03-06 11:45:28.926147565 +0000
@@ -0,0 +1 @@
+usr/share/doc/darcs/manual/darcs.html usr/share/doc/darcs/manual/index.html
diff -rN -u old-darcs/darcs-server.dirs new-darcs/darcs-server.dirs
--- old-darcs/darcs-server.dirs 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/darcs-server.dirs 2010-03-06 11:45:28.930147778 +0000
@@ -1 +1 @@
-/var/cache/darcs
+var/cache/darcs
diff -rN -u old-darcs/debuild.opts new-darcs/debuild.opts
--- old-darcs/debuild.opts 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/debuild.opts 2010-03-06 11:45:28.926147565 +0000
@@ -0,0 +1 @@
+-i(_darcs|release) -I_darcs -Irelease
diff -rN -u old-darcs/patches/fix-manpage.patch new-darcs/patches/fix-manpage.patch
--- old-darcs/patches/fix-manpage.patch 2010-03-06 11:45:28.890145655 +0000
+++ new-darcs/patches/fix-manpage.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' darcs-2.0.0/src/Darcs/Commands/Init.lhs darcs-2.0.0.new/src/Darcs/Commands/Init.lhs
---- darcs-2.0.0/src/Darcs/Commands/Init.lhs 2008-04-08 01:08:19.000000000 +1000
-+++ darcs-2.0.0.new/src/Darcs/Commands/Init.lhs 2008-06-04 13:43:34.000000000 +1000
-@@ -56,7 +56,7 @@
- initialize_help =
- "Call 'initialize' once for each project you work on. Run it from the top \n"++
- "level directory of the project, with the project files already there. \n"++
-- "'initialize' will set up all the directories and files darcs needs in order to \n"++
-+ " 'initialize' will set up all the directories and files darcs needs in order to \n"++
- " start keeping track of revisions for your project. \n"
- \end{code}
-
diff -rN -u old-darcs/README.source new-darcs/README.source
--- old-darcs/README.source 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/README.source 2010-03-06 11:45:28.926147565 +0000
@@ -8,7 +8,7 @@
You will first need the current orig tarball from upstream (http://darcs.net)
to create the diff against (in the parent directory of the repository):
- wget http://darcs.net/darcs-2.0.2.tar.gz -O darcs_2.0.2.orig.tar.gz
+ uscan --force-download
The procedure is (in a clean repository, after a get or make maintainer-clean):
@@ -21,7 +21,7 @@
sbuild -a -S darcs_2.0.2-2.dsc
or maybe
-
+
pbuilder --build darcs_2.0.2-2.dsc
Note that in the future, the difficulty in building the package shall be
@@ -37,3 +37,8 @@
darcs rec
+You can then use
+
+ darcs send
+
+to mail the changes you have recorded to maintainers.
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules 2010-03-06 11:45:28.890145655 +0000
+++ new-darcs/rules 2010-03-06 11:45:28.926147565 +0000
@@ -1,39 +1,12 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS += --with-sendmail=/usr/sbin/sendmail
DEB_CONFIGURE_EXTRA_FLAGS += --enable-pipelining
-# Avoid breakage in darcs.cgi and cgi.conf?
-DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share
-DEB_MAKE_INSTALL_TARGET += installdocs installserver
# Work around #481592 (Closes: #485631).
# Remove me when #481592 is closed!
ifeq ($(DEB_HOST_ARCH),ia64)
CFLAGS := $(filter-out -g,$(CFLAGS))
endif
-
-# The upstream makefile's "all" target rebuilds a bunch of files that
-# are included in the source tarball. This upsets dpkg-source -b if
-# you rerun dpkg-buildpackage, because it looks like they were
-# patched.
-#
-# It happens that the upstream makefile has a "distclean" target,
-# which is too liberal, and a "maintainer-clean" target, which is too
-# agressive; the latter deletes files that require _darcs to rebuild.
-#
-# Rather than patching upstream's distclean rule, we just extend the
-# clean target here. This is code duplication, but probably easier to
-# understand and maintain.
-clean::
-# from upstream's maintainer-clean
- rm -f doc/darcs.1 doc/manual/*.html doc/manual/darcs*.???
-# typo in upstream's distclean rule
- rm -f src/Workaround.hs
-# never cleaned upstream
- rm -f microbench
- rm -f doc/manual/darcs.xref doc/manual/darcs.lg
- rm -f src/darcs_print.pdf src/patch-theory.pdf
- rm -f src/darcs_print.ps src/patch-theory.ps
diff -rN -u old-darcs/TODO new-darcs/TODO
--- old-darcs/TODO 2010-03-06 11:45:28.894145867 +0000
+++ new-darcs/TODO 2010-03-06 11:45:28.902146292 +0000
@@ -1,10 +1,11 @@
-* Find testers for darcs-server.
+* Explicit licensing for all parts of darcs.
-I don't grok darcs-server, and can't get either the 1.x or 2.x
-versions to work. I'd like to drop the --datadir thing from rules,
-but I don't know if this breaks darcs-server.
+ See release/licensing for details. Theoretically, Debian doesn't
+ distribute packages that don't explicitly license all their bits.
+ TWB is working with upstream to try to resolve this there.
+ Discussion mainly happens on the darcs-user mailing list.
-* Keep debian/ tree under version control.
+ Once done, need to update debian/copyright accordingly.
* Move documentation into a separate darcs-doc package?
diff -rN -u old-darcs/watch new-darcs/watch
--- old-darcs/watch 2010-03-06 11:45:28.890145655 +0000
+++ new-darcs/watch 2010-03-06 11:45:28.918147141 +0000
@@ -1,2 +1,3 @@
version=3
+opts="uversionmangle=s/pre/~pre/" \
http://www.darcs.net/darcs-(.*)\.tar\.gz
More information about the Pkg-haskell-commits
mailing list