Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #11335

Re: upstream release of unreleased package

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Hi,

On Fri, Feb 22, 2019 at 12:54:22AM +0000, lluvia@autistici.org wrote:
> Now that my system is working properly I propose a solution for the
> repository. It is based in git-revert the three branches (debian/master,
> upstream and pristine-tar) and invoke gbp import-orig with option
> --upstream-tag=upstream/0.3.8-aux. I paste a log of my proposal.
>
> Do you think it is adequate/correct?
>
> $ gbp clone git@salsa.debian.org:python-team/applications/visualequation.git
> gbp:info: Cloning from 'git@salsa.debian.org:python-team/applications/visualequation.git'
> $ cd visualequation/
> (debian/master)]$ git revert HEAD
> [debian/master 99ea7ee] 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 checkout upstream
> Switched to branch 'upstream'
> Your branch is up-to-date with 'origin/upstream'.
> (upstream)]$ git revert HEAD

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.

--
Dmitry Shachnev

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

upstream release of unreleased package lluvia@autistici.org - 2019-02-10 02:20 +0100
  Re: upstream release of unreleased package Brian May <bam@debian.org> - 2019-02-10 02:40 +0100
    Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-10 14:30 +0100
      Re: upstream release of unreleased package Andrey Rahmatullin <wrar@debian.org> - 2019-02-10 14:40 +0100
        Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-10 15:30 +0100
          Re: upstream release of unreleased package Brian May <bam@debian.org> - 2019-02-10 21:40 +0100
            Re: upstream release of unreleased package daniel <lluvia@autistici.org> - 2019-02-11 11:50 +0100
            Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-12 20:10 +0100
              Re: upstream release of unreleased package Andrey Rahmatullin <wrar@debian.org> - 2019-02-12 20:20 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-14 22:50 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-14 23:20 +0100
                Re: upstream release of unreleased package Andrey Rahmatullin <wrar@debian.org> - 2019-02-15 07:20 +0100
                Re: upstream release of unreleased package Brian May <bam@debian.org> - 2019-02-17 09:30 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-17 13:00 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-21 22:20 +0100
                Re: upstream release of unreleased package Dmitry Shachnev <mitya57@debian.org> - 2019-02-21 23:00 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-22 01:10 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-22 02:00 +0100
                Re: upstream release of unreleased package Dmitry Shachnev <mitya57@debian.org> - 2019-02-22 15:30 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-22 20:20 +0100
                Re: upstream release of unreleased package Dmitry Shachnev <mitya57@debian.org> - 2019-02-22 21:30 +0100

csiph-web