On 23 August 2018 at 17:18, Steve Langasek wrote:
| On Thu, Aug 23, 2018 at 06:53:29PM -0500, Dirk Eddelbuettel wrote:
|
| > Ok. I am being stupid.
|
| > I applied the .debdiff you sent via patch ... < ... redirection. That gets
me
| > a modified Makefile.am and two new debian/patches/ files.
|
| > But then the build command complains about Makefile.am, dpkg-source --commit
| > fails ("reversed patch") so I undo Makefile.am.
|
| > But then the build directory (I checked inside pbuilder) did not have it.
|
| > I am overcomplicating this. What should I do? For your debdiff, do I by
| > hand re-generate debian/patches/ ?
|
| Hmm, the debdiff should only be patching the contents of the debian
| directory. I would expect this to work:
|
| $ wget -O - -q
'https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=907119;filename=gsl_2.5%2Bdfsg-4ubuntu3.debdiff;msg=5'
| patch -p1
Should be the same as my patch --verbose -p1 < ...file from your mail...
| $ export QUILT_PATCHES=debian/patches
| $ quilt push -a
| $ debuild
That's different. I didn't invoke quilt. I just 'pdebuild ...'
And that is the likely source of trouble:
edd@rob:~/deb/gsl(master)$ export QUILT_PATCHES=debian/patches
edd@rob:~/deb/gsl(master)$ quilt push -a
Applying patch debian/patches/dont-disable-deprecated
patching file configure.ac
Hunk #1 FAILED at 575.
1 out of 1 hunk FAILED -- rejects in file configure.ac
Patch debian/patches/dont-disable-deprecated can be reverse-applied
edd@rob:~/deb/gsl(master)$
I had done a 'git reset --hard ...' prior to that so I was cleanly at my -4
release. I think you patch does not apply well.
Shall I punt and do it by hand?
Dirk
--
http://dirk.eddelbuettel.com | @eddelbuettel | e...@debian.org
