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

Re: upstream release of unreleased package

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	lluvia@autistici.org
Newsgroups	linux.debian.maint.python
Subject	Re: upstream release of unreleased package
Date	Fri, 22 Feb 2019 20:20:02 +0100
Message-ID	<xuowy-6vj-3@gated-at.bofh.it> (permalink)
References	<xqLBo-7To-13@gated-at.bofh.it> <xqLL3-7WG-9@gated-at.bofh.it> <xrx3k-3rn-3@gated-at.bofh.it> <xrF0R-8sk-1@gated-at.bofh.it> <xspZL-3l8-1@gated-at.bofh.it> <xsth0-5bQ-5@gated-at.bofh.it> <xu3V7-2JZ-7@gated-at.bofh.it> <xu4xQ-2VZ-11@gated-at.bofh.it> <xu6zD-4kY-7@gated-at.bofh.it> <xu7m1-4zS-3@gated-at.bofh.it> <xujZU-3OR-3@gated-at.bofh.it>
X-Original-To	debian-python@lists.debian.org
X-Mailbox-Line	From debian-python-request@lists.debian.org Fri Feb 22 19:14:09 2019
Old-Return-Path	<lluvia@autistici.org>
X-Amavis-Spam-Status	No, score=-6.08 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FOURLA=0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no
X-Policyd-Weight	NOT_IN_SBL_XBL_SPAMHAUS=-1.5 CL_IP_EQ_FROM_MX=-3.1; rate: -4.6
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1550862808; bh=mM9ZQbtzttyXoXktGpKroA0lTooxE3klH7HQ6muk2yc=; h=Date:From:To:Subject:In-Reply-To:References; b=opHv+Bphj8bS0GN6BTUkQ0Y1fN9R1Bm+Qy90pEsPlSzfkjrbpUNcqPy0UgFXqgpM3 OGAV+nJ7Ytw8oYzdrLQkCzqVlchZQeJmf80y7ZMNOhQXmrLbk0i6J+TwtCV9wUcH0O pb3VbS+IqtZGbBFKChZ/jzA4N9RWafhzx0T2XNkA=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding	7bit
X-Sender	lluvia@autistici.org
User-Agent	Roundcube Webmail
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/16798
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/8971c82e86c8c47d9240148c950533ba@autistici.org
Approved	robomod@news.nic.it
Lines	35
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Fri, 22 Feb 2019 19:13:28 +0000
X-Original-Message-ID	<8971c82e86c8c47d9240148c950533ba@autistici.org>
X-Original-References	<e44cf191ab96af8e931c2becd897c2bc@autistici.org> <20190212191937.GB21549@belkar.wrar.name> <f994c1c37d4ed6446fed2bdd107593fe@autistici.org> <20190215061257.GA1574@belkar.wrar.name> <877edy6cyx.fsf@silverfish.pri> <b0442e2e973f650738fcc0e4d8d04221@autistici.org> <a194f69d42d009e9826a8af4e5e2e504@autistici.org> <20190221215458.GD27753@mitya57.me> <7e7f7902af946035988156deca5f900c@autistici.org> <35684f04c9d894e0d93ce7a01aecb5a8@autistici.org> <20190222142921.GA16926@mitya57.me>
Xref	csiph.com linux.debian.maint.python:11338

Show key headers only | View raw

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 
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

Best regards,
Daniel

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