On 2019-02-22 14:29, Dmitry Shachnev wrote:
The last commits in upstream and pristine-tar branches look fine, no
need to revert them.
Just revert the last commit in debian/master (as you did above), then
merge upstream/0.3.8 tag into debian/master and update the changelog.
It should be enough.
Ok. These are the commands I would use:
$ gbp clone
g...@salsa.debian.org:python-team/applications/visualequation.git
$ cd visualequation/
(debian/master)]$ git revert HEAD
[debian/master 7cc491f] Revert "Adding patches"
3 files changed, 524 deletions(-)
delete mode 100644
debian/patches/0001-Imported-Upstream-version-0.3.8.patch
delete mode 100644
debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch
delete mode 100644 debian/patches/series
(debian/master)]$ git merge upstream/0.3.8 Merge made by the 'recursive'
strategy.
README.md | 12 ++++--
[...]
10 files changed, 167 insertions(+), 51 deletions(-)
(debian/master)]$ dch -v 0.3.8-1
(debian/master)]$ git add debian/changelog
(debian/master)]$ git commit -m "Updating debian/changelog to 0.3.8-1"
[debian/master b5496f5] Updating debian/changelog to 0.3.8-1
1 file changed, 3 insertions(+), 2 deletions(-)
(debian/master)]$ git push origin : --tags
Best regards,
Daniel
