diff -pruN 1:1.14.1-3/debian/changelog 1:1.14.1-3ubuntu1/debian/changelog
--- 1:1.14.1-3/debian/changelog	2014-02-23 08:14:06.000000000 +0000
+++ 1:1.14.1-3ubuntu1/debian/changelog	2014-08-04 09:35:20.000000000 +0000
@@ -1,3 +1,14 @@
+automake-1.14 (1:1.14.1-3ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Drop universe build-dependencies:
+      - cscope, python-virtualenv, gobjc++, lzip, ncompress.
+    - Add autopkgtest that builds src & runs full test-suite with above
+      universe dependencies.
+    - Enable parallel build (mostly tests).
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Aug 2014 11:33:51 +0200
+
 automake-1.14 (1:1.14.1-3) unstable; urgency=low
 
   * debian/upstream/signing-key.asc: Rename upstream-signing-key.gpg to
@@ -11,6 +22,17 @@ automake-1.14 (1:1.14.1-3) unstable; urg
 
  -- Eric Dorland <eric@debian.org>  Sat, 22 Feb 2014 02:49:15 -0500
 
+automake-1.14 (1:1.14.1-2ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Drop universe build-dependencies:
+      - cscope, python-virtualenv, gobjc++, lzip, ncompress.
+    - Add autopkgtest that builds src & runs full test-suite with above
+      universe dependencies.
+    - Enable parallel build (mostly tests).
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 02 Jan 2014 19:29:00 +0100
+
 automake-1.14 (1:1.14.1-2) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.5.
@@ -41,6 +63,19 @@ automake-1.14 (1:1.14-3) unstable; urgen
 
  -- Eric Dorland <eric@debian.org>  Mon, 11 Nov 2013 16:30:35 -0500
 
+automake-1.14 (1:1.14-2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian, remaining changes:
+    * Drop universe build-dependencies:
+      - cscope, python-virtualenv, gobjc++, lzip, ncompress.
+    * Add autopkgtest that builds src & runs full test-suite with above
+      universe dependencies.
+
+  * Cherrypick additional upstream patch for perl hash randomisation.
+  * Enable parallel build (mostly tests).
+
+ -- Dmitrijs Ledkovs <xnox@ubuntu.com>  Mon, 04 Nov 2013 17:19:02 +0000
+
 automake-1.14 (1:1.14-2) unstable; urgency=low
 
   * debian/patches/03-hash-order-workaround.diff: Add workaround for
diff -pruN 1:1.14.1-3/debian/control 1:1.14.1-3ubuntu1/debian/control
--- 1:1.14.1-3/debian/control	2014-02-23 08:14:06.000000000 +0000
+++ 1:1.14.1-3ubuntu1/debian/control	2014-08-04 09:35:20.000000000 +0000
@@ -1,15 +1,16 @@
 Source: automake-1.14
 Section: devel
 Priority: optional
-Maintainer: Eric Dorland <eric@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Eric Dorland <eric@debian.org>
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: autoconf (>= 2.65), autotools-dev (>= 20020320.1),
  install-info,
 # Used in tests
- autopoint, bison, cscope, dejagnu, emacs, expect, flex, gcj-jdk,
- gobjc, gobjc++, gfortran, help2man, libglib2.0-dev, libtool, lzip,
- ncompress, openjdk-7-jdk, python, python-docutils, python-virtualenv,
+ autopoint, bison, dejagnu, emacs, expect, flex, gcj-jdk,
+ gobjc, gfortran, help2man, libglib2.0-dev, libtool,
+ openjdk-7-jdk, python, python-docutils,
  pkg-config, sharutils, texlive, texinfo (>= 4.9), unzip, valac,
  xutils-dev, zip
 Homepage: http://www.gnu.org/software/automake/
diff -pruN 1:1.14.1-3/debian/rules 1:1.14.1-3ubuntu1/debian/rules
--- 1:1.14.1-3/debian/rules	2014-02-23 08:14:06.000000000 +0000
+++ 1:1.14.1-3ubuntu1/debian/rules	2014-08-04 09:35:20.000000000 +0000
@@ -5,7 +5,7 @@ version=1.14
 infodir=doc
 
 %:
-	dh $@
+	dh $@ --parallel
 
 ifeq ($(DEB_BUILD_PROFILE),stage1)
 MAKEINFO=true
diff -pruN 1:1.14.1-3/debian/tests/control 1:1.14.1-3ubuntu1/debian/tests/control
--- 1:1.14.1-3/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 1:1.14.1-3ubuntu1/debian/tests/control	2014-08-04 09:35:20.000000000 +0000
@@ -0,0 +1,3 @@
+Tests: fullbuild
+Restrictions: rw-build-tree allow-stderr
+Depends: @, debhelper (>= 9), autoconf (>= 2.65), autotools-dev (>= 20020320.1), install-info, autopoint, bison, cscope, dejagnu, emacs, expect, flex, gcj-jdk, gobjc, gobjc++, gfortran, help2man, libglib2.0-dev, libtool, lzip, ncompress, openjdk-7-jdk, python, python-docutils, python-virtualenv, pkg-config, sharutils, texlive, texinfo (>= 4.9), unzip, valac, xutils-dev, zip
diff -pruN 1:1.14.1-3/debian/tests/fullbuild 1:1.14.1-3ubuntu1/debian/tests/fullbuild
--- 1:1.14.1-3/debian/tests/fullbuild	1970-01-01 00:00:00.000000000 +0000
+++ 1:1.14.1-3ubuntu1/debian/tests/fullbuild	2014-08-04 09:35:20.000000000 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./debian/rules build
