Bug#670805: dpkg: patch apply problem: line after --- isn't as expected in diff
On 2012-04-29 09:42, Raphael Hertzog wrote: | Refresh your patch with quilt to transform it into a unified diff. Ok. | There's already a bug about this, merging them. But it's unlikely to be | supported any time soon. Even if no support is added soon, could you add a simple check for these type of patches and write message: "Probably context, but need unified diff: Use quilt refresh to convert." Thanks, Jari -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#670805: dpkg: patch apply problem: line after --- isn't as expected in diff
reassign 670805 dpkg-dev forcemerge 485330 670805 thanks On Sun, 29 Apr 2012, Jari Aalto wrote: > These patches work fine with quilt(1) and patch(1). Any patch that "patch" can apply will be automatically supported by quilt. But "3.0 (quilt)" requires "unified patch" and what you attached is a "context patch" (generated with "diff -c") There's already a bug about this, merging them. But it's unlikely to be supported any time soon. Refresh your patch with quilt to transform it into a unified diff. Cheers, -- Raphaël Hertzog ◈ Debian Developer Pre-order a copy of the Debian Administrator's Handbook and help liberate it: http://debian-handbook.info/liberation/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#670805: dpkg: patch apply problem: line after --- isn't as expected in diff
Package: dpkg Version: 1.16.3 Severity: normal Error message: dpkg-source: error: line after --- isn't as expected in diff `readline5.git/debian/patches/02-rl-001.patch' (line 27) For patches: 25 *** ../readline-5.2/display.c Thu Sep 14 14:20:12 2006 26 --- ./display.c Mon Nov 13 17:55:57 2006 27 *** 28 *** 2381,2384 29 --- 2409,2414 30 if (end <= start) These patches work fine with quilt(1) and patch(1). From: Matthias Klose Subject: In some cases, code that is intended to be used in the presence of multibyte characters is called when no such characters are present, leading to incorrect display position calculations and incorrect redisplay. . READLINE PATCH REPORT = . Readline-Release: 5.2 Patch-ID: readline52-001 . Bug-Reported-by: e...@byu.net Bug-Reference-ID: <45540862.9030...@byu.net> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html . Bug-Description: . In some cases, code that is intended to be used in the presence of multibyte characters is called when no such characters are present, leading to incorrect display position calculations and incorrect redisplay. *** ../readline-5.2/display.c Thu Sep 14 14:20:12 2006 --- ./display.c Mon Nov 13 17:55:57 2006 *** *** 2381,2384 --- 2409,2414 if (end <= start) return 0; + if (MB_CUR_MAX == 1 || rl_byte_oriented) + return (end - start); memset (&ps, 0, sizeof (mbstate_t));
