[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)



On Thursday, September 04, 2014 16:05:53 Scott Kitterman wrote:
> On Thursday, September 04, 2014 15:40:42 Barry Warsaw wrote:
> > That gets you a source package, but the binary package FTBFS because one
> > additional test cannot be run during the build process (there's a DEP-8
> > test for full coverage).  Now though, you *must* commit or stash the
> > d/changelog change.
> > 
> > Here's where things get a little frustrating.  What I need to do is patch
> > a
> > file to add a line that skips a test.  I'd like to append that to the
> > 0003-
> > patch but it's not the top of the quilt stack (there's an 0004- patch). 
> > But this doesn't seem possible, and `git-dpm apply-patch` doesn't seem to
> > do this. Besides, it's very inconvenient to name the full d/p/*.patch
> > file you want to apply.  What I really want is the equivalent of `quilt
> > push`.
> > 
> > The best it seems you can do is:
> > 
> > $ git-dpm checkout-patched
> > <hack, git commit>
> > $ git-dpm update-patches
> > 
> > The file is patched, but now I have an d/p/0005- file instead of a
> > modified
> > 0003- patch file.  Sigh.
> 
> I did already run into this with pkg-clamav.  See the patch in
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754052  for one way to do
> it.
> 
> Scott K

Actually, nevermind.  That's not the problem you were trying to solve, 
although you could remove the patch as described and then apply the updated 
patch at the end of the series.

Scott K

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: