Re: quilt, cdbs, dpatch, but is there even simpler ?

[Charles Plessy <charles-debian-nospam@plessy.org>]

Le Wed, Mar 21, 2007 at 10:40:26AM +0000, Jörg Sommer a écrit :
> >
> > For the moment I use dpatch, but is is a slight work overhead since it
> > is needed to convert patches to dpatches,
> 
> Are you sure, this is necessary? AFAIK the comments and shell commands
> are optional.

Hi,

I just tried to remove the dpatch header in one of my patches, and
dpatch apply does not work anymore:

sorbet【trunk】$ head debian/patches/20_fix-gcc-4.3-build
--- ./Amap.cc~  2007-03-05 11:29:54.000000000 +0000
+++ ./Amap.cc   2007-03-05 11:30:58.000000000 +0000
@@ -12,6 +12,7 @@
 #include "ProbabilisticModel.h"
 #include "EvolutionaryTree.h"
 #include "SparseMatrix.h"
+#include <climits>
 #include <string>
 #include <sstream>
 #include <iomanip>

sorbet【trunk】$ dpatch apply 20_fix-gcc-4.3-build
applying patch 20_fix-gcc-4.3-build to ./ .../home/charles/debian/packages-med/amap-align/trunk/debian/patches/20_fix-gcc-4.3-build: line 1: ---: command not found
/home/charles/debian/packages-med/amap-align/trunk/debian/patches/20_fix-gcc-4.3-build: line 2: +++: command not found
/home/charles/debian/packages-med/amap-align/trunk/debian/patches/20_fix-gcc-4.3-build: line 3: @@: command not found
/home/charles/debian/packages-med/amap-align/trunk/debian/patches/20_fix-gcc-4.3-build: line 7: syntax error near unexpected token `newline'
/home/charles/debian/packages-med/amap-align/trunk/debian/patches/20_fix-gcc-4.3-build: line 7: `+#include <climits>'
 failed.

Have a nice day,

-- 
Charles Plessy
http://charles.plessy.org
Wako, Saitama, Japan