From: Anthony Fok <foka@debian.org>
Date: Thu, 26 Jan 2017 23:52:08 +0000 (-0700)
Subject: Add "--no-parallel" to dh_auto_clean in debian/rules
X-Git-Tag: debian/2.18.2-9~27
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=1659dee5713d1adc304a9d8f6a62614af924da6b;p=lilypond.git

Add "--no-parallel" to dh_auto_clean in debian/rules

The use of a parallel "$(MAKE) -j4 distclean" tends to fail
after a full build.
---

diff --git a/debian/rules b/debian/rules
index 28a6437f9f..55d5d16ef4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 %:
 	dh $@ --parallel --with autotools-dev --with python2 --with quilt
 
-## we need to nuke the parser files, because if there is a mistmatch
+## we need to nuke the parser files, because if there is a mismatch
 ## between upstreams bison and our bison, the build will fail epically
 override_dh_auto_configure:
 	rm -f lily/out/parser.*
@@ -59,13 +59,13 @@ override_dh_auto_install-indep:
 override_dh_auto_install-arch:
 	for dir in `echo */*makefile|xargs -n 1 dirname|grep -v Documentation`; do \
 		$(MAKE) --no-builtin-rules PACKAGE=LILYPOND package=lilypond -C $$dir install $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/; \
-	done;
+	done
 
-## we need to nuke the parser files, because if there is a mistmatch
+## we need to nuke the parser files, because if there is a mismatch
 ## between upstreams bison and our bison, the build will fail epically
 override_dh_auto_clean:
 	rm -f lily/out/parser.*
-	dh_auto_clean
+	dh_auto_clean --no-parallel
 
 ## we need to install only the png, jpg, css, ly and english html
 ## files into the doc-html package, and only the english pdfs into the
@@ -102,12 +102,12 @@ override_dh_installdocs:
 		package=`basename $$a .doc-base-special`; \
 		install -d debian/$$package/usr/share/doc-base; \
 		install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \
-	done;
+	done
 
 override_dh_auto_test:
 ifneq (,$(filter $(DEB_BUILD_OPTIONS),nocheck))
 	$(MAKE) test-baseline
-    $(MAKE) test
+	$(MAKE) test
 endif
 
 ## this rule will update debian/control and the per-language install