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

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

Thu Jan 22 07:14:38 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Historic import 2.2.0-1.
  Ignore-this: c6f7e424136f7b468cc32adaac1e8e40

    M ./changelog +9
    M ./clean -29 +16
    M ./control -5 +8
    R ./darcs-server.dirs
    R ./darcs-server.install
    M ./darcs.doc-base -4 +4
    M ./darcs.links -1 +1
    R ./darcs.manpages
    R ./debuild.opts
    M ./rules -8 +15

Thu Jan 22 07:14:38 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Historic import 2.2.0-1.
  Ignore-this: c6f7e424136f7b468cc32adaac1e8e40
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2010-03-06 11:45:31.582288502 +0000
+++ new-darcs/changelog	2010-03-06 11:45:31.614290200 +0000
@@ -1,3 +1,12 @@
+darcs (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Avoid curl-openssl (Closes: RU176).
+  * Use dh(1) instead of CDBS.
+  * Don't rebuild upstream's copy (PDF and HTML) of the manual.
+
+ -- Trent W. Buck <trentbuck at gmail.com>  Thu, 22 Jan 2009 18:14:38 +1100
+
 darcs (2.1.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.582288502 +0000
+++ new-darcs/clean	2010-03-06 11:45:31.614290200 +0000
@@ -1,30 +1,17 @@
-# 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
+# Delete some files generated during build, to avoid dpkg-source -b
+# going nuts during a rebuild.
 .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
+.depend_p
+microbench
+Distribution/*.o
+Distribution/*.hi
+tests/*.o
+tests/*.hi
+
+# ./darcs.docs says "doc/manual" instead of "doc/manual/*.html"
+# because we want /usr/share/doc/darcs/manual, rather than all those
+# files directly in /usr/share/doc/darcs.  But we *don't* want to
+# install the intermediary files like WARNINGS and darcs.tex.
+doc/manual/WARNINGS
+doc/manual/*.tex
+doc/manual/*.pl
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control	2010-03-06 11:45:31.578288290 +0000
+++ new-darcs/control	2010-03-06 11:45:31.614290200 +0000
@@ -5,11 +5,14 @@
 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
+Build-Depends:
+ debhelper (>= 7),
+ ghc6 (>= 6.8.2-7),
+ libcurl4-gnutls-dev,
+ libghc6-html-dev,
+ libghc6-http-dev,
+ libghc6-regex-compat-dev,
+ libghc6-utf8-string-dev
 Homepage: http://darcs.net/
 Vcs-Darcs: http://repos.mornfall.net/darcs/debian
 Standards-Version: 3.8.0
diff -rN -u old-darcs/darcs.doc-base new-darcs/darcs.doc-base
--- old-darcs/darcs.doc-base	2010-03-06 11:45:31.570287865 +0000
+++ new-darcs/darcs.doc-base	2010-03-06 11:45:31.610289988 +0000
@@ -1,12 +1,12 @@
 Document: darcs-doc
-Title: Darcs manual documentation
+Title: Darcs User Manual
 Author: David Roundy
-Abstract: This is the manual for the Darcs revision control system. tools. 
+Abstract: The user manual for the Darcs revision control system.
 Section: Programming
 
 Format: html
-Index: /usr/share/doc/darcs/manual/index.html
+Index: /usr/share/doc/darcs/manual/darcs.html
 Files: /usr/share/doc/darcs/manual/*.html
 
 Format: pdf
-Files: /usr/share/doc/darcs/manual/darcs.pdf.gz
+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.570287865 +0000
+++ new-darcs/darcs.links	2010-03-06 11:45:31.610289988 +0000
@@ -1 +1 @@
-usr/share/doc/darcs/manual/darcs.html usr/share/doc/darcs/manual/index.html
+usr/share/doc/darcs/manual/darcs_print.pdf.gz usr/share/doc/darcs/manual.pdf.gz
diff -rN -u old-darcs/darcs.manpages new-darcs/darcs.manpages
--- old-darcs/darcs.manpages	2010-03-06 11:45:31.570287865 +0000
+++ new-darcs/darcs.manpages	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-doc/darcs.1
diff -rN -u old-darcs/darcs-server.dirs new-darcs/darcs-server.dirs
--- old-darcs/darcs-server.dirs	2010-03-06 11:45:31.578288290 +0000
+++ new-darcs/darcs-server.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-var/cache/darcs
diff -rN -u old-darcs/darcs-server.install new-darcs/darcs-server.install
--- old-darcs/darcs-server.install	2010-03-06 11:45:31.570287865 +0000
+++ new-darcs/darcs-server.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-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/debuild.opts new-darcs/debuild.opts
--- old-darcs/debuild.opts	2010-03-06 11:45:31.570287865 +0000
+++ new-darcs/debuild.opts	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
--i(_darcs|release) -I_darcs -Irelease
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules	2010-03-06 11:45:31.570287865 +0000
+++ new-darcs/rules	2010-03-06 11:45:31.606289776 +0000
@@ -1,12 +1,19 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# Work around #481592 (Closes: #485631).  Remove when #481592 closes!
+CFLAGS := $(filter-out -g,$(CFLAGS))
 
+# There might not be an MTA installed at build time, so we need to
+# explicitly tell ./configure that there *WILL* be one.
 DEB_CONFIGURE_EXTRA_FLAGS += --with-sendmail=/usr/sbin/sendmail
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-pipelining
 
-# Work around #481592 (Closes: #485631).
-# Remove me when #481592 is closed!
-ifeq ($(DEB_HOST_ARCH),ia64)
-CFLAGS := $(filter-out -g,$(CFLAGS))
-endif
+# LaTeX might be installed at compile time, be we don't want to waste
+# time recompiling the HTML and PDF versions -- upstream provides
+# perfectly good copies in the source tarball.
+DEB_CONFIGURE_EXTRA_FLAGS += --without-manual
+
+%:
+	dh $@
+build:
+	dh build --before configure
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
+	dh build --remaining

More information about the Pkg-haskell-commits mailing list