Path: csiph.com!news.mixmin.net!news.unit0.net!newsfeed.CARNet.hr!news.spin.it!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 15:30:02 +0100 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Fri Feb 22 14:29:38 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-11.407 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.221, 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] 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-f195.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=Y+lNyn2DdZc8gSKETSC+zJ9+z6UZjIl5riki2h7+zPI=; b=VXBRygeD0axHUqx33zWmPpDBXbBYxOGjBRZE8ESfAYcYW6kZfSg+ozhJ9Xb7PNk/w6 +1czgiMePRwzrPk1qnUeTHrwDzY3KbM5+5Uc6Q9teD7+ppVa9/wyhU+M7k3h13JQAs8k bWZg3gJC2kiFJnlThMP8l70sWSQK6EA3GU7gPgc22LVptCaFMYZMuCRq9IAHmQkoAONs wRrfIyhtaOlE2+5tggNZYS7SmLpjCUNdGffyrunykTjhh8dEAjdp2eKo8wERCrW11n8c m7v4tSHnXypwso8D2EfbSkizbpr1vENH7edjsn0XUxuHyKME9K6HOWXaIp/9JO9pSWDp RRwA== X-Gm-Message-State: AHQUAua8PSrLNdF59l2DLAMXkbdPBryemg0L+5Y2WijB3anXiGB73anf TDWwdLQJeatjRVEdWRiBkC8= X-Google-SMTP-Source: AHgI3IaDUw4oV1vh0knZk9L5002rhVlIPGIj+Cptu+nMhf0ehJ20Tuj8Xds55Dvhem+C9O1kLwj3Og== X-Received: by 2002:a2e:6501:: with SMTP id z1mr2578849ljb.101.1550845764974; Fri, 22 Feb 2019 06:29:24 -0800 (PST) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailing-List: archive/latest/16795 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20190222142921.GA16926@mitya57.me Approved: robomod@news.nic.it Lines: 62 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 17:29:21 +0300 X-Original-Message-ID: <20190222142921.GA16926@mitya57.me> X-Original-References: <20190212191937.GB21549@belkar.wrar.name> <20190215061257.GA1574@belkar.wrar.name> <877edy6cyx.fsf@silverfish.pri> <20190221215458.GD27753@mitya57.me> <7e7f7902af946035988156deca5f900c@autistici.org> <35684f04c9d894e0d93ce7a01aecb5a8@autistici.org> Xref: csiph.com linux.debian.maint.python:11335 --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --SLDf9lqlvOQaIe6s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE8kKZ/xu8kBi5BqTLYCaTbS8ciuAFAlxwB0EACgkQYCaTbS8c iuAOMw/+IHcaVTgDUq7owdRR893xkDuHfdCDnWRfwqGC/EP7r1tG8wqeELe0+FEN e/XyH4NLCl8GLPOVR7XZDbJumFe9kNnNe8+ps2f5fKLNvPT7EBJtM1kCzTb2pvea FlZZ9fwPxmfuF0DtLUToEOKF/SD02uzNj8aG1qCC5JhAe9+rm8HAOmghM1b9jtG4 rP1yJvKNwHn06oHbaLRzzCNryATOKplRjsntHIyEuaX/Csoyj048zSE2SrRmFgu4 iaCRk+h9JsugJb3r/gUTXCHuO0LabFj/vks51xNi27oqupsdkdyelzyHehZa+NpY dTmqMf+oOcCb35HfvwFCXyQBKLk9T4q2zVhh9dF4cfawEY/7UjtnV9VgEtSBdzkq duqBXX9Tau8RAT7QZyCrSTlQcA2+xW8dDgJvTvTum5JMWr+arJ9L2SbVBsS/+f48 w5NMfD7Tcyx/YtSO5371u9IlrSaujsKc8XRiHf+Uup0kDU/n6PDivz1RL+nXiMcH hF2gQlZ1y1pUys+5TQS1sS5wm1tzJM2238NtxVLTsGiL5t+xzYjT/92g7rwNMUvH 5r3Jc3YwR4Z+SS+nBVhJPJsWCC53g7zMUfuaM1PGodKqH2KzO0sUwQW9UiqwpNg5 bPsVI2BejoXJ62U3P7mTBeHOTaXMnx5JxcOO3xpHWOt6if9aj2k= =PnqN -----END PGP SIGNATURE----- --SLDf9lqlvOQaIe6s--