On Wed, 23 Oct 2013 16:45:46 +0200, Matthias Klose wrote:

> patch at
> http://launchpadlibrarian.net/154802668/csh_20110502-2ubuntu1_20110502-2ubuntu2.diff.gz

A different approach would be to use the rather new bmake debhelper
buildsystem (which also ignores tests).

Debdiff attached.

Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Ludwig Hirsch: Piratenschiff
diff -Nru csh-20110502/debian/changelog csh-20110502/debian/changelog
--- csh-20110502/debian/changelog	2011-07-05 14:27:03.000000000 +0200
+++ csh-20110502/debian/changelog	2013-11-13 20:51:13.000000000 +0100
@@ -1,3 +1,14 @@
+csh (20110502-2.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: Makefile:24: *** missing separator.  Stop.":
+    use bmake debhelper addon:
+    - d/control: build-depend on bmake (>= 20130730-2)
+    - d/rules: use bmake buildsystem, update override_dh_auto_{build,clean}
+    (Closes: #718068)
+
+ -- gregor herrmann <gre...@debian.org>  Wed, 13 Nov 2013 20:30:22 +0100
+
 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	2011-07-05 14:26:02.000000000 +0200
+++ csh-20110502/debian/control	2013-11-13 20:42:56.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Matej Vela <v...@debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), groff, libbsd-dev, pmake
+Build-Depends: debhelper (>= 8), groff, libbsd-dev, bmake (>= 20130730-2)
 
 Package: csh
 Architecture: any
diff -Nru csh-20110502/debian/rules csh-20110502/debian/rules
--- csh-20110502/debian/rules	2011-07-05 14:12:52.000000000 +0200
+++ csh-20110502/debian/rules	2013-11-13 20:49:04.000000000 +0100
@@ -4,15 +4,15 @@
 export CFLAGS := -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 %:
-	dh $@
+	dh $@ --buildsystem=bmake
 
 override_dh_auto_build:
-	pmake
-	cd USD.doc && pmake paper.ps paper.txt
+	dh_auto_build
+	dh_auto_build -- -C USD.doc paper.ps paper.txt
 
 override_dh_auto_clean:
-	pmake cleandir
-	cd USD.doc && pmake cleandir
+	dh_auto_clean
+	dh_auto_clean -- -C USD.doc
 
 override_dh_auto_install:
 	install -D csh debian/csh/bin/bsd-csh

Attachment: signature.asc
Description: Digital signature

Reply via email to