Dear list readers,
I sent this message to the xorg list but did not get an answer [3]. I adapted this message a little bit.
I have some patches against xf86-video-intel 2.3.2 [4], which is the version in Debian Lenny. Ultimately these should be integrated upstream, so probably in version 2.7.x.
The developer of the patch is using Debian Lenny and therefore it would be convenient to be able to build always a Debian package to be able to test the patches.
My question is: “How is your repository setup?” or “How do you do this?”.
The Debian Git repository is available [1] and of course the xorg one too [2].
*One problem is, that the Debian branch includes some patches in debian/ which do not apply cleanly anymore after changing the Intel sources. Therefore it is not so easy to just merge to branches!*
1. One suggestion I got from Tobias Grimm was to do the following.
git init git remote add xorg git://anongit.freedesktop.org/xorg/driver/xf86-video-intel git remote add debian git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel git fetch debian ; git fetch --tags debian git fetch xorg ; git fetch --tags xorg # there are some minor discrepancies between the tags git br frc-patch xorg/master git br frc-debian-lenny debian/debian-lenny # publish the branches on a server
Then develop against one branch (probably debian-lenny the patches are based on) and cherry-pick them into master.
2. One other way is to only use the Debian Git repository because it tracks the xorg branches.
git clone git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel git checkout --track origin/upstream-lenny # apply patches against upstream-lenny git checkout --track origin/debian-lenny git merge upstream-lenny # rebase does not work # adapt a Debian specific patch # publish the branches on a server
3. Or would it be better to directly develop against debian-lenny?
4. What branches should be published? 4? One for upstream version in Debian Lenny, one to be ready to build for Debian Lenny, one for latest upstream and one adapted for Debian?
Sorry for this kind of post. But I am no Git expert, so any advice is much appreciated. I found this post [5] but because of the Debian/distribution specific stuff it did not solve all my questions.
Thanks,
Paul
[1] http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git [2] http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/ [3] http://lists.freedesktop.org/archives/xorg/2009-April/045279.html [4] http://projects.vdr-developer.org/git/?p=xf86-video-intel-frc.git;a=summary [5] http://www.gelato.unsw.edu.au/archives/git/0601/15567.html