Bug#341478: asterisk: debian/rules clean does not work

[Tzafrir Cohen]

On Mon, Dec 05, 2005 at 12:30:56AM +0100, Jérôme Warnier wrote:
> Le jeudi 01 décembre 2005 à 11:50 +0200, Tzafrir Cohen a écrit :
> > On Wed, Nov 30, 2005 at 09:14:32PM +0100, Jerome Warnier wrote:
> > > Package: asterisk
> > > Version: 1:1.2.0.dfsg-4
> > > Severity: wishlist
> > > 
> > > jwarnier at glouglou:~/debian/asterisk-1.2.0.dfsg$ debuild
> > > dpkg-buildpackage: source package is asterisk dpkg-buildpackage: source
> > > version is 1:1.2.0.dfsg-3bxlug0 dpkg-buildpackage: source maintainer is
> > > Jerome Warnier <jwarnier at beeznest.net>
> > > dpkg-buildpackage: host architecture is i386
> > >  fakeroot debian/rules clean
> > >  dpatch  deapply-all
> > >  nooptimize not applied to ./ .
> > >  nomarch not applied to ./ .
> > >  pubkey_jnctn not applied to ./ .
> > >  reverting patch 98_fpm-sounds from ./ ... failed.
> > 
> > For future bug reports with a failed applied dpatch: please provide the
> > contents of debian/patched/<patchname>.failed . It should help .
> > 
> > Anyway: a fix to the simptom: remove Makefile.rej from that patch.
> > Pleae, check your dpatches for .rej and .orig files.
> How is it that it tries to patch a .rej? Especially because this .rej
> does not exist after build.
> This must be a bug, no?
> If it is actually a bug, we should fix it.

Sorry, bad phrasing on my part.

I have replied to that message after after (or just before? I don't
remember) submitting the fix for that to the pkg-voip subversion.

The fix should be rathersimple: manually edit that dpatch file and
remove the part of it that relates to Makefile.rej. I tend to believe
that something in the lines of 

  sed -i -e '/Makefile.rej/,$d' debian/patches/Makefile.dpatch

would actually work. But I haven't tested it....

When a patch gets rejected a developer can try editing it with dpatch to 
fix it. However dpatch-edit-patch saves all the changes. And it is easy
to forget cleaning up some .rej or .orig files. 

Regards

-- 
Tzafrir Cohen     icq#16849755  +972-50-7952406
tzafrir.cohen at xorcom.com  http://www.xorcom.com