README.source for the torbutton package
=======================================

torbutton upstream does not directly release source tarball.  As upstream is
using Git, releases are merged into the 'upstream' branch of the Debian package
repository.

torbutton is managed in a Git repository using git-buildpackage (_without_
pristine-tar).  It follows most of the advice provided by Russ Allbery at:
http://www.eyrie.org/~eagle/notes/debian/git.html

Creating an updated package for a new upstream release goes as:

0. Add a remote with upstream repository if not already done:

    $ git remote add upstream git://git.torproject.org/torbutton.git

1. Fetch new commits from upstream repository:

    $ git fetch upstream

2. Verify the tag for the new version:

    $ git tag -v <version>

3. Merge new upstream version to "upstream" branch:

    $ git checkout upstream
    $ git merge upstream <version>
    $ git tag upstream/<version>

4. Merge "upstream" branch to "master" branch:

    $ git checkout master
    $ git merge upstream/<version>
    $ dch -v <version>-1
    $ git commit debian/changelog -m "Add new changelog entry for <version>-1"
