Re: Bug#662632: RFS: libaio-ocaml/1.0~rc1
Russ Allbery <rra@debian.org> writes:
> Goswin von Brederlow <goswin-v-b@web.de> writes:
>
>> Given the above idea how would you lay out the git then?
>
>> With a moments thought I would have 3 branches:
>> - master
>> - upstream
>> - pristine-tar
>
>> All developement would happen in the master branch. Then before the
>> Debian upload I would merge master -> upstream (excluding the debian
>> dir), roll an orig.tar from upstream and import that into the
>> pristine-tar branch, tag everything and finally build a non-native
>> package. This could all be done with a "make release" so it would be
>> effortless.
>
> http://www.eyrie.org/~eagle/notes/debian/git.html
Where were you 2 years ago when I first asked about how to use git when
being both upstream and debian maintainer? :) But that is basically the
same idea Stephen gave me, just with more detail.
> If you want upstream to reflect the contents of the release tarball, you
> want to roll that release from master and then import it into upstream so
> that you get the generated files.
You are thinking way to complex here :)
libaio-ocaml% ls
CHANGES Makefile OMakefile debian/ lib/
LICENSE OCamlMakefile README.txt examples/
This is a really small and simple package. No automake or such. Also I'm
a fan of autoreconf so probably wouldn't include generated files in the
tarball at all. But if one does include generated files in the tarball
then you are right. Then git-import-orig would be the way to go.
> Also see README.source in the openafs source package for another technique
> for maintaining the upstream branch that I want to move to eventually.
Well, that [1] sounds complicated and doesn't seem to relate to any of this.
I'm upstream so there isn't anywhere to pull from and I don't need to
clean up files from the upstream tarball, bounce changed around mltiple
branches or cherry-pick stuf.
MfG
Goswin
1: http://ftp.de.debian.org/debian/ sid/main openafs 1.6.1~pre2-1 (dsc) [2551 B]
Reply to: