diff -u mysql-5.1-5.1.48/debian/changelog mysql-5.1-5.1.48/debian/changelog
--- mysql-5.1-5.1.48/debian/changelog
+++ mysql-5.1-5.1.48/debian/changelog
@@ -1,3 +1,10 @@
+mysql-5.1 (5.1.48-1ubuntu2) maverick; urgency=low
+
+  * New patch 60_abi-check-includ; fix build failure in abi_check with newer
+    GCCs which will exit with failure when an #include can't be found.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Wed, 14 Jul 2010 00:13:00 +0200
+
 mysql-5.1 (5.1.48-1ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable, remaining changes:
diff -u mysql-5.1-5.1.48/debian/patches/00list mysql-5.1-5.1.48/debian/patches/00list
--- mysql-5.1-5.1.48/debian/patches/00list
+++ mysql-5.1-5.1.48/debian/patches/00list
@@ -9,0 +10 @@
+60_abi-check-include.dpatch
only in patch2:
unchanged:
--- mysql-5.1-5.1.48.orig/debian/patches/60_abi-check-include.dpatch
+++ mysql-5.1-5.1.48/debian/patches/60_abi-check-include.dpatch
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_abi-check-include.patch.dpatch by Loic Minier <lool@dooz.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build failure in abi_check with newer GCCs which will exit with
+## DP: failure when an #include can't be found.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.48~/Makefile.am mysql-5.1-5.1.48/Makefile.am
+--- mysql-5.1-5.1.48~/Makefile.am	2010-06-03 17:50:10.000000000 +0200
++++ mysql-5.1-5.1.48/Makefile.am	2010-07-14 00:11:50.103932000 +0200
+@@ -276,9 +276,10 @@
+ # 1) Generate preprocessor output for the files that need to
+ #    be tested for abi/api changes. use -nostdinc to prevent
+ #    generation of preprocessor output for system headers. This
+-#    results in messages in stderr saying that these headers
+-#    were not found. Redirect the stderr output to /dev/null
+-#    to prevent seeing these messages.
++#    results in messages in stderr saying that these headers were not found
++#    with older gccs and in an error with newer ones. Redirect the stderr
++#    output to /dev/null to prevent seeing these messages, and guard includes
++#    with #ifndef mysql_abi_check; define mysql_abi_check for the abi check.
+ # 2) sed the output to 
+ #    2.1) remove blank lines and lines that begin with "# "
+ #    2.2) When gcc -E is run on the Mac OS  and solaris sparc platforms it
+@@ -314,7 +315,7 @@
+ do_abi_check:
+ 	set -ex; \
+ 	for file in $(abi_headers); do \
+-	         @CC@ -E -nostdinc -dI \
++	         @CC@ -Dmysql_abi_check -E -nostdinc -dI \
+ 	                  -I$(top_srcdir)/include \
+ 	                  -I$(top_srcdir)/include/mysql \
+ 	                  -I$(top_srcdir)/sql \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.48~/Makefile.in mysql-5.1-5.1.48/Makefile.in
+--- mysql-5.1-5.1.48~/Makefile.in	2010-06-03 17:54:43.000000000 +0200
++++ mysql-5.1-5.1.48/Makefile.in	2010-07-14 00:12:18.563932000 +0200
+@@ -1096,9 +1096,10 @@
+ # 1) Generate preprocessor output for the files that need to
+ #    be tested for abi/api changes. use -nostdinc to prevent
+ #    generation of preprocessor output for system headers. This
+-#    results in messages in stderr saying that these headers
+-#    were not found. Redirect the stderr output to /dev/null
+-#    to prevent seeing these messages.
++#    results in messages in stderr saying that these headers were not found
++#    with older gccs and in an error with newer ones. Redirect the stderr
++#    output to /dev/null to prevent seeing these messages, and guard includes
++#    with #ifndef mysql_abi_check; define mysql_abi_check for the abi check.
+ # 2) sed the output to 
+ #    2.1) remove blank lines and lines that begin with "# "
+ #    2.2) When gcc -E is run on the Mac OS  and solaris sparc platforms it
+@@ -1134,7 +1135,7 @@
+ do_abi_check:
+ 	set -ex; \
+ 	for file in $(abi_headers); do \
+-	         @CC@ -E -nostdinc -dI \
++	         @CC@ -Dmysql_abi_check -E -nostdinc -dI \
+ 	                  -I$(top_srcdir)/include \
+ 	                  -I$(top_srcdir)/include/mysql \
+ 	                  -I$(top_srcdir)/sql \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.48~/include/mysql.h mysql-5.1-5.1.48/include/mysql.h
+--- mysql-5.1-5.1.48~/include/mysql.h	2010-06-03 17:50:21.000000000 +0200
++++ mysql-5.1-5.1.48/include/mysql.h	2010-07-14 00:09:36.133932000 +0200
+@@ -44,7 +44,9 @@
+ #endif
+ 
+ #ifndef _global_h				/* If not standard header */
++#ifndef mysql_abi_check
+ #include <sys/types.h>
++#endif
+ #ifdef __LCC__
+ #include <winsock2.h>				/* For windows */
+ #endif
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.48~/include/mysql.h.pp mysql-5.1-5.1.48/include/mysql.h.pp
+--- mysql-5.1-5.1.48~/include/mysql.h.pp	2010-06-03 17:50:12.000000000 +0200
++++ mysql-5.1-5.1.48/include/mysql.h.pp	2010-07-14 00:12:31.623932000 +0200
+@@ -1,4 +1,3 @@
+-#include <sys/types.h>
+ typedef char my_bool;
+ typedef int my_socket;
+ #include "mysql_version.h"