Re: [Quilt-dev] 0.50 in Debian + Simple patch for inclusion: Fix manpage generation under dash

[Martin Quinson]

FYI, I just commited this. Other info: 0.50 is now in the testing
version of debian, and thus rather extensively tested by all debian
developers at the very least. So far, no problem to report.

Thanks for your good work, and happy new year.
Mt.

On Fri, Dec 23, 2011 at 04:23:19PM +0100, Martin Quinson wrote:
> Hello,
> 
> Raphaël packaged 0.50 for Debian a few days ago, and so far it all
> goes rather well. Only some glitches against the packaging itself were
> reported, nothing against the code.
> 
> Also, now that we are on par with upstream code, we'd like to reduce a
> bit the amount of patches that we have in the package. For the record,
> our series file contains 16 patches, several of them being rather
> simple. I'm proposing a first one, in attachement. If nobody complains
> in the next few days, I'll commit it myself before proceeding to the
> next patch.
> 
> It may seem like a noisy way of integrating our stuff, but I prefer to
> play safe with quilt. It's heavily used and I feel my technical limits
> here. So, sorry for the noise, but that's how I'll do it. If you
> prefer, the whole patch serie is available here:
> http://git.debian.org/?p=collab-maint/quilt.git
> 
> Thanks, and happy chrismas,
> Mt.
> 
> -- 
> Thou shalt foreswear, renounce, and abjure the vile heresy which claimeth
> that ``All the world's a 386'', and have no commerce with the benighted
> heathens who cling to this barbarous belief, that the days of thy program
> may be long even though the days of thy current machine be short.
>   -- Tenth commandment of the C programmer

> Description: Fix auto-generation of quilt.1 to work with dash
>  The echo command of dash interprets \f as a special characer and
>  thus generates a bad manual page. bash's echo leaves them unchanged
>  (it needs -e to replace those special characters). Using printf
>  instead is a portable solution that work with both shells.
>  .
>  The code also uses a bashism ($'') but it's not really needed with
>  GNU sed at least (it understands \t and \n) so drop it and avoid some
>  painful double escaping.
>  .
>  This patch should be sent upstream.
> Author: Raphaël Hertzog <address@hidden>
> Forwarded: 111223 to upstream mailing list by Martin Quinson
> Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/quilt/+bug/402237
> Bug-Debian: http://bugs.debian.org/563517
> 
> ---
>  Makefile.in |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -196,7 +196,7 @@ doc/README : doc/README.in $(QUILT:%=qui
>                       $(MAKE) -s reference                            \
>                       ;;                                              \
>               *)                                                      \
> -                     echo $$line                                     \
> +                     printf "%s\n" "$$line"                          \
>                       ;;                                              \
>               esac ;                                                  \
>       done 2>&1 < $< > $@
> @@ -208,11 +208,11 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=qu
>         '@REFERENCE''@')                                              \
>           $(MAKE) -s reference |                                      \
>           $(SED) -e 's/^quilt \([^ ]*\)\(.*\)/.IP "\\fB\1\\fP\2 " 4/' \
> -                -e $$'s/^  \\(-[^\t]*\\)\t\\?/.IP "    \\1" 8\\\n/'  \
> -                -e $$'s/^  \t\\?//'                                  \
> +                -e 's/^  \(-[^\t]*\)\t\?/.IP "    \1" 8\n/'          \
> +                -e 's/^  \t\?//'                                     \
>           ;;                                                          \
>         *)                                                            \
> -         echo "$$line"                                               \
> +         printf "%s\n" "$$line"                                      \
>           ;;                                                          \
>         esac;                                                         \
>       done < $< 2>&1 > $@

> _______________________________________________
> Quilt-dev mailing list
> address@hidden
> https://lists.nongnu.org/mailman/listinfo/quilt-dev


--