On Fri, Feb 22, 2019 at 07:13:28PM +0000, lluvia@autistici.org wrote: > Ok. These are the commands I would use: > > $ gbp clone git@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 Looks fine to me. The last command won’t do anything though, since the upstream tag already exists, and you have not created a Debian release/tag yet. -- Dmitry Shachnev
Attachment:
signature.asc
Description: PGP signature