Re: Please give me a hand for mesa 7.10
On 2011-01-23 19:54 +0100, Cyril Brulebois wrote:
> I've prepared mesa 7.10 there:
> git://git.debian.org/git/pkg-xorg/lib/mesa debian-experimental
Should be git://git.debian.org/users/kibi/pkg-xorg/mesa.git instead.
> Trying the mergy-merge branch between 7.9 and 7.10 didn't work, there
> were plenty of non-debian/* changes afterwards, so I chose to merge -s
> ours to get something fast-forwardable from previous
> debian-experimental branch, and then added back debian/* in the next
> commit (aed8e54a).
>
> I'd appreciate if someone could review the changes since then.
>
> Also, dpkg-source chokes as can be seen below. I'm not sure whether we
> should modify the debian-experimental branch accordingly (that looks
> weird & wrong), or whether we should repack (which is a PITA).
>
> I'm not sure why there are so many changes between upstream git tag
> and released tarball, and whether we should try and get that fixed
> upstream…
I've noticed hundreds of files that are in git but not in the 7.10
tarball, including weird things like Windows .exe files. We could
'git rm' them (Julien did that for many files e.g. in commit f6a8b969),
getting rid of the "unrepresentable changes to source" error, but
they'll come back when we switch to 7.11. Maybe it would be good to
write a script to delete those files from the Debian branches.
Are there any files which are actually both in git and in the tarball,
but with different content?
> dpkg-source: warning: the diff modifies the following upstream files:
> .emacs-dirvars
> SConstruct
> autogen.sh
> bin/confdiff.sh
> bin/installmesa
> common.py
> configs/default
> configure.ac
Most of the files are probably just non-existent in the tarball, but why
did configure.ac change? The version in git matches the one in the 7.10
tarball, AFAICS.
Cheers,
Sven
Reply to: