tag 593049 + patch thanks I've tidied up the patch and added some needed clean rules for debian/rules to make the patch itself clean.
All that's needed now is for someone to tell me that the patched package actually works - or what kind of hardware is needed to test it. -- Neil Williams ============= http://www.linux.codehelp.co.uk/
diff -u osso-gwconnect-1.0.12.debian/debian/changelog osso-gwconnect-1.0.12.debian/debian/changelog
--- osso-gwconnect-1.0.12.debian/debian/changelog
+++ osso-gwconnect-1.0.12.debian/debian/changelog
@@ -1,3 +1,11 @@
+osso-gwconnect (1.0.12.debian-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace AX_CFLAGS_GCC_OPTION with explicit control over
+ CFLAGS warnings. (Closes: #593049)
+
+ -- Neil Williams <codeh...@debian.org> Fri, 17 Dec 2010 19:22:07 +0000
+
osso-gwconnect (1.0.12.debian-2) unstable; urgency=low
* debian/gbp.conf: Added.
diff -u osso-gwconnect-1.0.12.debian/debian/rules osso-gwconnect-1.0.12.debian/debian/rules
--- osso-gwconnect-1.0.12.debian/debian/rules
+++ osso-gwconnect-1.0.12.debian/debian/rules
@@ -44,6 +44,8 @@
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) clean
[ ! -f Makefile ] || $(MAKE) distclean
+ $(RM) aclocal.m4 config.h.in configure depcomp install-sh missing
+ $(RM) Makefile Makefile.in etc/Makefile.in src/Makefile.in
dh_clean
install: build
only in patch2:
unchanged:
--- osso-gwconnect-1.0.12.debian.orig/configure.ac
+++ osso-gwconnect-1.0.12.debian/configure.ac
@@ -9,21 +9,13 @@
AC_ISC_POSIX
AC_HEADER_STDC
-AX_CFLAGS_GCC_OPTION(-std=c99)
-#AX_CFLAGS_GCC_OPTION(-pedantic)
-AX_CFLAGS_GCC_OPTION(-Wall)
-# AX_CFLAGS_GCC_OPTION(-Werror)
-AX_CFLAGS_GCC_OPTION(-Wmissing-prototypes)
-AX_CFLAGS_GCC_OPTION(-Wmissing-declarations)
-AX_CFLAGS_GCC_OPTION(-Wwrite-strings)
-AX_CFLAGS_GCC_OPTION(-Wshadow)
-AX_CFLAGS_GCC_OPTION(-Wformat-security)
-AX_CFLAGS_GCC_OPTION(-Wformat=2)
-AX_CFLAGS_GCC_OPTION(-Waggregate-return)
-AX_CFLAGS_GCC_OPTION(-Wbad-function-cast)
-AX_CFLAGS_GCC_OPTION(-Wpointer-arith)
-AX_CFLAGS_GCC_OPTION(-Wundef)
-AX_CFLAGS_GCC_OPTION(-Wchar-subscripts)
+dnl # ******************************
+dnl # Defaults for GCC
+dnl # ******************************
+if test "x$GCC" = "xyes"; then
+ CFLAGS=${CFLAGS:-"-g2 -Wall"}
+ CXXFLAGS=${CXXFLAGS:-"-g2 -Wall"}
+fi
AC_ARG_ENABLE(docs, [ --enable-docs Build DOXYGEN documentation (requires Doxygen)],enable_docs=$enableval,enable_docs=auto)
AC_ARG_ENABLE(ossolog, [ --enable-ossolog Enable osso-log support],enable_ossolog=$enableval,enable_ossolog=no)
@@ -119,7 +111,7 @@
DBUS_SYS_DIR="$SYSCONFDIR/dbus-1/system.d"
fi
AC_SUBST(DBUS_SYS_DIR)
-
+CFLAGS="${CFLAGS} -Wmissing-prototypes -Wmissing-declarations -Wwrite-strings -Wshadow -Wformat-security -Wformat=2 -Waggregate-return -Wbad-function-cast -Wpointer-arith -Wundef -Wchar-subscripts -std=c99"
AC_CONFIG_FILES([
Makefile
gwconnect.pc
pgpSjOXLtuyF8.pgp
Description: PGP signature
