On Mon, Jun 13, 2005 at 05:05:19PM -0500, Branden Robinson wrote:
> On Mon, Jun 06, 2005 at 11:15:22AM +1000, Daniel Stone wrote:
> > On Sun, Jun 05, 2005 at 06:22:35PM -0500, X Strike Force SVN Repository Admin wrote:
> > > Ultimately, trunk/xc will all patches from trunk/debian/patches applied to
> > > it. However, that's going to wait until we change build/patch systems.
> > > Reverting trunk/xc to be a pristine copy of the vendor branch (as of the
> > > freedesktop.org XORG-6_8_2 CVS tag when originally created) enables us to
> > > keep using dbs for the time being.
> >
> > Right. Please do not update this tag.
> >
> > Even better would to just have it be a pristine copy of the result of
> > extracting the tarballs.
>
> That's not practical; there are lots of non-DFSG-free bits in the upstream
> tarball (fortunately, most of them are inessential). Review
> debian/copyright[1] for a mostly-complete list of specifics. (Documenting
> why rman is non-free is on the TODO[2].)
(Modulo the non-free bits, blah blah; this is what I did as well.)
> > In any case, unless there are quite some serious problems with
> > http://archive.ubuntu.com/ubuntu/pool/main/x/xorg/xorg_6.8.2.orig.tar.gz,
> > please ues that instead.
>
> Here's a list of problems I've found:
> 1) Known non-DFSG-free code exists in Ubuntu's tarball. It's a violation
> of the Debian Social Contract to upload non-DFSG-free code to main; to
> do so deliberately would be unprincipled and disrespectful to the Debian
> community.
Be specific. What in there violates the DFSG. The microcode?
> 2) The Ubuntu .orig.tar.gz ships a lot of stuff it doesn't need to, because
> Debian has externally packaged versions of them. This includes the
> expat, Xcursor, Xft2, and and Xrender libraries, the RENDER extension
> protocol headers, and the Bitstream Vera fonts.
It was easier to leave most of these cases in (as imake will often still
recurse into the directory, particularly in the case of FreeType, IIRC),
than save a few hundred KB out of 50MB with imake hackery.
> 3) One exception to the above is xc/extras/freetype2, which as you pointed
> a while back, *can't* be externalized because its source files are
> compiled and linked into libXfont. However, the Ubuntu .orig.tar.gz not
> only has the freetype2 files from the upstream release, it also has
> CVS/{Entries,Repository,Root,Tags} files as well.
*shrug*, following upstream.
> 4) Parts of the via driver for the Xorg server appear to be missing nearly
> at random. My guess is that this has something to do with patch
> #000_stolen_from_unichrome.sf.net.diff, but I'm not clear on why
> deleting files from the .orig.tar.gz is a prerequisite for a driver
> backport.
Nothing was done to the .orig.tar.gz to achieve the backport. Bear in
mind that, of course, the via driver update postdates the .orig.tar.gz,
so a crippled .orig wouldn't have compiled for a while. Are you sure
you're not just seeing files which have been added later?
> 5) Something similar to 4) appears to be going on with the xc/extras/Mesa
> directory and #000_stolen_from_Mesa_6.2_branch.diff.
And, again, either you're mistaken (and thinking that files which were
added in patches, e.g. t_vb_cull.c, should have been shipped in the
.orig, when they postdate it), or misled.
> On the bright side, of the files which the two trees have in common, there
> are no content differences (see attachment upstream_to_ubuntu.diff).
>
> Your mileage may vary with respect whether any of the above are "quite
> serious", but if even one is, it pretty much voids the point of using
> Ubuntu's .orig.tar.gz. At least I think it does -- you didn't explicitly
> state why Debian using Ubuntu's .orig.tar.gz is desirable.
Because we are upstream for the X.Org packaging, and I have no desire to
see 6.8.2-1 become ambiguous (just as I respected your wish to name my
4.3.x packages 4.3.0-0dsX for the same reason). If you were to version
xorg beginning with 6.8.2, it would be far preferable for many reasons
for people not to have to download two copies of the orig.
Attachment:
signature.asc
Description: Digital signature