Re: Git, gbp blues

2019-09-08 Thread Dmitry Shachnev
On Sat, Sep 07, 2019 at 11:57:42PM +0200, Guðjón Guðjónsson wrote: > Hi again > > One more question. > If I have updated the sources with uscan and when running lintian I > find out that > there is an unwanted file in the upstream sources. > > How can I remove the file from the upstream tarball aft

Re: Git, gbp blues

2019-09-08 Thread Dmitry Shachnev
Hi Guðjón, On Sat, Sep 07, 2019 at 08:44:53AM +0200, Guðjón Guðjónsson wrote: > I am now working on my gspiceui package (which is in fact not a python > package) > But the master branch is just master, not debian/master > > Here debian/master is preferred > https://wiki.debian.org/Python/GitPackag

Re: Git, gbp blues

2019-09-07 Thread Guðjón Guðjónsson
Hi again One more question. If I have updated the sources with uscan and when running lintian I find out that there is an unwanted file in the upstream sources. How can I remove the file from the upstream tarball after it has been imported into upstream and pristine-tar? Regards Gudjon

Re: Git, gbp blues

2019-09-06 Thread Guðjón Guðjónsson
Hi Thanks for the suggestions. I will try my best. I am now working on my gspiceui package (which is in fact not a python package) But the master branch is just master, not debian/master Here debian/master is preferred https://wiki.debian.org/Python/GitPackaging But in this page the branch name

Re: Git, gbp blues

2019-08-26 Thread Dmitry Shachnev
On Mon, Aug 26, 2019 at 11:18:33AM +0200, Raphael Hertzog wrote: > Instead you should use "gbp pq import --time-machine=X" where X is the > number of commits that you accept to go backwards to try to find a point > where the patch series can be applied. > > Then you are on your branch, ready for a

Re: Git, gbp blues

2019-08-26 Thread Raphael Hertzog
On Sun, 25 Aug 2019, Dmitry Shachnev wrote: > The correct procedure is running “gbp pq import” *before* importing a new > tarball. Then after importing you do “gbp pq rebase”. > > Sometimes I myself forget to run “gbp pq import”. In this case I do the > following: Instead you should use "gbp pq i

Re: Git, gbp blues

2019-08-25 Thread Andrey Rahmatullin
On Mon, Aug 26, 2019 at 08:20:13AM +0200, Guðjón Guðjónsson wrote: > > The correct procedure is running “gbp pq import” *before* importing a new > > tarball. Then after importing you do “gbp pq rebase”. > In fact I did do that. Then you would get an error message when trying to do that second time.

Re: Git, gbp blues

2019-08-25 Thread Guðjón Guðjónsson
Hi Dmitry and Anrdrey On Sun, Aug 25, 2019 at 10:19 PM Dmitry Shachnev wrote: > The correct procedure is running “gbp pq import” *before* importing a new > tarball. Then after importing you do “gbp pq rebase”. In fact I did do that. > > Sometimes I myself forget to run “gbp pq import”. In this ca

Re: Git, gbp blues

2019-08-25 Thread Dmitry Shachnev
Hi Guðjón! On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote: > I did follow the procedure but I don't know what to do if a patch > doesn't apply cleanly. > I did try > gbp pq import > gbp:info: Trying to apply patches at > 'c72f39a3a32b5e5c1eb7f9aaf7176e942e85d804' > gbp:warning:

Re: Git, gbp blues

2019-08-25 Thread Andrey Rahmatullin
On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote: > > > Isn't this an error. Shouldn't it be git checkout? > > > $ gbp checkout debian/master > > Yes. > You mean it should be git checkout? Yes. > > If you ran gbp pq import after importing the new tarball and it didn't say > > "Pat

Re: Git, gbp blues

2019-08-25 Thread Guðjón Guðjónsson
Hi Andrey Thanks for the answer. On Sun, Aug 25, 2019 at 9:50 PM Andrey Rahmatullin wrote: > > Isn't this an error. Shouldn't it be git checkout? > > $ gbp checkout debian/master > Yes. You mean it should be git checkout? > > If you ran gbp pq import after importing the new tarball and it didn't

Re: Git, gbp blues

2019-08-25 Thread Andrey Rahmatullin
On Sun, Aug 25, 2019 at 09:40:16PM +0200, Guðjón Guðjónsson wrote: > Isn't this an error. Shouldn't it be git checkout? > $ gbp checkout debian/master Yes. > But I still find working with patch queues difficult especially with > new upstream where the old patches don't apply correctly. > I tried t

Git, gbp blues

2019-08-25 Thread Guðjón Guðjónsson
Hi list I'm sorry to say but I am no friend of git for Debian packaging but I am a big wannabe. This page has been very helpful: https://wiki.debian.org/Python/GitPackaging It says $ gbp pq import which has more or less solved my problems when trying to upgrade a package. Isn't this an error. Sh