diff -u eglibc-2.15/debian/changelog eglibc-2.15/debian/changelog
--- eglibc-2.15/debian/changelog
+++ eglibc-2.15/debian/changelog
@@ -1,3 +1,20 @@
+eglibc (2.15-0ubuntu3) precise; urgency=low
+
+  [ Matthias Klose ]
+  * debian/debhelper.in/libc.postinst: Call notify-reboot-required for
+    updates to 2.15.
+  * Expect same test failures on armhf as on armel.
+  * Only restart gdm if it is running. LP: #931745.
+  * Don't include the non-default multilib debug files in the libc6-dbg
+    package on ARM. Install the multiarch package instead.
+
+  [ Steve Langasek ]
+  * Synchronize the kernel version checks in
+    debian/debhelper.in/libc6.preinst with the values actually set in
+    debian/sysdeps/linux.mk.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 23 Feb 2012 20:04:15 +0100
+
 eglibc (2.15-0ubuntu2) precise; urgency=low
 
   * Revert commit c5a0802a. LP: #929713.
diff -u eglibc-2.15/debian/sysdeps/linux.mk eglibc-2.15/debian/sysdeps/linux.mk
--- eglibc-2.15/debian/sysdeps/linux.mk
+++ eglibc-2.15/debian/sysdeps/linux.mk
@@ -1,4 +1,6 @@
 EGLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
+
+# When changing these, make sure to update debian/debhelper.in/libc.preinst!
 ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64))
   MIN_KERNEL_SUPPORTED := 2.6.32
 else ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
diff -u eglibc-2.15/debian/debhelper.in/libc.postinst eglibc-2.15/debian/debhelper.in/libc.postinst
--- eglibc-2.15/debian/debhelper.in/libc.postinst
+++ eglibc-2.15/debian/debhelper.in/libc.postinst
@@ -96,6 +96,11 @@
 		locale-gen --purge
 	    fi
 	fi
+	if dpkg --compare-versions "$preversion" lt 2.15-0ubuntu3; then
+	    if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
+		/usr/share/update-notifier/notify-reboot-required
+	    fi
+	fi
 	if dpkg --compare-versions "$preversion" lt 2.15; then
 	    check="apache2.2-common apache apache-ssl apache-perl autofs at"
 	    check="$check boa cucipop courier-authdaemon cron cups exim"
@@ -179,6 +184,16 @@
 			fi
 			case "$service" in
 			    gdm)
+				# see if gdm is running; if not, skip it
+				status gdm 2>/dev/null || continue
+				case "$(status gdm)" in
+				    *running*) ;;
+				    *) continue ;;
+				esac
+				which dbus-send >/dev/null 2>&1 || continue
+				dbusval=`dbus-send --system --print-reply --dest=org.freedesktop.DBus / org.freedesktop.DBus.NameHasOwner string:org.gnome.DisplayManager | sed -n '/^ *boolean/s/.*boolean *//p'`
+				[ "$dbusval" = true ] || continue
+
 				# old gdm uses initscript, we need
 				# to restart it. note that we do
 				# not need to do anything for new
diff -u eglibc-2.15/debian/debhelper.in/libc.preinst eglibc-2.15/debian/debhelper.in/libc.preinst
--- eglibc-2.15/debian/debhelper.in/libc.preinst
+++ eglibc-2.15/debian/debhelper.in/libc.preinst
@@ -358,17 +358,12 @@
             mips*) realarch="mips";;
         esac
 
-        # The GNU libc requires a >= 2.6.18 kernel, except on m68k where a
-        # 2.6.32 kernel is needed.
-        if [ "$realarch" != m68k ]
-        then
-            # Ubuntu buildd limitation: allow just 2.6.15, although 2.6.18 is required
-            # for some patches
-            #if linux_compare_versions "$kernel_ver" lt 2.6.18
-            vmin=2.6.15
-        else
-            vmin=2.6.32
-        fi
+        case $realarch in
+            ppc*|m68k) vmin=2.6.32;; # powerpc builders are all on lucid
+            arm)       vmin=2.6.31;; # minimum version of imx51 kernel still in use
+            *)         vmin=2.6.24;; # kernel version in hardy used on Xen-based ppa buildds
+        esac
+
         if linux_compare_versions "$kernel_ver" lt ${vmin}
         then
             echo WARNING: this version of the GNU libc requires kernel version
diff -u eglibc-2.15/debian/rules.d/debhelper.mk eglibc-2.15/debian/rules.d/debhelper.mk
--- eglibc-2.15/debian/rules.d/debhelper.mk
+++ eglibc-2.15/debian/rules.d/debhelper.mk
@@ -99,6 +99,18 @@
 	    dh_strip -p$(curpass) -Xlibpthread;					\
 	  fi									\
 	fi
+
+	# ARM archs always use multiarch locations, don't let libc6-dbg conflict
+	if test "$(curpass)" = "$(libc)-dbg"; then \
+	  if test "$(DEB_HOST_ARCH)" = "armel"; then \
+	    rm -rf debian/$(curpass)/usr/lib/debug/lib/arm-linux-gnueabihf; \
+	    rm -rf debian/$(curpass)/usr/lib/debug/usr/lib/arm-linux-gnueabihf; \
+	  fi; \
+	  if test "$(DEB_HOST_ARCH)" = "armhf"; then \
+	    rm -rf debian/$(curpass)/usr/lib/debug/lib/arm-linux-gnueabi; \
+	    rm -rf debian/$(curpass)/usr/lib/debug/usr/lib/arm-linux-gnueabi; \
+	  fi; \
+	fi
 endif
 
 	dh_compress -p$(curpass)
only in patch2:
unchanged:
--- eglibc-2.15.orig/debian/testsuite-checking/expected-results-arm-linux-gnueabihf-libc
+++ eglibc-2.15/debian/testsuite-checking/expected-results-arm-linux-gnueabihf-libc
@@ -0,0 +1,13 @@
+#
+# Allowed failures for arm-linux-gnueabi-libc and the returned make
+# failure number, indicating the signal the process died with.
+# Format: <Failed test>, Error <Make error code> [(ignored)]
+#
+annexc.out, Error 1 (ignored)
+check-localplt.out, Error 1
+tst-cpuclock2.out, Error 1
+test-idouble.out, Error 1
+test-ifloat.out, Error 1
+tst-mqueue5.out, Error 1
+tst-timer.out, Error 139
+tst-waitid.out, Error 1