diff -Nru valgrind-3.7.0/debian/changelog valgrind-3.7.0/debian/changelog --- valgrind-3.7.0/debian/changelog 2012-01-06 18:18:19.000000000 +0100 +++ valgrind-3.7.0/debian/changelog 2012-02-17 12:35:34.000000000 +0100 @@ -1,3 +1,12 @@ +valgrind (1:3.7.0-0ubuntu2) precise; urgency=low + + * Allow glibc 2.15 in the configure checks. (LP: #934127) + - Add 0009-glibc-215.patch, cherry-picked from upstream. + - Add 0010-automake-1.11.2.patch by Gregorio Guidi. + - Use dh-autoreconf instead of autotools-dev. + + -- Felix Geyer Fri, 17 Feb 2012 12:14:44 +0100 + valgrind (1:3.7.0-0ubuntu1) precise; urgency=low * New upstream release diff -Nru valgrind-3.7.0/debian/control valgrind-3.7.0/debian/control --- valgrind-3.7.0/debian/control 2011-10-17 14:42:31.000000000 +0200 +++ valgrind-3.7.0/debian/control 2012-02-17 12:18:40.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Andrés Roldán Uploaders: Pierre Habouzit -Build-Depends: debhelper (>> 7.0.0), libc6-dev (>> 2.3.0), autotools-dev (>= 20100122.1), +Build-Depends: debhelper (>> 7.0.0), libc6-dev (>> 2.3.0), dh-autoreconf, gdb, gcc-multilib [amd64 ppc64], libc6-dev-i386 (>> 2.3.0) [amd64], libc6-dev-powerpc [ppc64], docbook, docbook-xsl, docbook-xml, xsltproc Standards-Version: 3.9.2 diff -Nru valgrind-3.7.0/debian/patches/0009-glibc-215.patch valgrind-3.7.0/debian/patches/0009-glibc-215.patch --- valgrind-3.7.0/debian/patches/0009-glibc-215.patch 1970-01-01 01:00:00.000000000 +0100 +++ valgrind-3.7.0/debian/patches/0009-glibc-215.patch 2012-02-17 12:14:29.000000000 +0100 @@ -0,0 +1,30 @@ +Description: add support for glibc 2.15 +Origin: upstream, http://sourceforge.net/mailarchive/forum.php?thread_name=20111229082456.D5FE6108870%40jail0086.vps.exonetric.net&forum_name=valgrind-developers + +Modified: trunk/configure.in +=================================================================== +--- trunk/configure.in 2011-12-27 18:43:32 UTC (rev 12322) ++++ trunk/configure.in 2011-12-29 08:24:55 UTC (rev 12323) +@@ -778,6 +778,13 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.15) ++ AC_MSG_RESULT(2.15 family) ++ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) +@@ -791,7 +798,7 @@ + + *) + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15]) + AC_MSG_ERROR([or Darwin libc]) + ;; + esac diff -Nru valgrind-3.7.0/debian/patches/0010-automake-1.11.2.patch valgrind-3.7.0/debian/patches/0010-automake-1.11.2.patch --- valgrind-3.7.0/debian/patches/0010-automake-1.11.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ valgrind-3.7.0/debian/patches/0010-automake-1.11.2.patch 2012-02-17 12:26:13.000000000 +0100 @@ -0,0 +1,30 @@ +Description: Fix errors with automake 1.11.2: `pkglibdir' is not a legitimate directory for `DATA' +Author: Gregorio Guidi +Origin: https://bugs.kde.org/show_bug.cgi?id=290719#c3 + +diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am +--- valgrind-3.7.0.orig/coregrind/Makefile.am ++++ valgrind-3.7.0/coregrind/Makefile.am +@@ -495,7 +495,8 @@ + m_gdbserver/powerpc-altivec64l.xml + + # so as to make sure these get copied into the install tree +-pkglib_DATA = $(GDBSERVER_XML_FILES) ++vgdatadir = $(pkglibdir) ++vgdata_DATA = $(GDBSERVER_XML_FILES) + + # so as to make sure these get copied into the tarball + EXTRA_DIST += $(GDBSERVER_XML_FILES) +diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am +--- valgrind-3.7.0.orig/Makefile.am ++++ valgrind-3.7.0/Makefile.am +@@ -61,7 +61,8 @@ + # default.supp, as it is built from the base .supp files at compile-time. + dist_noinst_DATA = $(SUPP_FILES) + +-pkglib_DATA = default.supp ++vgdatadir = $(pkglibdir) ++vgdata_DATA = default.supp + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = valgrind.pc diff -Nru valgrind-3.7.0/debian/patches/series valgrind-3.7.0/debian/patches/series --- valgrind-3.7.0/debian/patches/series 2012-01-06 18:14:23.000000000 +0100 +++ valgrind-3.7.0/debian/patches/series 2012-02-17 12:26:20.000000000 +0100 @@ -2,3 +2,5 @@ 0002-version.patch 0004-allow-or-quoting-of-strings-in-.valgrindrc.patch 0006-workaround-SIGSEGV-on-PPC.patch +0009-glibc-215.patch +0010-automake-1.11.2.patch diff -Nru valgrind-3.7.0/debian/rules valgrind-3.7.0/debian/rules --- valgrind-3.7.0/debian/rules 2012-01-06 18:17:24.000000000 +0100 +++ valgrind-3.7.0/debian/rules 2012-02-17 12:18:25.000000000 +0100 @@ -50,4 +50,4 @@ install -p -m644 debian/valgrind.bash $(target)/etc/bash_completion.d/valgrind %: - dh $@ --parallel --with autotools-dev + dh $@ --parallel --with autoreconf