1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
|
Some notes on the GIT repository
================================
Location
--------
The repository is available at:
http://neualius.turmzimmer.net/~fw/debfoster.git/
http://git.enyo.de/fw/debian/debfoster.git/
Branches
--------
* master: The main branch for Debian unstable.
* upstream: The "upstream" version, lacks the Debian packaging.
Tags
----
Upstream versions are tagged v2.6 and so on (without a hyphen), Debian
versions are tagged v2.6-1 and so on (with a hyphen).
Steps to prepare a new upstream version
---------------------------------------
1. Run "git tag -u KEY-ID VERSION" to create a signed tag (VERSION
should start with a small "v", see above).
2. Push it to the official repository: "git push neualius VERSION"
3. Create the upstream tar ball:
git tar-tree VERSION debfoster-VERSION |
gzip --best > ../debfoster_VERSION.orig.tar.gz
(Here, the "v" is dropped from the VERSION string, of course.)
4. Merge it into the Debian branch:
git checkout master
git merge "Merge from upstream" master upstream
Steps to prepare a new Debian version
-------------------------------------
1. Update the Debian changelog, based on the GIT log. It is best to
do this directly before the release of a new version, otherwise you
risk tons of conflicts during development.
2. Create a tag, this time with a hyphen, and push it to the official
repository (steps 1 and 2 from the upstream version release
procedure).
3. Make sure that the upstream tarball is present in the parent
directory.
4. Build binary and source packages using:
dpkg-buildpackage -i.git -rfakeroot -kKEY-ID
|