[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: dpkg-source v2



On Sun, Oct 06, 2002 at 09:59:21PM -0400, Colin Walters wrote:
> So, could you take a look at this proposal?

So, I'm going to make two other suggestions.

First, is that maybe it's worth removing some of the special cases. It'd
seem relatively straight forward to have:

	Native packages:
		foo_1.2.3.orig.tar.gz
		foo_1.2.3.dsc

	Normal packages:
		foo_1.2.3.orig.tar.gz
		foo_debian_1.2.3-1.orig.tar.gz
		foo_1.2.3-1.dsc

	Multi-source packages:
		foo_1.2.3.orig.tar.gz
		foo_bar_2.4.orig.tar.gz
		foo_debian_1.2.3-1.orig.tar.gz
		foo_1.2.3-1.dsc

Obviously that'd require special casing to cope with the v1 format. (I'm
sorry, I've forgotten which way we were going with our examples. debian_*
and bar_* as appropriate, of course)

Second, is that I'm inclined to think patches should be treated as a little
more first class, than having them secreted somewhere under debian/. The
theory being that you go "dpkg-source -x *.dsc" and end up with the complete,
patched source that you can then modify or grep or do whatever as appropriate,
without getting false positives thanks to the silly diff's lying about and
whatever. My theory is that you extend the .diff.gz for this. Something
like:

	Packages with no upstream modifications:
		foo_1.2.3.orig.tar.gz
		foo_debian_1.2.3-1.orig.tar.gz
		foo_1.2.3-1.dsc

	Packages with one patch, including the debian/ stuff:
		foo_1.2.3.orig.tar.gz
		foo_1.2.3-1.diff.gz
		foo_1.2.3-1.dsc

	Packages with many patches:
		foo_1.2.3.orig.tar.gz
		foo_1.2.3-1.diff.tar.gz
		foo_1.2.3-1.dsc

(Actually, it'd probably be simpler to have ".diff.tar", and compress
the patches individually - this would also let you use the pristine
patch-2.5.31.bz2 and such like)

Keeping the .diff.gz around as well makes your dpkg-source-v1 special
casing limited to have a source consisting of just a single tarball be
called ".tar.gz" instead of ".orig.tar.gz", which would be fairly easy to
manage too, while also helping make the archive look a lot more sensible
without causing any new problems.

For completeness:

	Packages with many upstream source and many patches:

		foo_1.2.3.orig.tar.gz
		foo_bar_2.4.orig.tar.gz
		foo_debian_1.2.3.orig.tar.gz    # initial packaging for -1
		foo_1.2.3-5.diff.tar            # some fixes from CVS, etc
		foo_1.2.3-5.dsc

I think. I'm not really sure what the benefits and costs of both these
are, but I think they're worth considering.

Cheers,
aj

-- 
Anthony Towns <aj@humbug.org.au> <http://azure.humbug.org.au/~aj/>
I don't speak for anyone save myself. GPG signed mail preferred.

 ``If you don't do it now, you'll be one year older when you do.''

Attachment: pgpnaNxfx1f52.pgp
Description: PGP signature


Reply to: