[Pkg-gnutls-maint] libgcrypt11]

[James Westby]

On (25/06/06 15:37), Andreas Metzler wrote:
> On 2006-06-25 James Westby <jw+debian at jameswestby.net> wrote:
> > On (25/06/06 14:31), Andreas Metzler wrote:
> >> Afaict the whole package is basically unpatched:
> [...]
> >>  libgcrypt11-1.2.2-1/cipher/ac.c       |    1 -
> > [snip]
> 
> >> All changes to *.c look like this one:
>  
> >> --- libgcrypt-1.2.2-upstream/src/misc.c 2005-07-29 15:45:42.000000000 +0200
> >> +++ libgcrypt11-1.2.2-1/src/misc.c      2006-06-25 09:57:58.000000000 +0200
> >> @@ -23,7 +23,6 @@
> >>  #include <stdlib.h>
> >>  #include <string.h>
> >>  #include <stdarg.h>
> >> -#include <assert.h>
> >>  #include <unistd.h>
>  
> >> As debian/changelog does not say anything about intentionally *not*
> >> merging this upstream change I think this is a mismerge. Hmm, you have
> >> added patches/*assert*patch which include this patch.
> 
> > I think they are trivial, and it doesn't really matter whether they are
> > in or out. I kept them as I could see this was something upstream had
> > intentionally done. If you want then I will remove them all again.
> [...]
> 
> Hmm I fail to parse "as I could see this was something upstream had
> intentionally done."
> 
> Afaict (see snipped SVN logmessage) upstream intentionally *removed*
> them.

Yes, that's what I meant, upstream intentionally removed assert.h from
lots of files, so I kept the patches that did this in the debian
version. 

James

-- 
  James Westby
  jw+debian at jameswestby.net
  http://jameswestby.net/