reopen 696858
retitle 696858 "use correct QUILT_PATCH_OPTS syntax"
thanks

Hi,

I think there is some confusion here.  I mean that this bug #696858
report by george seems to contain serious error and uploaded fix of
merely dropping QUILT_PATCH_OPTS is not right. Please correct script to
use my script in my original bug report.
  
http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=20;filename=deb3;att=1;bug=581186

Let me remind that the correct QUILT_PATCH_OPTS syntax situation:
 * lenny  old quilt: QUILT_PATCH_OPTS="--unified-reject-files"
 * wheezy new quilt: QUILT_PATCH_OPTS="--reject-format=unified"

I had 2 scripts submitted using both syntaxes because of this.  So I
know there were some changes happened and I addressed them already in my
bug #581186 report properly.
  older script:   
http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;filename=deb3;att=1;bug=581186
  updated script: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=20;filename=deb3;att=1;bug=581186

As for the quilt QUILT_PATCH_OPTS and patch syntax situation, I copy key
references here as follows just for the double-check of reality.

Current quilt (0.60-5) manpage goes:

|    QUILT_PATCH_OPTS
| 
|        Additional options that quilt shall pass to GNU patch when applying
|        patches.  For example, recent versions of  GNU  patch  support  the
|        "--reject-format=unified"  option  for  generating  reject files in
|        unified diff style (older patch  versions  used  "--unified-reject-
|        files" for that).

Current patch (2.6.1-3) manpage goes:

|    --reject-format=format
|       Produce reject files in the specified format (either context or uni‐
|       fied).  Without this option, rejected hunks come out in unified diff
|       format  if the input patch was of that format, otherwise in ordinary
|       context diff form.

The changelog of patch goes:

| patch (2.6.1-1) unstable; urgency=low
| 
|   * New upstream version.
|     + Improved CR stripping heuristics. Closes: #484539
|     + Fixes: creates files and directories instead of asking for the file
|       location. Closes: #568248
|   * Remove lenny compatibility options -U --unified-reject-files and
|    --global-reject-file.
|   * Null update-version.sh file so it doesn't interfere with the git
|     repository the package is hosted in.
| 
|  -- Christoph Berg <m...@debian.org>  Sun, 06 Feb 2011 20:19:30 +0100

If I am missing something, let me know.  

Regards,

Osamu

Attachment: signature.asc
Description: Digital signature

Reply via email to