diff -pruN 2.5.0-2/debian/changelog 2.5.0-2ubuntu1/debian/changelog
--- 2.5.0-2/debian/changelog	2011-09-11 19:23:38.000000000 +0000
+++ 2.5.0-2ubuntu1/debian/changelog	2011-11-17 19:26:32.000000000 +0000
@@ -1,3 +1,11 @@
+pari (2.5.0-2ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Build using gcc-4.4 on armel to workaround test failure.
+    - Don't link explicitly against libc.
+
+ -- Michael Terry <mterry@ubuntu.com>  Thu, 17 Nov 2011 14:25:33 -0500
+
 pari (2.5.0-2) unstable; urgency=low
 
   * New patches: 
@@ -11,6 +19,13 @@ pari (2.5.0-2) unstable; urgency=low
 
  -- Bill Allombert <ballombe@debian.org>  Sun, 11 Sep 2011 17:54:50 +0200
 
+pari (2.5.0-1ubuntu1) oneiric; urgency=low
+
+  * Build using gcc-4.4 on armel to workaround LP: #838197.
+  * Don't link explicitly against libc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 04 Sep 2011 15:55:06 +0200
+
 pari (2.5.0-1) unstable; urgency=low
 
   * New upstream release
@@ -381,3 +396,4 @@ pari (2.1.1-1) unstable; urgency=low
 Local variables:
 mode: debian-changelog
 End:
+
diff -pruN 2.5.0-2/debian/control 2.5.0-2ubuntu1/debian/control
--- 2.5.0-2/debian/control	2011-09-11 19:14:29.000000000 +0000
+++ 2.5.0-2ubuntu1/debian/control	2011-11-17 19:43:55.000000000 +0000
@@ -1,9 +1,10 @@
 Source: pari
-Build-Depends: debhelper (>= 5), libreadline-dev, libx11-dev, libncurses5-dev, libgmp-dev
+Build-Depends: debhelper (>= 5), libreadline-dev, libx11-dev, libncurses5-dev, libgmp-dev, gcc-4.4 [armel armhf]
 Build-Depends-Indep: texlive-base
 Section: math
 Priority: optional
-Maintainer: Bill Allombert <ballombe@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bill Allombert <ballombe@debian.org>
 Standards-Version: 3.9.2
 Homepage: http://pari.math.u-bordeaux.fr
  
diff -pruN 2.5.0-2/debian/rules 2.5.0-2ubuntu1/debian/rules
--- 2.5.0-2/debian/rules	2011-07-22 21:33:48.000000000 +0000
+++ 2.5.0-2ubuntu1/debian/rules	2011-09-12 05:18:40.000000000 +0000
@@ -21,6 +21,12 @@ PARI_SYSTEM:=$(patsubst linux-gnu%,linux
 PARI_SYSTEM:=$(patsubst %-gnu,gnu%,$(PARI_SYSTEM))
 DEBIAN_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+ifneq (,$(filter $(DEBIAN_ARCH), armel armhf))
+  CC=gcc-4.4
+else
+  CC=cc
+endif
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS = -g -O0 -Wall -fno-strict-aliasing
 else
@@ -35,11 +41,11 @@ build: build-arch 
 config: config-stamp
 config-stamp:
 	dh_testdir
-	CC=cc CFLAGS="$(CFLAGS)" \
+	CC=$(CC) CFLAGS="$(CFLAGS)" \
 	  ./Configure \
             --prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
             --builddir=obj-dyn --graphic=X11 --with-gmp 
-	CC=cc CFLAGS="$(CFLAGS)" \
+	CC=$(CC) CFLAGS="$(CFLAGS)" \
 	  ./Configure \
             --prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
             --builddir=obj-sta --graphic=X11 --with-gmp
@@ -47,7 +53,7 @@ config-stamp:
 
 build-arch: build-arch-stamp
 build-arch-stamp: config-stamp
-	$(MAKE) -C obj-dyn lib-dyn "LIBS=-lc -lm -lgmp"
+	$(MAKE) -C obj-dyn lib-dyn "LIBS=-lm -lgmp"
 	$(MAKE) -C obj-sta lib-sta DLCFLAGS=""
 	$(MAKE) -C obj-dyn gp-dyn
 ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))