[Pkg-haskell-commits] darcs: darcs: Historic import 2.0.0-2.
Trent W. Buck
trentbuck at gmail.com
Sat Mar 6 11:45:22 UTC 2010
Wed Apr 9 06:37:59 UTC 2008 Trent W. Buck <trentbuck at gmail.com>
* Historic import 2.0.0-2.
Ignore-this: 91cc4c5bc695586fe40c3a1b921e48e
./patches/debian-changes-2.0.0-1 -> ./patches/debian-changes-2.0.0-2
M ./changelog -1 +7
M ./control -2 +1
M ./patches/series -1 +1
M ./rules -2 +1
Wed Apr 9 06:37:59 UTC 2008 Trent W. Buck <trentbuck at gmail.com>
* Historic import 2.0.0-2.
Ignore-this: 91cc4c5bc695586fe40c3a1b921e48e
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog 2010-03-06 11:45:22.253793523 +0000
+++ new-darcs/changelog 2010-03-06 11:45:22.353798830 +0000
@@ -1,3 +1,10 @@
+darcs (2.0.0-2) unstable; urgency=low
+
+ * Refer to texlive instead of tetex (vastly reducing build deps).
+ * Enable curl pipelining, because it sounds cool.
+
+ -- Trent W. Buck <trentbuck at gmail.com> Wed, 09 Apr 2008 16:37:59 +1000
+
darcs (2.0.0-1) unstable; urgency=low
* New upstream release (Closes: 456618).
@@ -477,4 +484,3 @@
* New upstream version.
-- David Roundy <droundy at abridgegame.org> Mon, 28 Jul 2003 08:18:28 -0400
-
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control 2010-03-06 11:45:22.253793523 +0000
+++ new-darcs/control 2010-03-06 11:45:22.353798830 +0000
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Isaac Jones <ijones 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-dev, libkrb5-dev, dvipng, tetex-bin, tetex-extra, tex4ht
+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
Package: darcs
@@ -27,4 +27,3 @@
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.
-
diff -rN -u old-darcs/patches/debian-changes-2.0.0-1 new-darcs/patches/debian-changes-2.0.0-1
--- old-darcs/patches/debian-changes-2.0.0-1 2010-03-06 11:45:22.249793311 +0000
+++ new-darcs/patches/debian-changes-2.0.0-1 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/debian-changes-2.0.0-2 new-darcs/patches/debian-changes-2.0.0-2
--- old-darcs/patches/debian-changes-2.0.0-2 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/debian-changes-2.0.0-2 2010-03-06 11:45:22.353798830 +0000
@@ -0,0 +1,51 @@
+--- 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:22.249793311 +0000
+++ new-darcs/patches/series 2010-03-06 11:45:22.353798830 +0000
@@ -1 +1 @@
-debian-changes-2.0.0-1
+debian-changes-2.0.0-2
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules 2010-03-06 11:45:22.249793311 +0000
+++ new-darcs/rules 2010-03-06 11:45:22.349798617 +0000
@@ -5,7 +5,7 @@
dh_testdir
sh ./configure --with-sendmail=/usr/sbin/sendmail \
--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --mandir=/usr/share/man --datadir=/usr/share
+ --mandir=/usr/share/man --datadir=/usr/share --enable-pipelining
touch configure-stamp
build: build-stamp
@@ -68,4 +68,3 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
-
More information about the Pkg-haskell-commits
mailing list