Thomas Weber <tweber@debian.org> writes: > On Sat, Dec 10, 2011 at 10:29:40PM +0100, Thomas Weber wrote: >> > - I cannot run git-buildpackage without the --git-ignore-new option, >> > because some files tracked by git are deleted by debian/clean. A >> > similar issue is discussed in this old thread: >> > >> > http://www.mail-archive.com/debian-ocaml-maint@lists.debian.org/msg22803.html >> > >> > ...and the conclusion is that a patch would be more appropriate for >> > removing generated files from upstream tarball. An alternative >> > solution would be to use "git update-index --assume-unchanged", but >> > this is local to a working copy and does not propagate to remote >> > repositories if my understanding is correct. >> >> Sigh. The problem as I see it is: we must be able to regenerate the PDF >> files (if we patch just one source file for them, they will be >> regenerated anyway). But quilt has no support for binary files, so we >> cannot simply patch the files away. > > Hmm, can you just simply try and delete "debian/clean"? This seems to > fix everything here for me. We can kick off a documentation rebuild by > just touching some .txi files and it seems that the packaging machinery > doesn't look at diffs of generated binary files. Removing debian/clean helps. I am then able to run git-buildpackage without any option when starting from a clean repository. But then if I try to do a second build in a row, dpkg-source complains about modified files (both text and binary files). I think this is not policy compliant. I attach a patch which fixes the problem. Also note that for the second build in a row, I have to give the --git-ignore-new option. But I think we cannot do much about that, at least because dh_autoreconf deletes the files that it has modified (instead of restoring them to their original state).
From b4e3a2e27e82edf2598a61f9106627bf9fff12e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr> Date: Thu, 15 Dec 2011 12:32:32 +0100 Subject: [PATCH] debian/source/options: exclude various regenerated files from source diff --- debian/source/options | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 debian/source/options diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..56614c0 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore=.*\.pdf|.*\.dvi|.*\.png|.*\.eps|.*\.ps|.*\.texi|.*\.info.*|stamp-vti|src/oct-gperf\.h -- 1.7.7.1
-- Sébastien Villemot Researcher in Economics & Debian Maintainer http://www.dynare.org/sebastien Phone: +33-1-40-77-49-90 - GPG Key: 4096R/381A7594
Attachment:
pgpcWe3b1rAlM.pgp
Description: PGP signature