From a8bf97b6b7f724102ecef1d220c71f090bc45657 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Thu, 4 Mar 2010 08:38:33 -0800 Subject: [PATCH] Imported Debian patch 2.12.3-4 --- debian/changelog | 6 ++++++ debian/rules | 3 ++- scm/lily.scm | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcd1ee9607..6bb2a3776b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lilypond (2.12.3-4) unstable; urgency=low + + * Scheme uses file-writeable for some reason (Closes: #572290) + + -- Don Armstrong Thu, 04 Mar 2010 08:38:33 -0800 + lilypond (2.12.3-3) unstable; urgency=low * Use /dev/null if /dev/tty isn't writable (Closes: #572290) diff --git a/debian/rules b/debian/rules index 569569fc3f..a2378cd331 100755 --- a/debian/rules +++ b/debian/rules @@ -68,7 +68,8 @@ build-doc-stamp: dh_testdir # make html - $(MAKE) doc WEB_TARGETS="offline" + # unfortunatly, this does not work well with multiple processors + $(MAKE) -j1 doc WEB_TARGETS="offline" # make info $(MAKE) info diff --git a/scm/lily.scm b/scm/lily.scm index 3b6ef0dee7..bfbc77e62a 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -673,7 +673,7 @@ PIDs or the number of the process." (if separate-logs (open-file (if (string-or-symbol? (ly:get-option 'log-file)) (format "~a.log" (ly:get-option 'log-file)) - (if (file-writable? "/dev/tty") + (if (file-writeable? "/dev/tty") ("/dev/tty") ("/dev/null"))) "a") #f)) (do-measurements (ly:get-option 'dump-profile)) -- 2.39.2