diff -u memtest86+-2.01/debian/changelog memtest86+-2.01/debian/changelog
--- memtest86+-2.01/debian/changelog
+++ memtest86+-2.01/debian/changelog
@@ -1,3 +1,14 @@
+memtest86+ (2.01-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #192517), remaining changes:
+    - debian/control: Add lpia as supported architecture.
+    - Makefile: Add -fno-stack-protector to CFLAGS, since this package does
+      not link against libc.
+  * Check for /boot/grub/menu.lst rather than /boot/grub/grub.cfg in
+    post{inst,rm}
+
+ -- Saïvann Carignan <oxmosys@gmail.com>  Mon, 05 May 2008 19:02:56 -0400
+
 memtest86+ (2.01-1) unstable; urgency=low
 
   * New upstream release (Closes: #468780).
@@ -9,6 +20,17 @@
 
  -- Yann Dirson <dirson@debian.org>  Wed, 23 Apr 2008 21:21:47 +0200
 
+memtest86+ (1.70-3ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: Add lpia as supported architecture.
+    - Makefile: Add -fno-stack-protector to CFLAGS, since this package does
+      not link against libc.
+  * Check for /boot/grub/menu.lst rather than /boot/grub/menu.lst in
+    post{inst,rm}, LP: #129614
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 26 Sep 2007 22:43:24 +0200
+
 memtest86+ (1.70-3) unstable; urgency=low
 
   * Build-depend on gcc-multilib on amd64 (Closes: #426239).
@@ -20,6 +42,23 @@
 
  -- Yann Dirson <dirson@debian.org>  Sun, 29 Jul 2007 16:17:18 +0200
 
+memtest86+ (1.70-2ubuntu2) gutsy; urgency=low
+
+  * debian/control: Add lpia as supported architecture.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 31 Jul 2007 00:04:33 +0200
+
+memtest86+ (1.70-2ubuntu1) gutsy; urgency=low
+
+  * Merge to Debian unstable; remaining Ubuntu changes:
+    - debian/control: Add libc6-dev-i386 build dependency on amd64 to fix
+      FTBFS.
+    - Makefile: Add -fno-stack-protector to CFLAGS, since this package does
+      not link against libc.
+  * debian/control: Set Ubuntu maintainer.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 21 May 2007 09:39:41 +0200
+
 memtest86+ (1.70-2) unstable; urgency=low
 
   * Upload to unstable now that etch is released.
@@ -243,0 +283 @@
+
diff -u memtest86+-2.01/debian/control memtest86+-2.01/debian/control
--- memtest86+-2.01/debian/control
+++ memtest86+-2.01/debian/control
@@ -6,7 +6,7 @@
 Standards-Version: 3.7.2
 
 Package: memtest86+
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 lpia
 Depends: ${misc:Depends}
 Suggests: hwtools, memtester, kernel-patch-badram, grub2 (>=1.95+20070515-1) | grub (>= 0.95+cvs20040624), mtools
 Description: thorough real-mode memory tester
diff -u memtest86+-2.01/debian/postinst memtest86+-2.01/debian/postinst
--- memtest86+-2.01/debian/postinst
+++ memtest86+-2.01/debian/postinst
@@ -17,8 +17,8 @@
     fi
 fi
 
-if test -e /boot/grub/grub.cfg && which update-grub2 > /dev/null ; then
-    update-grub2
+if test -e /boot/grub/menu.lst && which update-grub > /dev/null ; then
+    update-grub
 fi
 
 #DEBHELPER#
diff -u memtest86+-2.01/debian/postrm memtest86+-2.01/debian/postrm
--- memtest86+-2.01/debian/postrm
+++ memtest86+-2.01/debian/postrm
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-if which update-grub2 > /dev/null ; then
-    update-grub2
+if test -e /boot/grub/menu.lst && which update-grub > /dev/null ; then
+    update-grub
 fi
 
 #DEBHELPER#
only in patch2:
unchanged:
--- memtest86+-2.01.orig/Makefile
+++ memtest86+-2.01/Makefile
@@ -11,7 +11,7 @@
 AS=as -32
 CC=gcc
 
-CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
+CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
 
 OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
       config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \