Re: upstream release of unreleased package

2019-02-22 Thread Dmitry Shachnev
On Fri, Feb 22, 2019 at 07:13:28PM +, llu...@autistici.org wrote: > Ok. These are the commands I would use: > > $ gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git > $ cd visualequation/ > (debian/master)]$ git revert HEAD > [debian/master 7cc491f] Revert "Adding

Re: upstream release of unreleased package

2019-02-22 Thread lluvia
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.

Re: upstream release of unreleased package

2019-02-22 Thread Dmitry Shachnev
Hi, On Fri, Feb 22, 2019 at 12:54:22AM +, llu...@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 >

Re: upstream release of unreleased package

2019-02-21 Thread lluvia
Hello, 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

Re: upstream release of unreleased package

2019-02-21 Thread lluvia
Hi Dmitry, On 2019-02-21 21:54, Dmitry Shachnev wrote: And I cannot reproduce the failure that you are getting later. Does this mean you are using git-buildpackage older than 0.8.0? Yes, it was older. With 0.8.12.2 I success. Thanks a lot for solving the mystery, I will use version 0.8.12.2

Re: upstream release of unreleased package

2019-02-21 Thread Dmitry Shachnev
Hi Daniel, On Thu, Feb 21, 2019 at 09:15:59PM +, llu...@autistici.org wrote: > I paste below a (reproducible) log of what I did. Maybe you can show me what > I did wrong this time so I am not able to build package for 0.3.8. > > [...] > $ gbp buildpackage --git-tag-only > gbp:info: Tagging

Re: upstream release of unreleased package

2019-02-21 Thread lluvia
Hello, I continue trying to fix issue. In a clean directory, I tried to follow all the steps from https://wiki.debian.org/Python/GitPackaging without git-pushing to see if I was able to understand better what I did bad last time. I followed the sections "Creating new repositories" using

Re: upstream release of unreleased package

2019-02-17 Thread lluvia
On 2019-02-17 08:22, Brian May wrote: "for a new upstream release of the unreleased" - has it been released upstream or not? Yes, it has been released. You can find it here https://github.com/daniel-molina/visualequation/releases/tag/0.3.8 uscan can access and download it. When I said that

Re: upstream release of unreleased package

2019-02-17 Thread Brian May
Andrey Rahmatullin writes: > No, you should not add the new upstream version as a patch. Especially as > you already have the tarball imported. What is the repo missing is merging > upstream/0.3.8 into the master branch. If you imported the tarball with > gbp import-orig it would have happened

Re: upstream release of unreleased package

2019-02-14 Thread Andrey Rahmatullin
On Thu, Feb 14, 2019 at 09:43:19PM +, llu...@autistici.org wrote: > I changed the strategy to git revert and now I am able to build the package > with the following commands: > > gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git > cd visualequation/ > uscan > git

Re: upstream release of unreleased package

2019-02-14 Thread lluvia
I changed the strategy to git revert and now I am able to build the package with the following commands: Sorry, I did not notice that the patches were not applied. :( Help welcome. Daniel

Re: upstream release of unreleased package

2019-02-14 Thread lluvia
On 2019-02-12 19:19, Andrey Rahmatullin wrote: I have no idea about gbp-pq but I guess resetting just master is not enough to fix that repo. Please also note that force pushes are bad and deleting tags in published repos doesn't really work so please don't do that, especially when the problem

Re: upstream release of unreleased package

2019-02-12 Thread Andrey Rahmatullin
I have no idea about gbp-pq but I guess resetting just master is not enough to fix that repo. Please also note that force pushes are bad and deleting tags in published repos doesn't really work so please don't do that, especially when the problem is mainly with the unpublished pq branch and some

Re: upstream release of unreleased package

2019-02-11 Thread daniel
On 10/2/19 21:37, Brian May wrote: This is your first error. Changes to debian/* files belong to the debian/master branch, not the patch-queue/debian/master branch. So you should be finalise the changes to the patch-queue first, then run something like "gbp pq export" which will switch back the

Re: upstream release of unreleased package

2019-02-10 Thread Brian May
llu...@autistici.org writes: > lluvia@technoethical:~/debian/visualequation$ git commit -m "modifying > d/changelog for new upstream release" > [patch-queue/debian/master 70ae5b1] modifying d/changelog for new > upstream release > 1 file changed, 3 insertions(+), 2 deletions(-) This is your

Re: upstream release of unreleased package

2019-02-10 Thread lluvia
Il 2019-02-10 13:30 Andrey Rahmatullin ha scritto: Both your patches look very wrong. How did you make them? The patch patching debian/changelog looks especially wrong. I used "dch -v 0.3.8-1" for the debian/changelog and added a line. Since previous version 0.3.7-1 was unreleased it didn't

Re: upstream release of unreleased package

2019-02-10 Thread Andrey Rahmatullin
Both your patches look very wrong. How did you make them? The patch patching debian/changelog looks especially wrong. -- WBR, wRAR signature.asc Description: PGP signature

Re: upstream release of unreleased package

2019-02-10 Thread lluvia
Il 2019-02-10 01:24 Brian May ha scritto: llu...@autistici.org writes: Then, I did git push. It was correct? What should I do next? The output (see below) suggest to create a merge request. Thanks in advance. Ignore that. That is just the git server providing helpful information that isn't

Re: upstream release of unreleased package

2019-02-09 Thread Brian May
llu...@autistici.org writes: > Then, I did git push. It was correct? What should I do next? The output > (see below) suggest to create a merge request. > Thanks in advance. Ignore that. That is just the git server providing helpful information that isn't really appropriate here. -- Brian May

upstream release of unreleased package

2019-02-09 Thread lluvia
Dear all, I followed the steps indicated in https://wiki.debian.org/Python/GitPackaging for a new upstream release of the unreleased https://salsa.debian.org/python-team/applications/visualequation My intention is to check that this new version can be packaged correctly and then ask for