Imported Debian patch 2.12.3-4

diff --git a/debian/changelog b/debian/changelog
index bcd1ee9607364fd8ec647117ab10a8ae7ceef082..6bb2a3776b867a2743aae180905858bae6bd8ed8 100644 (file)
--- 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 <don@debian.org>  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 569569fc3f56b787ca0dc7ff9c7a687262453a29..a2378cd331b500ee3d5e4f8d27039fe527de011a 100755 (executable)
--- 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 3b6ef0dee7d00ccf4539730b4d800cf1de2cb526..bfbc77e62ae1695a66d7561a601270b6f58e39d2 100644 (file)
--- 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))