[pkg-fso-maint] [Debian] Where is Debian git repository for fso-gpsd ?

[Joachim Breitner]

Moving to pkg-fso now...

Hi Gismo,

Am Donnerstag, den 23.10.2008, 17:29 +0200 schrieb Luca Capello:
> On Thu, 23 Oct 2008 16:50:20 +0200, Joachim Breitner wrote:
> > BTW, gismo or anyone else: Is there a good documentation of how to use
> > git-buildpackage and pristine-tar together, when you base your work on a
> > clone of the upstream git repository?
> 
> Nothing that I'm aware of, sorry :-(

I found http://www.eyrie.org/~eagle/notes/debian/git.html
section “Debian and Upstream Combined”

If I read it correctly, it suggests to base the Debian branch on a
branch that only contains the released sources, as integrated by
git-import-orig, and keep the upstream branch basically unrelated. This
still allows for cherry-picking:

“I therefore keep the upstream maintenance and the Debian packaging on
independent sets of branches without common ancestors. I work on the
master branch and, when I'm ready to release, tag the released state of
that branch with a release/<version> tag. Then, I use git-import-orig to
import that released tarball, generally constructed with make dist or an
equivalent thereof, into an upstream branch and merge it into a debian
branch based off of that. This lets me still cherry-pick commits from
upstream development if I need them in a Debian package before the next
upstream release, but the Debian packaging is properly based on the
released tarballs and there's a branch holding the full tarball contents
for pristine-tar to work with.”

It sounds good so far. Maybe one can even use
# git checkout upstream
# git merge -s ours release/the-version
after running git-import-orig to tell git that this imported source
contains all the work in the mentioned version.

Sascha and others, if you want, you could also store your released
tarballs in git in the mentioned ways. You just need to use
git-import-orig (which uses pristine-tar), and ignore all the stuff
about the debian branch.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
Debian Developer
  nomeata at debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nomeata at joachim-breitner.de | http://people.debian.org/~nomeata
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20081023/4c45b163/attachment.pgp