summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog80
-rw-r--r--debian/compat1
-rw-r--r--debian/control4
-rw-r--r--debian/control.in34
-rw-r--r--debian/patchsys-quilt.mk12
-rw-r--r--debian/quilt.debbuild.mk293
-rw-r--r--debian/quilt.docs1
-rw-r--r--debian/quilt.install5
-rw-r--r--debian/quilt.make24
-rwxr-xr-xdebian/rules20
10 files changed, 421 insertions, 53 deletions
diff --git a/debian/changelog b/debian/changelog
index 2448f30..10ec036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,81 @@
+quilt (0.43-1) unstable; urgency=low
+
+ * New upstream release
+ - bin/guards.in: s/ocnfiguration/configuration/
+ (Closes: #341518)
+ - doc/quilt.1.in: Document common options to all commands
+ (Closes: #334408)
+
+ -- Martin Quinson <mquinson@debian.org> Thu, 1 Dec 2005 14:38:10 +0100
+
+quilt (0.42-1) unstable; urgency=low
+
+ * New upstream release.
+ - New commands:
+ annotate: to see which patch modify which line of a file
+ header: to print or change the patch header
+ rename: to rename patches
+ - New options:
+ {diff,refresh} --no-index: suppress Index: lines in patch
+ delete -n: delete the next patch after topmost
+ --version: print the program version
+ - Rework the german translation (Closes: #313827).
+ * [Makefile.in]: in Debian, the docdir is /usr/share/doc/quilt, without
+ the version number. (Closes: #321155)
+ * Use the full path to /usr/sbin/sendmail (Closes: #318924)
+ * Add text and html versions of the pdf documentation (Closes: #320294)
+ Build-dep on hevea and lynx to get it working. Damn, that's huge deps
+
+ -- Martin Quinson <mquinson@debian.org> Wed, 29 Jun 2005 18:52:42 +0200
+
+quilt (0.40-6) unstable; urgency=low
+
+ [patchsys-quilt.mk]
+ * Don't call update-config after reverting patches. (Closes: #299010)
+
+ -- Martin Quinson <mquinson@debian.org> Wed, 29 Jun 2005 18:52:42 +0200
+
+quilt (0.40-5) unstable; urgency=low
+
+ [Packaging]
+ * Do not automatically generate debian/control.in since it is now
+ forbidden by policy.
+ [quilt.debbuild.mk]
+ * also cleanup arch cruft from debian dirs (patch stolen from cdbs)
+ * Pass the -nd flag to wget when fetching upstream source to avoid
+ by all means creating a dirctory structure.
+
+ -- Martin Quinson <mquinson@debian.org> Wed, 29 Jun 2005 10:36:57 +0200
+
+quilt (0.40-4) unstable; urgency=low
+
+ * Do depend on patchutils only when using cdbs
+ (dependency moved from control.in to patchsys-quilt.mk)
+ * quilt.debuild.mk: Also cleanup svn stuff from debian dirs
+
+ -- Martin Quinson <mquinson@debian.org> Sun, 22 May 2005 11:23:27 +0200
+
+quilt (0.40-3) unstable; urgency=low
+
+ * Depend on patchutils (>= 0.2.25) since we use lsdiff -H to fix #295913
+
+ -- Martin Quinson <mquinson@debian.org> Fri, 13 May 2005 18:43:23 +0200
+
+quilt (0.40-2) unstable; urgency=low
+
+ * Add /usr/share/quilt/quilt.debbuild.mk to ease the build from the cvs
+ of debian packages using quilt. Read its header for documentation.
+
+ -- Martin Quinson <mquinson@debian.org> Thu, 12 May 2005 23:02:13 +0200
+
+quilt (0.40-1) unstable; urgency=low
+
+ * New upstream version
+ * Add /usr/share/quilt/quilt.make for the ones not using CDBS.
+ The "patch" and "unpatch" targets are implemented.
+
+ -- Martin Quinson <mquinson@debian.org> Wed, 11 May 2005 15:51:51 +0200
+
quilt (0.39-3) unstable; urgency=low
* Add a word in the man page about how to display compressed pdf files
@@ -299,7 +377,7 @@ quilt (0.21-1) unstable; urgency=low
quilt (0.11-1) unstable; urgency=low
- * New upstream release. New upstream author. Development moved to savannah.
+ * New upstream release. New upstream author. Developement moved to savannah.
* Some functionnalities were removed, but all the scripts are much more robust now.
-- Martin Quinson <martin.quinson@tuxfamily.org> Sat, 18 Jan 2003 23:36:29 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index e0042b3..7d0db99 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Source: quilt
Section: devel
Priority: optional
Maintainer: Martin Quinson <mquinson@debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), gettext
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), gettext, hevea, lynx
Standards-Version: 3.6.1.0
Package: quilt
Architecture: any
Depends: patch, diffstat, bzip2, gettext, gawk, ${shlibs:Depends}
-Suggests: ccache, cdbs (>=0.4.27-1)
+Suggests: ccache
Description: Tool to work with series of patches
Quilt manages a series of patches by keeping track of the changes
each of them makes. They are logically organized as a stack, and you can
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 8113047..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-Source: quilt
-Section: devel
-Priority: optional
-Maintainer: Martin Quinson <mquinson@debian.org>
-Build-Depends: @cdbs@, gettext
-Standards-Version: 3.6.1.0
-
-Package: quilt
-Architecture: any
-Depends: patch, diffstat, bzip2, gettext, gawk, ${shlibs:Depends}
-Suggests: ccache
-Description: Tool to work with series of patches
- Quilt manages a series of patches by keeping track of the changes
- each of them makes. They are logically organized as a stack, and you can
- apply, un-apply, refresh them easily by traveling into the stack (push/pop).
- .
- Quilt is good for managing additional patches applied to a package received
- as a tarball or maintained in another version control system. The stacked
- organization proved to be efficient for the management of very large patch
- sets (more than hundred patches). As matter of fact, it was designed by and
- for linux kernel hackers (Andrew Morton, from the -mm branch, is the
- original author), and its main use by the current upstream maintainer is to
- manage the (hundreds of) patches against the kernel made for the SUSE
- distribution.
- .
- This package completely integrates into the CDBS, allowing maintainers
- using this new paradigm for their packaging script to benefit of the quilt
- comfort when editing their diff against upstream. The package also provide
- some basic support for the fool not using CDBS (yet).
- .
- http://savannah.nongnu.org/projects/quilt is the current best approximation
- of an upstream homepage.
diff --git a/debian/patchsys-quilt.mk b/debian/patchsys-quilt.mk
index 601afea..704459e 100644
--- a/debian/patchsys-quilt.mk
+++ b/debian/patchsys-quilt.mk
@@ -1,5 +1,5 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Martin Quinson (martin quinson#debian org)
+# Copyright © 2003 Martin Quinson <martin.quinson@tuxfamily.org>
# Description: An advanced patch system based on the quilt facilities.
# please refere to the documentation of the quilt package for more information.
#
@@ -54,9 +54,6 @@ DEB_PATCHDIRS = $(shell pwd)/debian/patches
# $HOME/.quiltrc (so that quilt knows where to search for this)
DEB_QUILT_PATCHDIR_LINK = patches
-# DEB_QUILT_SERIES: series file to use
-DEB_QUILT_SERIES = $(DEB_PATCHDIRS)/series
-
# Internal variables, do not change it unless you know what you're doing
DEB_QUILT_CMD = cd $(DEB_SRCDIR) && $(if $(DEB_QUILT_PATCHDIR_LINK),QUILT_PATCHES=$(DEB_QUILT_PATCHDIR_LINK)) quilt
@@ -67,7 +64,7 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), quilt
# This is a Bad Thing since cdbs updates those files automatically.
# (code stolen from cdbs itself, in dpatch.mk)
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), patchutils
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), patchutils (>= 0.2.25)
# target reverse-config, which we use, don't exist in old cdbs
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.27-1)
@@ -108,7 +105,7 @@ debian/stamp-patched:
touch debian/stamp-patched
$(MAKE) -f debian/rules update-config
- # update-config must be first
+ # update-config must be last
reverse-patches:
# reverse-config must be first
@@ -124,8 +121,5 @@ reverse-patches:
fi
rm -rf $(DEB_SRCDIR)/.pc
rm -f debian/stamp-patch*
-
- $(MAKE) -f debian/rules update-config
- # update-config must be first
endif
diff --git a/debian/quilt.debbuild.mk b/debian/quilt.debbuild.mk
new file mode 100644
index 0000000..3ea82e0
--- /dev/null
+++ b/debian/quilt.debbuild.mk
@@ -0,0 +1,293 @@
+#
+# This makefile chunk is intended to ease my work on packages. I hope it can
+# reveal useful to other people too. But if you see some cruft here and
+# there, you'll know why ;)
+#
+# Several of the package I work on (shadow, most of the pkg-grid alioth
+# project) use quilt to manage diff onto upstream tarball.
+#
+# We only store the debian directory in the SCM since all changes must be
+# done as patch managed by quilt.
+#
+# This makefile is intended to be copied in the directory containing the
+# debian/ tree. It can:
+#
+# - Download the upstream tarball and open it on need
+# * Define the SITE variable to tell it where to search for it (with wget)
+# * The package name is guessed from the current directory, but can be
+# explicitely given as the PKG variable.
+# * The verion number must be given as VER variable
+#
+# - Copy the debian directory onto the working directory
+# (yeah, cp debian/ $(PKG)-$(VER)/debian. I see you're following)
+#
+# - Build the package, capturing the output with script
+#
+# - Ensure that just after the package build, we have such a link:
+# $(PKG)-$(VER)/debian/patches -> debian/patches
+# So, changes to the patches with quilt gets saved out of the
+# $(PKG)-$(VER) tree, which can be erased at any time without loss.
+# Of course, just before the build, the makefile ensures that this link
+# is replaced by a copy of the debian/patches directory to make
+# dpkg-buildpackage happy
+
+# TARGETS:
+#
+# deb: Do what's documented above.
+#
+# debsign: don't add -us -uc to dpkg-buildpackage invocation
+# check-complet: for multi-binary packages, make sure that all the content
+# of debian/tmp gets moved away [to the right place] by dh_install
+# check-lintian:
+# check-linda:
+# check: all of the check-* above
+# scan or watch: watch for new upstream tarballs
+
+# VARIABLES which you can use to configure stuff:
+#
+# PKG: package name (defaults to the current directory name)
+# VER: package version (defaults to the changelog entry in debian/changelog)
+# UP_TAR: name of the tarfile, as called upstream
+# Defaults to $(PKG)-$(UP_VER).tar.gz where UP_VER is VER without -nn part
+# Useful to get it downloaded and/or opened automatically
+# EXTRA_OPEN_CMD: what to do after untarring upstream tarball.
+# When upstream tarball doesn't contain a gentle $(PKG)-$(UP_VER) as
+# expected by dpkg-buildpackage, do this:
+# EXTRA_OPEN_CMD=mv the_funky_dir_name_given_upstream $(PKG)-$(UP_VER)
+# SITE: where to get the upstream tarball (we do "wget $(SITE)/$(UP_TAR)")
+#
+
+# CAVEATS:
+#
+# - $(PKG)-$(VER) is not considered as precious at all. Don't change
+# anything in it. In particular, don't change $(PKG)-$(VER)/debian files.
+
+##############
+### That's it.
+### The actual makefile chunk follows, but you shouldn't need to dig into it
+##############
+
+PKG?=$(shell pwd |sed 's|.*/||')
+VER?=$(shell dpkg-parsechangelog -ldebian/changelog|grep '^Version'|sed -e 's/[^ ]* //' -e 's/[^:]://')
+UP_VER=$(shell echo $(VER)|sed 's/-.*$$//')
+UP_TAR?=$(PKG)-$(UP_VER).tar.gz
+
+########################################################
+##################### BUILD TARGET #####################
+########################################################
+
+deb:: $(PKG)-$(UP_VER) stamp-debdir $(PKG)_$(UP_VER).orig.tar.gz
+ @echo XXXXXXXXXXX Build the deb
+ rm -rf $(PKG)-$(UP_VER)/debian/patches
+ @if [ -e debian/patches ] ; then \
+ echo "cp -r debian/patches $(PKG)-$(UP_VER)/debian"; \
+ cp -r debian/patches $(PKG)-$(UP_VER)/debian; \
+ fi
+ -cd $(PKG)-$(UP_VER) && script -c "dpkg-buildpackage -rfakeroot -uc -us" ../build.log
+ @if [ -e debian/patches ] ; then \
+ rm -rf $(PKG)-$(UP_VER)/debian/patches ; \
+ echo "Link patches/ to ../debian/patches" ; \
+ cd $(PKG)-$(UP_VER)/debian ; \
+ ln -s ../../debian/patches .; \
+ fi
+
+debsign:: $(PKG)-$(UP_VER) stamp-debdir $(PKG)_$(UP_VER).orig.tar.gz
+ @echo XXXXXXXXXXX Build the deb
+ rm -rf $(PKG)-$(UP_VER)/debian/patches
+ @if [ -e debian/patches ] ; then \
+ echo "cp -r debian/patches $(PKG)-$(UP_VER)/debian"; \
+ cp -r debian/patches $(PKG)-$(UP_VER)/debian; \
+ fi
+ cd $(PKG)-$(UP_VER) && script -c "dpkg-buildpackage -rfakeroot" ../build.log
+ @if [ -e debian/patches ] ; then \
+ rm -rf $(PKG)-$(UP_VER)/debian/patches ; \
+ echo "Link patches/ to ../debian/patches" ; \
+ cd $(PKG)-$(UP_VER)/debian ; \
+ ln -s ../../debian/patches .; \
+ fi
+
+$(PKG)-$(UP_VER):: $(UP_TAR)
+ @echo XXXXXXXXXXX Open the tarball
+ rm -rf $(PKG)-$(UP_VER)
+ tar xfz $(UP_TAR)
+ $(EXTRA_OPEN_CMD)
+
+$(UP_TAR)::
+ @echo XXXXXXXXXXX Download the tarball
+ @if test -e $(UP_TAR) ; then \
+ echo "Tarball found; no download needed."; \
+ else \
+ if test "x$(SITE)" = x ; then \
+ echo "Unable to download $(UP_TAR) since no SITE is provided";\
+ echo "Either edit Makefile or download the tarball yourself";\
+ exit 1;\
+ else \
+ wget -nd $(SITE)/$(UP_TAR);\
+ fi\
+ fi
+
+stamp-debdir: FORCE
+ @echo XXXXXXXXXXX Put the debian dir in position
+ rm -rf $(PKG)-$(UP_VER)/debian
+ cp -Lr debian $(PKG)-$(UP_VER)/debian
+ for i in CVS .svn \{arch\} .arch-ids ; do \
+ find $(PKG)-$(UP_VER)/debian -type d -name $$i | xargs rm -rf ; \
+ done
+ for i in .cvsignore svn-commit.tmp .arch-inventory ; do \
+ find $(PKG)-$(UP_VER)/debian -type f -name $$i | xargs rm -f ; \
+ done
+ touch stamp-debdir
+
+$(PKG)_$(UP_VER).orig.tar.gz: $(UP_TAR)
+ @echo XXXXXXXXXXX Copy the orig.tar.gz
+ cp $(UP_TAR) $(PKG)_$(UP_VER).orig.tar.gz
+
+FORCE:
+
+########################################################
+##################### CHECK TARGET #####################
+########################################################
+check-complet: FORCE
+ @echo XXXXXXXXXXX Check the package for completness
+ @for file in `find $(PKG)-$(UP_VER)/debian/tmp -type f|\
+ sed 's|$(PKG)-$(UP_VER)/debian/tmp/||'` ; do \
+ where=`find $(PKG)-$(UP_VER)/debian/*|\
+ grep -v '$(PKG)-$(UP_VER)/debian/tmp'|\
+ grep $$file|\
+ sed -e "s|$(PKG)-$(UP_VER)/debian/||" \
+ -e 's|\([^/]*\)/.*|\1|' `; \
+ if [ "x$$where" = x ] ; then \
+ base=`basename $$file`; \
+ where=`find $(PKG)-$(UP_VER)/debian/*|\
+ grep -v '$(PKG)-$(UP_VER)/debian/tmp'|\
+ grep $$base|\
+ sed -e "s|$(PKG)-$(UP_VER)/debian/||" `; \
+ if [ "x$$where" = x ] ; then \
+ echo "Not Found $$file"; \
+ else \
+ echo "NOT FOUND $$file (beside $$where)"; \
+ fi \
+ else \
+ echo Found $$file in $$where >/dev/null; \
+ fi;\
+ done
+
+check-relocation: FORCE
+ @echo XXXXXXXXXXX Check the relocation of the package
+ @for pkg in `grep Package $(PKG)-$(UP_VER)/debian/control|\
+ sed 's|Package: ||'` ; do \
+ echo "XXX check $$pkg"; \
+ LC_ALL=C grep -r $(PWD) $(PKG)-$(UP_VER)/debian/$$pkg |\
+ while read line ; do \
+ if echo $$line|grep -q 'Binary file' >/dev/null ; then \
+ name=`echo $$line|sed 's/Binary file \([^ ]*\) .*$$/\1/'`; \
+ echo " Binary $$name =>";\
+ strings $$name |grep $(PWD)|\
+ grep -v '.c$$'|sed 's/^/ /';\
+ else \
+ echo " $$line"; \
+ fi; \
+ done; \
+ done
+
+check-relocation-old: FORCE
+ @echo XXXXXXXXXXX Check the relocation of the package
+ @for pkg in `grep Package $(PKG)-$(UP_VER)/debian/control|\
+ sed 's|Package: ||'` ; do \
+ echo "XXX check $$pkg"; \
+ LC_ALL=C grep -r $(PWD) $(PKG)-$(UP_VER)/debian/$$pkg|\
+ sed 's/^/ /';\
+ done
+
+check-lintian: FORCE
+ @echo XXXXXXXXXXX Check the package with lintian
+ lintian -i *.deb
+ lintian -i *.dsc
+
+check-linda: FORCE
+ @echo XXXXXXXXXXX Check the package with linda
+ linda -i *.deb
+ linda -i *.dsc
+
+check: check-complet check-linda check-lintian
+
+##########################################################
+##################### REMOTE TARGETS #####################
+##########################################################
+HOST ?= veloce.inria.fr
+remote-real: FORCE
+ @echo XXXXXXXXXXX Build on $(HOST)
+ @if [ `ls *.dsc |wc -l` -gt 1 ] ; then \
+ echo "There is several dsc files. Please cleanup"; \
+ exit 1; \
+ fi
+ files=`cat *.dsc| \
+ grep-dctrl -s Files -e -FSource . -n| \
+ sed 's/^.*[^ ] *[^ ]* *\([^ ]*\)$$/\1/'`" "`ls *.dsc` ;\
+ ssh $(HOST) "rm -rf ~/remotebuild;mkdir ~/remotebuild" ; \
+ scp $$files $(HOST):~/remotebuild; \
+ ssh $(HOST) "cd remotebuild;dpkg-source -x *.dsc; cd $(PKG)-*; dpkg-buildpackage -rfakeroot -us -uc -B"; \
+ scp $(HOST):~/remotebuild/*.deb .; \
+ scp $(HOST):~/remotebuild/*.changes .;
+# dput local `ssh $(HOST) "cd ~/remotebuild; ls *.changes"`
+ @echo ok;
+# gpg --decrypt - 2>/dev/null |\
+
+alpha: FORCE
+ HOST=veloce.inria.fr $(MAKE) remote-real
+
+ppc: FORCE
+ HOST=valnure.cs.ucsb.edu $(MAKE) remote-real
+
+sparc: FORCE
+ HOST=sperm.cs.ucsb.edu $(MAKE) remote-real
+
+sync: FORCE
+ make -C ~/public_html publish
+
+remote: alpha ppc sparc sync
+
+
+########################################################
+##################### CLEAN TARGET #####################
+########################################################
+
+clean-dsc: FORCE
+ @echo XXXXXXXXXXX Clean the old versions
+ @while [ `ls *.dsc |wc -l` -gt 1 -o `ls *.changes |wc -l` -gt 1 ] ; do \
+ if [ `ls *.changes |wc -l` -gt 1 ] ; then \
+ echo "XXX Cleanup binaries";ls;\
+ changes=`ls *.changes|head -1`; \
+ list=`grep-dctrl -s Files -n . $$changes|\
+ sed 's/^ *//'|\
+ cut -d' ' -f5|\
+ egrep -v '\.dsc$$'`;\
+ rm -i $$list $$changes; \
+ fi; \
+ \
+ if [ `ls *.dsc |wc -l` -gt 1 ] ; then \
+ echo "XXX Cleanup source";ls;\
+ dsc=`ls *.dsc|head -1`; \
+ list=`grep-dctrl -s Files -n . $$dsc|\
+ sed 's/^ *//'|\
+ cut -d' ' -f3|\
+ egrep -v '\.orig.tar.gz$$'`; \
+ rm -i $$list $$dsc; \
+ fi; \
+ done
+
+clean: clean-dsc
+ @echo XXXXXXXXXXX Clean the stamps
+ rm -rf stamp-*
+
+maintainerclean: clean
+ rm -rf *.deb *.diff.gz *.dsc *.changes *.upload
+ rm -rf $(PKG)_$(UP_VER).orig.tar.gz $(PKG)-$(UP_VER)
+
+scan watch:
+ uscan --check-dirname-regex 'PACKAGE' --check-dirname-level 2 --report
+
+.PHONY: FORCE scan watch clean clean-dsc
+ifneq (,$(wildcard makefile.override))
+include makefile.override
+endif
diff --git a/debian/quilt.docs b/debian/quilt.docs
index 647a406..0228508 100644
--- a/debian/quilt.docs
+++ b/debian/quilt.docs
@@ -1,4 +1,3 @@
AUTHORS
-BUGS
TODO
diff --git a/debian/quilt.install b/debian/quilt.install
index ce3f002..318179a 100644
--- a/debian/quilt.install
+++ b/debian/quilt.install
@@ -5,4 +5,9 @@ usr/share/doc/quilt-*/* usr/share/doc/quilt/
usr/share/locale/*
usr/share/man/*
usr/share/quilt/*
+../quilt.debbuild.mk usr/share/quilt
+../quilt.make usr/share/quilt
../patchsys-quilt.mk /usr/share/cdbs/1/rules/
+
+../../doc/quilt.html usr/share/doc/quilt
+../../doc/quilt.txt usr/share/doc/quilt
diff --git a/debian/quilt.make b/debian/quilt.make
new file mode 100644
index 0000000..f9fe718
--- /dev/null
+++ b/debian/quilt.make
@@ -0,0 +1,24 @@
+#
+# This file tries to mimick /usr/share/dpatch/dpatch.make
+#
+
+# -*- Makefile -*-, you silly Emacs!
+# vim: set ft=make:
+
+# QUILT_STAMPFN: stamp file to use
+QUILT_STAMPFN ?= stamp-patched
+
+# QUILT_PATCH_DIR: where the patches live
+QUILT_PATCH_DIR ?= debian/patches
+
+patch: $(QUILT_STAMPFN)
+$(QUILT_STAMPFN):
+ # quilt exits with 2 as return when there was nothing to do.
+ # That's not an error here (but it's usefull to break loops in crude scripts)
+ QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt push -a || test $$? = 2
+ touch debian/$(QUILT_STAMPFN)
+
+unpatch:
+ QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a -R || test $$? = 2
+ rm -rf .pc debian/$(QUILT_STAMPFN)
+
diff --git a/debian/rules b/debian/rules
index 81ea47b..4ffeca4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# $Id: rules,v 1.15 2005/01/06 19:32:53 mquinson Exp $
-
-# Let cdbs track the build-dep for me
-debian/control:: debian/control.in debian/rules
-DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+# $Id: rules,v 1.16 2005/12/01 13:45:35 mquinson Exp $
# Import Common Debian Build System (CDBS).
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -21,4 +17,16 @@ DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
# force awk to be gawk, since mawk causes trouble
-DEB_CONFIGURE_EXTRA_FLAGS := --with-awk=/usr/bin/gawk
+# also specify the full path to sendmail, as requested by policy
+DEB_CONFIGURE_EXTRA_FLAGS := --with-awk=/usr/bin/gawk --with-mta=/usr/sbin/sendmail
+
+# distribute a text version of the doc for fool souls
+common-build-arch::
+ mkdir doc/tmp || true
+ cd doc/tmp; LC_ALL=C hevea ../main.tex ; LC_ALL=C hevea ../main.tex; LC_ALL=C hevea ../main.tex
+ cp doc/tmp/main.html doc/quilt.html
+ LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html
+ LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt
+
+clean::
+ rm -rf doc/quilt.txt doc/quilt.html doc/tmp