Hi,
I uploaded an NMU of your package. This was necessary to make a FTBFS to go
away. Please find the used diff below.
Cheers,
Andi
diff -ur cadaver-0.22.2~/configure cadaver-0.22.2/configure
--- cadaver-0.22.2~/configure 2005-07-31 08:55:03.057408000 +0200
+++ cadaver-0.22.2/configure 2005-07-31 09:01:48.050839896 +0200
@@ -15652,7 +15652,7 @@
if test "$enable_warnings" = "yes"; then
case $GCC:`uname` in
yes:*)
- CFLAGS="$CFLAGS -Wall -ansi-pedantic -Wmissing-declarations -Winline
-Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
+ CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Winline -Wshadow
-Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
if test -z "$with_ssl" -o "$with_ssl" = "no"; then
# OpenSSL headers fail strict prototypes checks
CFLAGS="$CFLAGS -Wstrict-prototypes"
diff -ur cadaver-0.22.2~/debian/changelog cadaver-0.22.2/debian/changelog
--- cadaver-0.22.2~/debian/changelog 2005-07-31 08:55:03.058408000 +0200
+++ cadaver-0.22.2/debian/changelog 2005-07-31 08:57:18.310846608 +0200
@@ -1,3 +1,10 @@
+cadaver (0.22.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.0. Closes: #258559, #294290.
+
+ -- Andreas Barth <[EMAIL PROTECTED]> Sun, 31 Jul 2005 08:56:22 +0200
+
cadaver (0.22.2-1) unstable; urgency=low
* new upstream version
Nur in cadaver-0.22.2~/debian: changelog.dch.
Nur in cadaver-0.22.2~/debian: .changelog.dch.swp.
diff -ur cadaver-0.22.2~/debian/control cadaver-0.22.2/debian/control
--- cadaver-0.22.2~/debian/control 2005-07-31 08:55:03.058408000 +0200
+++ cadaver-0.22.2/debian/control 2005-07-31 09:02:08.517728456 +0200
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Bernd Eckenfels <[EMAIL PROTECTED]>
-Build-Depends: libncurses5-dev, libxml2-dev | libxml-dev, libreadline4-dev
(>=4.1), zlib1g-dev (>= 1:1.1.3), libssl-dev (>= 0.9.6f), debmake
+Build-Depends: libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev,
zlib1g-dev (>= 1:1.1.3), libssl-dev (>= 0.9.6f), debmake
Standards-Version: 3.6.1
Package: cadaver
diff -ur cadaver-0.22.2~/lib/glob.c cadaver-0.22.2/lib/glob.c
--- cadaver-0.22.2~/lib/glob.c 2002-01-26 16:48:04.000000000 +0100
+++ cadaver-0.22.2/lib/glob.c 2005-07-31 08:59:58.381512168 +0200
@@ -305,9 +305,6 @@
#include <glob.h>
static
-#if __GNUC__ - 0 >= 2
-inline
-#endif
const char *next_brace_sub __P ((const char *begin));
static int glob_in_dir __P ((const char *pattern, const char *directory,
int flags,
@@ -320,9 +317,6 @@
/* Find the end of the sub-pattern in a brace expression. We define
this as an inline function if the compiler permits. */
static
-#if __GNUC__ - 0 >= 2
-inline
-#endif
const char *
next_brace_sub (begin)
const char *begin;
diff -ur cadaver-0.22.2~/libneon/ne_locks.c cadaver-0.22.2/libneon/ne_locks.c
--- cadaver-0.22.2~/libneon/ne_locks.c 2004-04-14 16:04:21.000000000 +0200
+++ cadaver-0.22.2/libneon/ne_locks.c 2005-07-31 09:00:13.187261352 +0200
@@ -505,7 +505,7 @@
return end_element_common(lock, state, ctx->cdata->data);
}
-static inline int can_accept(int parent, int id)
+static int can_accept(int parent, int id)
{
return (parent == NE_XML_STATEROOT && id == ELM_prop) ||
(parent == ELM_prop && id == ELM_lockdiscovery) ||
diff -ur cadaver-0.22.2~/libneon/ne_request.c
cadaver-0.22.2/libneon/ne_request.c
--- cadaver-0.22.2~/libneon/ne_request.c 2003-11-13 21:39:23.000000000
+0100
+++ cadaver-0.22.2/libneon/ne_request.c 2005-07-31 09:00:31.843425184 +0200
@@ -176,7 +176,7 @@
/* Returns hash value for header 'name', converting it to lower-case
* in-place. */
-static inline unsigned int hash_and_lower(char *name)
+static unsigned int hash_and_lower(char *name)
{
char *pnt;
unsigned int hash = 0;
@@ -868,7 +868,7 @@
/* remove trailing EOL from 'buf', where strlen(buf) == *len. *len is
* adjusted in accordance with any changes made to the string to
* remain equal to strlen(buf). */
-static inline void strip_eol(char *buf, ssize_t *len)
+static void strip_eol(char *buf, ssize_t *len)
{
char *pnt = &buf[*len-1];
while (pnt >= buf && (*pnt == '\r' || *pnt == '\n')) {
diff -ur cadaver-0.22.2~/macros/neon.m4 cadaver-0.22.2/macros/neon.m4
--- cadaver-0.22.2~/macros/neon.m4 2005-07-31 08:55:03.045410000 +0200
+++ cadaver-0.22.2/macros/neon.m4 2005-07-31 09:01:24.115478624 +0200
@@ -829,7 +829,7 @@
if test "$enable_warnings" = "yes"; then
case $GCC:`uname` in
yes:*)
- CFLAGS="$CFLAGS -Wall -ansi-pedantic -Wmissing-declarations -Winline
-Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
+ CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Winline -Wshadow
-Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
if test -z "$with_ssl" -o "$with_ssl" = "no"; then
# OpenSSL headers fail strict prototypes checks
CFLAGS="$CFLAGS -Wstrict-prototypes"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
