
NMUs are welcome
================

Please make your changes in the git VCS, push the changes and make
a signed tag when you NMU, otherwise your changes will be lost on
the next upload.

Merging upstream's branch
=========================

Upstream branches before creating tags for release and then continues
development on the master branch.  Each tag is on one of those stub
branches.  Consequently, when we merge a new upstream tag, there are
merge conflicts.

 uscan -v -dd
 git checkout master
 git pull
 git checkout debian/sid
 git pull
 git branch debian/sid-0.18.0
 git checkout debian/sid-0.18.0
 git merge -s recursive -X theirs 0.18.0
 git rm ...... (any files deleted in theirs) ....
 cat version.txt    (does it look correct?)
 git commit





