diff -Nru csh-20110502/debian/changelog csh-20110502/debian/changelog
--- csh-20110502/debian/changelog	2014-07-18 03:29:15.000000000 +0200
+++ csh-20110502/debian/changelog	2014-08-22 00:03:04.000000000 +0200
@@ -1,3 +1,11 @@
+csh (20110502-2.1ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable. (LP: #1357955) Remaining changes:
+    - debian/control:
+      + Fix build failure, debhelper cannot handle pmake.
+
+ -- Filip Sohajek <filip.sohajek@gmail.com>  Sun, 17 Aug 2014 16:58:46 +0200
+
 csh (20110502-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -10,6 +18,18 @@
 
  -- YunQiang Su <syq@debian.org>  Fri, 18 Jul 2014 09:28:44 +0800
 
+csh (20110502-2ubuntu2) trusty; urgency=low
+
+  * Fix build failure, debhelper cannot handle pmake. Closes: #718068.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 23 Oct 2013 16:38:11 +0200
+
+csh (20110502-2ubuntu1) oneiric; urgency=low
+
+  * Build with -Wno-error=unused-result.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 08 Sep 2011 21:30:57 +0200
+
 csh (20110502-2) unstable; urgency=medium
 
   * 02_libbsd.diff: Use <bsd/vis.h> rather than <vis.h>.  Closes: #629684.
diff -Nru csh-20110502/debian/control csh-20110502/debian/control
--- csh-20110502/debian/control	2014-07-18 03:27:29.000000000 +0200
+++ csh-20110502/debian/control	2014-08-21 23:58:28.000000000 +0200
@@ -1,7 +1,8 @@
 Source: csh
 Section: shells
 Priority: optional
-Maintainer: Matej Vela <vela@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matej Vela <vela@debian.org>
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 8), groff, libbsd-dev, bmake (>= 20130730-2)
 
diff -Nru csh-20110502/debian/rules csh-20110502/debian/rules
--- csh-20110502/debian/rules	2014-07-18 03:27:29.000000000 +0200
+++ csh-20110502/debian/rules	2014-08-21 23:52:51.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Standard options minus `-Wall', since upstream uses `-Werror'.
-export CFLAGS := -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+export CFLAGS := -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) -Wno-error=unused-result
 
 %:
 	dh $@ --buildsystem=bmake
@@ -14,6 +14,9 @@
 	dh_auto_clean
 	dh_auto_clean -- -C USD.doc
 
+override_dh_auto_test:
+	true
+
 override_dh_auto_install:
 	install -D csh debian/csh/bin/bsd-csh
 	install -D -m 644 USD.doc/paper.txt debian/csh/usr/share/doc/csh/csh.txt