found 624167 1.6.0-2.1
found 624167 axis2c/1.6.0-2.2
tags 624167 + patch
quit
Hi Aron,
Aron Xu wrote:
> The proposed patch was applied in 1.6.0-2.1
Are you sure?
---
debian/changelog | 9 ++
debian/control | 2 +-
debian/rules | 7 +-
configure.ac | 15 +++-
axiom/configure.ac | 15 +++-
neethi/configure.ac | 15 +++-
util/configure.ac | 15 +++-
debian/patches/01-configure-disable-werror.patch | 133 ++++++++++++++++++++++
debian/patches/series | 1 +
9 files changed, 202 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c6699f8a..6fd99ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+axis2c (1.6.0-2.3) local; urgency=low
+
+ * Do not use patchsys-quilt. dpkg-source takes care of
+ applying patches.
+ * Disable -Werror (Closes: #624167)
+ * Use dh-autoreconf to run autotools at build time
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Thu, 12 Jan 2012 13:46:58 -0600
+
axis2c (1.6.0-2.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index f2ae4725..9c9973d9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Daniel Nurmi <nu...@eucalyptus.com>,
Chris Grzegorczyk <g...@eucalyptus.com>,
Thierry Carrez <thierry.car...@ubuntu.com>,
Soren Hansen <so...@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libapr1-dev,
apache2-threaded-dev, zlib1g-dev, libssl-dev, quilt
+Build-Depends: cdbs, debhelper (>= 7), dh-autoreconf, pkg-config, libapr1-dev,
apache2-threaded-dev, zlib1g-dev, libssl-dev, quilt
Standards-Version: 3.9.2
Homepage: http://ws.apache.org/axis2/c/
diff --git a/debian/rules b/debian/rules
index a5477b52..1a52fcec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_CONFIGURE_PREFIX:=/usr/lib/axis2
-DEB_CONFIGURE_EXTRA_FLAGS := --with-apache2=/usr/include/apache2
--with-apr=/usr/include/apr-1.0 --enable-openssl --enable-multi-thread=no
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-werror
--with-apache2=/usr/include/apache2 --with-apr=/usr/include/apr-1.0
--enable-openssl --enable-multi-thread=no
DEB_CONFIGURE_EXTRA_FLAGS += --enable-tests
DEB_MAKE_CHECK_TARGET := check
@@ -25,6 +24,4 @@ binary-install/libapache2-mod-axis2c::
sed -i -e "s/\(libdir=.*\)axis2/\1apache2/g" -e "/dependency_libs/
s/'.*'/''/"
debian/$(cdbs_curpkg)/usr/lib/apache2/modules/logging/libaxis2_mod_log.la
clean::
- find . -name Makefile -print0 | xargs -0 rm || /bin/true
chmod 755 tools/codegen/javatool/WSDL2C.sh
-
diff --git a/configure.ac b/configure.ac
index e85c9bc4..527b7805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,11 +63,24 @@ fi
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g
-D_GNU_SOURCE"
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -g
-D_GNU_SOURCE"
# CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
fi
LDFLAGS="$LDFLAGS -lpthread"
+AC_MSG_CHECKING(whether to set -Werror)
+AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as
errors during build],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -Werror"
+ ;;
+ esac ],
+)
+
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
diff --git a/axiom/configure.ac b/axiom/configure.ac
index a7e50b8f..1c10401f 100644
--- a/axiom/configure.ac
+++ b/axiom/configure.ac
@@ -49,11 +49,24 @@ AC_CHECK_LIB(z, inflate)
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE
-Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Werror -Wall -Wno-implicit-function-declaration "
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration "
fi
LDFLAGS="$LDFLAGS -lpthread"
+AC_MSG_CHECKING(whether to set -Werror)
+AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as errors
during build],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -Werror"
+ ;;
+ esac ],
+)
+
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
diff --git a/neethi/configure.ac b/neethi/configure.ac
index 4d70b47e..d3439431 100644
--- a/neethi/configure.ac
+++ b/neethi/configure.ac
@@ -34,11 +34,24 @@ AC_CHECK_LIB(dl, dlopen)
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE
-Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration "
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration "
fi
LDFLAGS="$LDFLAGS -lpthread"
+AC_MSG_CHECKING(whether to set -Werror)
+AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as
errors during build],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -Werror"
+ ;;
+ esac ],
+)
+
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
diff --git a/util/configure.ac b/util/configure.ac
index ab034dff..868a8ef2 100644
--- a/util/configure.ac
+++ b/util/configure.ac
@@ -55,10 +55,23 @@ AC_CHECK_LIB(compat, ftime)
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE
-Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration
-D_GNU_SOURCE"
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration
-D_GNU_SOURCE"
fi
LDFLAGS="$LDFLAGS -lpthread"
+AC_MSG_CHECKING(whether to set -Werror)
+AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as errors
during build],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -Werror"
+ ;;
+ esac ],
+)
+
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
diff --git a/debian/patches/01-configure-disable-werror.patch
b/debian/patches/01-configure-disable-werror.patch
new file mode 100644
index 00000000..73783c9c
--- /dev/null
+++ b/debian/patches/01-configure-disable-werror.patch
@@ -0,0 +1,133 @@
+From: Jonathan Nieder <jrnie...@gmail.com>
+Date: Thu, 12 Jan 2012 15:46:43 -0600
+Subject: configure: introduce a --disable-werror switch
+
+---
+ configure.ac | 15 ++++++++++++++-
+ axiom/configure.ac | 15 ++++++++++++++-
+ neethi/configure.ac | 15 ++++++++++++++-
+ util/configure.ac | 15 ++++++++++++++-
+ 4 files changed, 56 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e85c9bc4..527b7805 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,11 +63,24 @@ fi
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+ if test "$GCC" = "yes"; then
+- CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g
-D_GNU_SOURCE"
++ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -g
-D_GNU_SOURCE"
+ # CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
+ fi
+ LDFLAGS="$LDFLAGS -lpthread"
+
++AC_MSG_CHECKING(whether to set -Werror)
++AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as
errors during build],
++[ case "${enableval}" in
++ no)
++ AC_MSG_RESULT(no)
++ ;;
++ *)
++ AC_MSG_RESULT(yes)
++ CFLAGS="$CFLAGS -Werror"
++ ;;
++ esac ],
++)
++
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
+diff --git a/axiom/configure.ac b/axiom/configure.ac
+index a7e50b8f..1c10401f 100644
+--- a/axiom/configure.ac
++++ b/axiom/configure.ac
+@@ -49,11 +49,24 @@ AC_CHECK_LIB(z, inflate)
+ #CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE
-Wno-implicit-function-declaration"
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+ if test "$GCC" = "yes"; then
+- CFLAGS="$CFLAGS -ansi -Werror -Wall -Wno-implicit-function-declaration "
++ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration "
+ fi
+
+ LDFLAGS="$LDFLAGS -lpthread"
+
++AC_MSG_CHECKING(whether to set -Werror)
++AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as errors
during build],
++[ case "${enableval}" in
++ no)
++ AC_MSG_RESULT(no)
++ ;;
++ *)
++ AC_MSG_RESULT(yes)
++ CFLAGS="$CFLAGS -Werror"
++ ;;
++ esac ],
++)
++
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
+diff --git a/neethi/configure.ac b/neethi/configure.ac
+index 4d70b47e..d3439431 100644
+--- a/neethi/configure.ac
++++ b/neethi/configure.ac
+@@ -34,11 +34,24 @@ AC_CHECK_LIB(dl, dlopen)
+ #CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE
-Wno-implicit-function-declaration"
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+ if test "$GCC" = "yes"; then
+- CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration "
++ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration "
+ fi
+
+ LDFLAGS="$LDFLAGS -lpthread"
+
++AC_MSG_CHECKING(whether to set -Werror)
++AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as
errors during build],
++[ case "${enableval}" in
++ no)
++ AC_MSG_RESULT(no)
++ ;;
++ *)
++ AC_MSG_RESULT(yes)
++ CFLAGS="$CFLAGS -Werror"
++ ;;
++ esac ],
++)
++
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
+diff --git a/util/configure.ac b/util/configure.ac
+index ab034dff..868a8ef2 100644
+--- a/util/configure.ac
++++ b/util/configure.ac
+@@ -55,10 +55,23 @@ AC_CHECK_LIB(compat, ftime)
+ #CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE
-Wno-implicit-function-declaration"
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+ if test "$GCC" = "yes"; then
+- CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration
-D_GNU_SOURCE"
++ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration
-D_GNU_SOURCE"
+ fi
+ LDFLAGS="$LDFLAGS -lpthread"
+
++AC_MSG_CHECKING(whether to set -Werror)
++AC_ARG_ENABLE(werror, [ --disable-werror do not treat warnings as
errors during build],
++[ case "${enableval}" in
++ no)
++ AC_MSG_RESULT(no)
++ ;;
++ *)
++ AC_MSG_RESULT(yes)
++ CFLAGS="$CFLAGS -Werror"
++ ;;
++ esac ],
++)
++
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
+--
+1.7.8.3
+
diff --git a/debian/patches/series b/debian/patches/series
index e02221f5..1c4a57cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01-configure-disable-werror.patch
02_fix_doc_dir.patch
03_enable-security.patch
04_fix_testsuite.patch
--
1.7.8.3
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
