[Pkg-haskell-commits] darcs: darcs: Historic import 2.0.0-4.
Trent W. Buck
trentbuck at gmail.com
Sat Mar 6 11:45:24 UTC 2010
Thu Jun 5 04:24:16 UTC 2008 Trent W. Buck <trentbuck at gmail.com>
* Historic import 2.0.0-4.
Ignore-this: 851c0eaf4232f5a0f61dff78f623b627
A ./TODO
M ./changelog +23
M ./control -1 +1
A ./darcs-server.install
M ./darcs.doc-base -1 +1
A ./darcs.install
A ./darcs.manpages
A ./patches/fix-manpage.patch
M ./patches/obsolete.patch -61
M ./rules -74 +29
Thu Jun 5 04:24:16 UTC 2008 Trent W. Buck <trentbuck at gmail.com>
* Historic import 2.0.0-4.
Ignore-this: 851c0eaf4232f5a0f61dff78f623b627
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog 2010-03-06 11:45:24.757926395 +0000
+++ new-darcs/changelog 2010-03-06 11:45:24.817929579 +0000
@@ -1,3 +1,26 @@
+darcs (2.0.0-4) unstable; urgency=low
+
+ * Adopt CDBS (Closes: #484375).
+ * Don't install intermediary DVI and PostScript doc formats.
+ * Add horrible --datadir=/usr/share (is this necessary?)
+ * Drop paranoiac minimum versions from GHC dev packages to appease
+ lintian.
+ * Fix doc-base section to appease lintian.
+ * Indent initialize's docstring to avoid manpage render warning:
+ `initialize'' not defined (probable missing space after `in')
+ * Extend upstream's distclean target to include parts of
+ maintainer-clean, to appease dpkg-source -b in rebuilds.
+ * Whoops, I lost the 1.0.9-1.1 changes. The only change that I
+ didn't already re-invent in 2.0.0-1 was related to the openFd bug,
+ which upstream fixed in darcs 2 by looking for fdToHandle (Closes:
+ #470376). Closing it here convinces the Debian BTS that this bug
+ really *is* fixed in Lenny.
+ * Change build dependency "tex4ht | latex2html" back to just
+ "tex4ht", since the latter's upstream is quite old, and I've never
+ tested it.
+
+ -- Trent W. Buck <trentbuck at gmail.com> Thu, 05 Jun 2008 14:24:16 +1000
+
darcs (2.0.0-3) unstable; urgency=low
* Flip maintainer to Trent, add Isaac and myself to Uploaders.
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control 2010-03-06 11:45:24.757926395 +0000
+++ new-darcs/control 2010-03-06 11:45:24.817929579 +0000
@@ -3,7 +3,7 @@
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), 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
+Build-Depends: debhelper (>> 4.0), cdbs, patchutils, ghc6 (>= 6.8), 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
Standards-Version: 3.7.2
Package: darcs
diff -rN -u old-darcs/darcs.doc-base new-darcs/darcs.doc-base
--- old-darcs/darcs.doc-base 2010-03-06 11:45:24.757926395 +0000
+++ new-darcs/darcs.doc-base 2010-03-06 11:45:24.805928942 +0000
@@ -2,7 +2,7 @@
Title: Darcs manual documentation
Author: David Roundy
Abstract: This is the manual for the Darcs revision control system. tools.
-Section: Apps/Programming
+Section: Programming
Format: html
Index: /usr/share/doc/darcs/manual/index.html
diff -rN -u old-darcs/darcs.install new-darcs/darcs.install
--- old-darcs/darcs.install 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/darcs.install 2010-03-06 11:45:24.805928942 +0000
@@ -0,0 +1,7 @@
+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.manpages new-darcs/darcs.manpages
--- old-darcs/darcs.manpages 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/darcs.manpages 2010-03-06 11:45:24.805928942 +0000
@@ -0,0 +1 @@
+doc/darcs.1
diff -rN -u old-darcs/darcs-server.install new-darcs/darcs-server.install
--- old-darcs/darcs-server.install 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/darcs-server.install 2010-03-06 11:45:24.805928942 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/darcs
+debian/tmp/etc/darcs
+debian/tmp/usr/lib/darcs/cgi-bin/darcs.cgi usr/lib/cgi-bin
diff -rN -u old-darcs/patches/fix-manpage.patch new-darcs/patches/fix-manpage.patch
--- old-darcs/patches/fix-manpage.patch 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/fix-manpage.patch 2010-03-06 11:45:24.805928942 +0000
@@ -0,0 +1,12 @@
+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/patches/obsolete.patch new-darcs/patches/obsolete.patch
--- old-darcs/patches/obsolete.patch 2010-03-06 11:45:24.757926395 +0000
+++ new-darcs/patches/obsolete.patch 2010-03-06 11:45:24.805928942 +0000
@@ -1,61 +0,0 @@
---- darcs-1.0.9.orig/configure
-+++ darcs-1.0.9/configure
-@@ -871,6 +871,12 @@
- | --ht=*)
- htmldir=$ac_optarg ;;
-
-+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+ ac_prev=htmldir ;;
-+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+ | --ht=*)
-+ htmldir=$ac_optarg ;;
-+
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -979,6 +985,16 @@
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
-+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+ ac_prev=pdfdir ;;
-+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+ pdfdir=$ac_optarg ;;
-+
-+ -psdir | --psdir | --psdi | --psd | --ps)
-+ ac_prev=psdir ;;
-+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+ psdir=$ac_optarg ;;
-+
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -1644,6 +1660,7 @@
- . "$ac_site_file"
- fi
- done
-+IFS=$as_save_IFS
-
- if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
-@@ -2957,12 +2974,6 @@
- { (exit 1); exit 1; }; }
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-
-
- ac_aux_dir=
-@@ -3635,6 +3646,7 @@
- $ac_path_GREP_found && break 3
- done
- done
-+IFS=$as_save_IFS
-
- done
- IFS=$as_save_IFS
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules 2010-03-06 11:45:24.757926395 +0000
+++ new-darcs/rules 2010-03-06 11:45:24.817929579 +0000
@@ -1,78 +1,33 @@
#!/usr/bin/make -f
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- sh ./configure --with-sendmail=/usr/sbin/sendmail \
- --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --mandir=/usr/share/man --datadir=/usr/share --enable-pipelining
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-# $(MAKE)
-# rm -f darcs.ps manual/index.html # Need to get table of contents right...
- $(MAKE)
- $(MAKE) doc/index.html
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- rm -f manual/*
- rm -f xine-out.wav authors
- $(MAKE) distclean
- 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
+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
+
+# 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
- dh_clean
-
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- DESTDIR=$(CURDIR)/debian/darcs $(MAKE) install
- # remove installed cruft
- cd debian/darcs/usr/share/doc/darcs/manual && rm -f darcs.4tc \
- darcs.aux darcs.idv darcs.lg darcs.xref darcs.tmp darcs.4ct \
- darcs.log
- DESTDIR=$(CURDIR)/debian/darcs-server $(MAKE) installserver
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installman -pdarcs doc/darcs.1
- dh_installman -pdarcs-server
- dh_installchangelogs -a ChangeLog
- dh_strip -a
- dh_link -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+ 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 1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/TODO 2010-03-06 11:45:24.817929579 +0000
@@ -0,0 +1,3 @@
+Does darcs-server even work anymore? I've never used it, but when I
+tried to test it both with and without --datadir, and with the
+1.0.9-1.1 package, it didn't seem to do anything.
\ No newline at end of file
More information about the Pkg-haskell-commits
mailing list