=== renamed file '.clang-format' => '.clang-format'
=== renamed file '.gitignore' => '.gitignore'
=== renamed directory '.pc' => '.pc'
=== renamed file '.travis.yml' => '.travis.yml'
=== renamed file 'COPYING' => 'COPYING'
=== renamed file 'HACKING.md' => 'HACKING.md'
=== renamed file 'README' => 'README'
=== renamed file 'RELEASING' => 'RELEASING'
=== renamed file 'bootstrap.py' => 'bootstrap.py'
=== renamed file 'configure.py' => 'configure.py'
=== renamed directory 'debian' => 'debian'
=== modified file 'debian/changelog'
--- debian/changelog	2014-11-19 18:27:33 +0000
+++ debian/changelog	2015-07-12 13:19:39 +0000
@@ -1,3 +1,11 @@
+ninja-build (1.5.1-0.1ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable. (Fixes LP: #1473680)
+    Remaining changes:
+    - Run the tests at build time
+
+ -- Hans Joachim Desserud <ubuntu@desserud.org>  Sun, 12 Jul 2015 15:04:44 +0200
+
 ninja-build (1.5.1-0.1) experimental; urgency=medium
 
   [Mickaël Guerin]
@@ -19,6 +27,12 @@
 
  -- Felix Geyer <fgeyer@debian.org>  Sat, 31 May 2014 10:01:37 +0200
 
+ninja-build (1.3.4-1.1ubuntu1) utopic; urgency=medium
+
+  * Run the tests at build time
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 27 May 2014 17:20:55 +0200
+
 ninja-build (1.3.4-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

=== modified file 'debian/rules'
--- debian/rules	2013-07-18 10:09:48 +0000
+++ debian/rules	2015-07-12 13:00:45 +0000
@@ -26,6 +26,9 @@
 	rm -f build.ninja
 	rm -rf build
 
+override_dh_auto_test:
+	sh -c "ulimit -n 2000 && ./ninja_test"
+
 override_dh_install-arch:
 	dh_install
 	mv debian/ninja-build/etc/bash_completion.d/bash-completion \

=== renamed directory 'doc' => 'doc'
=== renamed directory 'misc' => 'misc'
=== renamed file 'platform_helper.py' => 'platform_helper.py'
=== renamed directory 'src' => 'src'