Handling new upstream releases
==============================

Prior to version 4.2.4, new upstream releases of OCRmyPDF were handled
by simply merging upstream's signed release tags into the master
packaging branch.  From version 4.2.4 onwards, upstream's git history
contains at least one non-DFSG-free file in tests/resources/.  In
order to avoid pushing the DFSG-non-free files to dgit-repos, we
delete the files and squash-merge.

Roughly:

1. git remote add -f upstream https://github.com/jbarlow83/OCRmyPDF
2. git checkout -b upstream v1.2.3
3. git rm tests/resources/milk.pdf
4. git commit -m "DFSG-clean 1.2.3"
5. git tag -s 1.2.3+dfsg
6. git checkout master
7. git branch -D upstream
8. git merge --squash 1.2.3+dfsg
9. dch -v1.2.3+dfsg New upstream release.
10. gbp buildpackage -us -uc # this generates an orig.tar
11. sudo debi
12. debian/rules gen-man-page

I intend to script steps (2)--(8) to use Files-Excluded from the
copyright file.

 -- Sean Whitton <spwhitton@spwhitton.name>, Wed, 14 Sep 2016 16:50:48 -0700
