Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Dmitry Shachnev Newsgroups: linux.debian.maint.python Subject: Re: upstream release of unreleased package Date: Fri, 22 Feb 2019 21:30:01 +0100 Message-ID: References: X-Original-To: lluvia@autistici.org X-Mailbox-Line: From debian-python-request@lists.debian.org Fri Feb 22 20:24:27 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-10.379 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, FOURLA=0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001] autolearn=ham autolearn_force=no X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lj1-f196.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -5.5 X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=d/vdk7r6f0oJt861OpBDJfKH8imUjqSPXIzNq26fqPM=; b=rBjgRvZd6nL+LrQuiGHrlm0nOtLg7ZX5QapJMYCnxczsghRxPmLHE3V1h/oamprhWA djfdWKGR2UayjdkROIR7Ivo8IWIQLquF/Ej3wefrYBxYcjd7wmHdtbYaBEtWEdHLOvB0 B4fNwUF4AqfUK561s9e3WFqQnKzc2t0dCHTYYrTDrvoyjsJufaXJgfeEtjvEXnlhDoW5 zW4t2pb3x6HFBGMUTfTIykWLR1a/E669GPMH+ldzHJougV4iYS7W/utzn4sNBSfVALuu 9E2Wh+7snkl6SCLIQ0m2BjdN+jKeubKrWebRbIMFZiWMz9l1tBK+H5IoQref0GqtPkuT E3xw== X-Gm-Message-State: AHQUAuab/qahxAHJX650qodM9+0WfQGC8p1VQ9WwlSZ8bKi5KKqwbN03 NIjYJI3uR58Nf+JBA+JUoOc= X-Google-SMTP-Source: AHgI3IYo9rfSqrNeFnHrvGufGbW48mFG7kHUqWVQOTSDI8C2j2IlB+A/+oMjOuJiR5IwSmOjhn+rKQ== X-Received: by 2002:a2e:6c09:: with SMTP id h9mr3326681ljc.139.1550867053423; Fri, 22 Feb 2019 12:24:13 -0800 (PST) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="gKMricLos+KVdGMg" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailing-List: archive/latest/16799 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20190222202405.GA27446@mitya57.me Approved: robomod@news.nic.it Lines: 61 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Cc: debian-python@lists.debian.org X-Original-Date: Fri, 22 Feb 2019 23:24:05 +0300 X-Original-Message-ID: <20190222202405.GA27446@mitya57.me> X-Original-References: <20190215061257.GA1574@belkar.wrar.name> <877edy6cyx.fsf@silverfish.pri> <20190221215458.GD27753@mitya57.me> <7e7f7902af946035988156deca5f900c@autistici.org> <35684f04c9d894e0d93ce7a01aecb5a8@autistici.org> <20190222142921.GA16926@mitya57.me> <8971c82e86c8c47d9240148c950533ba@autistici.org> Xref: csiph.com linux.debian.maint.python:11339 --gKMricLos+KVdGMg Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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.p= atch > delete mode 100644 debian/patches/0002-modifying-d-changelog-for-new-ups= tream-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=E2=80=99t do anything though, since the upstream tag already exists, and you have not created a Debian release/tag yet. -- Dmitry Shachnev --gKMricLos+KVdGMg Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE8kKZ/xu8kBi5BqTLYCaTbS8ciuAFAlxwWmUACgkQYCaTbS8c iuB5bg//TDN086J1H5GRsVVE9S3yWy3NG84ntoUipf4PKtrmewbcCSyBhjLGtxnC jPld4wDSepVYOknAKkX/BBUxieKt0KRra60VFv/aamsSYZxWH1BfMTkUVPkoOopo bUcK0J8USvsiT9npKAzJ0kXT9HNFOzzrUwKkCrHxC0LelifrXjk+9HKwTnRsY4F1 OvxHqqwWaE2mT/h/FOq15Asv9ZNuLGvf5eMy/3lJYkdDqO26UHlJukllWuG8BIKB 2eLB+WIfgLe4eqgpBvyldn5r9uU4bRjOBXc1tSMmexHy/0zuy7QCfF7k6sCZkUyM 0l3ujcvxGpfvZo0GSMtMwYu9FqdYv5ovV6mKhsusMuiEJHMQIMTFEu6AdIJIPEE4 MBKjiuZAGeloIgexxMELxtNffDBNAnaXeX7qGK3f9/4D0aq4tMYn6vbfuIzaSB8p 1c1+ftQk7QK5RYQs4UTccBhDqGxjxAXkoyBDOYpPTqEhuezNmSbvq6vVwBvz+Nmg ceApdH7yGrpPceO+em+lDt8sBtTMwLR1kVN+53lbKbq6FbmN2t2c7vFi0To/U53z p37Er7t+QUk3X8QTtVnrTESH/TM9s2TRyw/uISQrOR3jeoBj04HrLbg8tNBxESH7 D7jXSogE0Absqo11b7qNmLWCtmVDCxM+rKDJ5MwpgmAJRrjEdvY= =m/k1 -----END PGP SIGNATURE----- --gKMricLos+KVdGMg--