> Il Domenica 3 Agosto 2014 2:33, Vincent Cheng <vch...@debian.org> ha scritto:
> > Hi Gianfranco,
Hi dear Vincent and Colin
since the upload is already in deferred I don't think there is much here rather
than finding what breaked your patch.
>
> Your proposed debdiff doesn't seem to apply cleanly (did you actually
> test it?)...
>
Yes, as usual I triple tested it, on my system (old curl), on utopic pbuilder
and on sid pbuilder (both new curl)
> dpkg-source: info: using source format `3.0 (quilt)'
> dpkg-source: info: building gridsite using existing
> ./gridsite_2.0.4.orig.tar.gz
> patching file src/htcp.c
> Hunk #1 FAILED at 59.
> 1 out of 1 hunk FAILED
> dpkg-source: info: fuzz is not allowed when applying patches
> dpkg-source: info: if patch 'curl-defines.patch' is correctly applied
> by quilt, use 'quilt refresh' to update it
> dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E
> -b -B .pc/curl-defines.patch/ --reject-file=- <
> gridsite-2.0.4.orig.cAX2KS/debian/patches/curl-defines.patch gave
> error exit status 1
> dpkg-buildpackage: error: dpkg-source -b gridsite-2.0.4 gave error exit
> status 2
>
patch -p1 < ../debdiff
patching file debian/changelog
patching file debian/patches/curl-defines.patch
patching file debian/patches/series
http://mentors.debian.net/package/gridsite
I see, the copy-pasted stripped the "tab"
+ #define HTCP_GET 1
+ #define HTCP_PUT 2
+ #define HTCP_DELETE 3
+ #define HTCP_GET 1
+ #define HTCP_PUT 2
+ #define HTCP_DELETE 3
maybe next time I'll send the patch as attachment, to avoid this kind of
problems
> Aside from that, I have to say that I prefer Colin's proposed debdiff
> rather than yours; testing for older versions of curl rather than just
> getting rid of legacy code is the right approach and makes it easier
> to backport this package if desired.
>
I have _nothing_ against Colin's approach (we already discussed it a little on
irc).
But look at the define
++#if (LIBCURL_VERSION_NUM < 0x070907)
do you want to really to backport this package to a system with a curl packaged
in 2002???
curl (7.9.7-1) unstable; urgency=low
Wed, 15 May 2002 21:09:19 +0200
oldstable has already 7.21, so I don't see the point in maintaining such code,
moreover because upstream
just dropped it completely.
So if you want to go with this approach is fine for me, since ubuntu already
took the patch.
But I still think that having an upstream commit cherry-picked (alrady used by
fedora people) can help in maintaining the code
https://github.com/CESNET/gridsite/commit/2124d471f9fc1eed4bf5893ed2701350357c01af
http://pkgs.fedoraproject.org/cgit/gridsite.git/tree/curl-opts.patch
Have a nice day!
Just my .02$
Gianfranco
> Regards,
> Vincent
>
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
