diff -pruN 2.2.51-5/debian/changelog 2.2.51-5ubuntu1/debian/changelog
--- 2.2.51-5/debian/changelog	2011-12-03 11:20:54.000000000 +0000
+++ 2.2.51-5ubuntu1/debian/changelog	2011-12-18 03:04:30.000000000 +0000
@@ -1,3 +1,11 @@
+acl (2.2.51-5ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - Build-depend on gettext:any, since we only need it to run tools at
+      build-time.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 17 Dec 2011 19:04:30 -0800
+
 acl (2.2.51-5) unstable; urgency=low
 
   * Build if autconf2.13 is installed
@@ -8,6 +16,14 @@ acl (2.2.51-5) unstable; urgency=low
 
  -- Anibal Monsalve Salazar <anibal@debian.org>  Sat, 03 Dec 2011 22:20:25 +1100
 
+acl (2.2.51-4ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - Build-depend on gettext:any, since we only need it to run tools at
+      build-time.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 14 Nov 2011 21:30:21 -0800
+
 acl (2.2.51-4) unstable; urgency=low
 
   * Fix FTBFS on hurd-i386
@@ -17,6 +33,13 @@ acl (2.2.51-4) unstable; urgency=low
 
  -- Anibal Monsalve Salazar <anibal@debian.org>  Fri, 04 Nov 2011 12:00:03 +1100
 
+acl (2.2.51-3ubuntu1) precise; urgency=low
+
+  * Build-depend on gettext:any, since we only need it to run tools at
+    build-time.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 05 Nov 2011 17:34:39 +0000
+
 acl (2.2.51-3) unstable; urgency=medium
 
   * libacl1: Don't pass "-Zbzip2 -z9" to dpkg-deb
@@ -445,6 +468,3 @@ acl (2.0.2-1) unstable; urgency=low
 
  -- Nathan Scott <nathans@debian.org>  Tue, 26 Feb 2002 13:25:26 +1100
 
-Local variables:
-mode: debian-changelog
-End:
diff -pruN 2.2.51-5/debian/control 2.2.51-5ubuntu1/debian/control
--- 2.2.51-5/debian/control	2011-12-03 11:18:42.000000000 +0000
+++ 2.2.51-5ubuntu1/debian/control	2011-12-18 03:03:46.000000000 +0000
@@ -1,9 +1,10 @@
 Source: acl
 Section: utils
 Priority: optional
-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Nathan Scott <nathans@debian.org>, Luk Claes <luk@debian.org>
-Build-Depends: autoconf, automake, debhelper (>= 8.1.3), gettext, libtool, libattr1-dev (>= 1:2.4.46)
+Build-Depends: autoconf, automake, debhelper (>= 8.1.3), gettext:any, libtool, libattr1-dev (>= 1:2.4.46)
 Standards-Version: 3.9.2
 Homepage: http://savannah.nongnu.org/projects/acl/
 Vcs-Git: git://git.savannah.nongnu.org/acl.git