From 5a22d6233a39d3164e1ca043244794c268be4ad0 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Fri, 29 Jul 2011 18:04:25 -0700 Subject: [PATCH] * Apply patch from 77c34ddc (Werner Lemberg ) to fix compilation with g++ 4.5 (Closes: #606642). * Add parts of patch f113bf2f (Benjamin Peterson ) to fix segfaults on invalid engraver names. * Update standards version; no changes --- debian/changelog | 10 +++++++--- debian/control | 7 +++---- debian/lilypond-data.postinst | 2 +- debian/lilypond-doc.dirs | 2 +- debian/lilypond-doc.install | 2 +- debian/rules | 8 ++++---- lily/translator-group.cc | 18 ++++++++++++------ 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 629ddf3701..4de06518c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ -lilypond (2.12.3-8) UNRELEASED; urgency=low +lilypond (2.12.3-8) unstable; urgency=low * Fix bad Recommends on texlive-latex-base (Closes: #594403) * Ditch useless links (Closes: #522120) - * Apply patch from 77c34ddc (Werner Lemberg ) to fix compilation with g++ 4.5 (Closes: #606642). + * Apply patch from 77c34ddc (Werner Lemberg ) + to fix compilation with g++ 4.5 (Closes: #606642). Thanks to Colin Watson for an alternative patch. + * Add parts of patch f113bf2f (Benjamin Peterson ) + to fix segfaults on invalid engraver names. + * Update standards version; no changes - -- Don Armstrong Wed, 08 Sep 2010 22:31:46 -0700 + -- Don Armstrong Fri, 06 May 2011 16:39:42 -0700 lilypond (2.12.3-7) unstable; urgency=low diff --git a/debian/control b/debian/control index c411c7567c..15b9465fb8 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends-Indep: netpbm, imagemagick, Section: tex Priority: optional Maintainer: Don Armstrong -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://lilypond.org/ Package: lilypond @@ -23,9 +23,8 @@ Architecture: any Replaces: lilypond1.3 Provides: lilypond1.3 Depends: ${shlibs:Depends}, ${python:Depends}, guile-1.8, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript -Conflicts: guile-1.8 (= 1.8.2+1-2) Recommends: lilypond-doc, texlive-latex-base -Description: A program for typesetting sheet music +Description: program for typesetting sheet music LilyPond is a music typesetter, an automated engraving system. It produces beautiful sheet music using a high level description file as input. . @@ -71,4 +70,4 @@ Description: LilyPond Documentation in HTML, PS and DVI formats produces beautiful sheet music using a high level description file as input. . This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typesetting software. \ No newline at end of file + LilyPond music typesetting software. diff --git a/debian/lilypond-data.postinst b/debian/lilypond-data.postinst index 2b06f9b76b..18394fdb7c 100644 --- a/debian/lilypond-data.postinst +++ b/debian/lilypond-data.postinst @@ -28,4 +28,4 @@ if [ "$1" = "configure" ]; then && rmdir /usr/share/lilypond; then (cd /usr/share/info; ln -s ../doc/lilypond/html/Documentation/user/ lilypond;) fi; -fi; \ No newline at end of file +fi; diff --git a/debian/lilypond-doc.dirs b/debian/lilypond-doc.dirs index 1d54e3fef4..09fb56bc1f 100644 --- a/debian/lilypond-doc.dirs +++ b/debian/lilypond-doc.dirs @@ -1,2 +1,2 @@ usr/share/doc/lilypond/html -usr/share/info \ No newline at end of file +usr/share/info diff --git a/debian/lilypond-doc.install b/debian/lilypond-doc.install index 3af72145b1..d2d3f1bbd9 100644 --- a/debian/lilypond-doc.install +++ b/debian/lilypond-doc.install @@ -1 +1 @@ -usr/share/info \ No newline at end of file +usr/share/info diff --git a/debian/rules b/debian/rules index 1384909fcb..e1c28bc912 100755 --- a/debian/rules +++ b/debian/rules @@ -58,8 +58,8 @@ build-stamp: --prefix=/usr --enable-optimising \ --infodir='$${prefix}/share/info' \ --mandir='$${prefix}/share/man' - $(MAKE) - $(MAKE) test; + ulimit -c unlimited && $(MAKE) + ulimit -c unlimited && $(MAKE) test; touch build-stamp @@ -69,9 +69,9 @@ build-doc-stamp: # make html # unfortunatly, this does not work well with multiple processors - $(MAKE) -j1 doc WEB_TARGETS="offline" + ulimit -c unlimited && $(MAKE) -j1 doc WEB_TARGETS="offline" # make info - $(MAKE) info + ulimit -c unlimited && $(MAKE) info touch build-doc-stamp diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 64c28ac83d..1980da53d0 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -141,15 +141,21 @@ Translator_group::create_child_translator (SCM sev) for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s)) { - Translator *type = get_translator (scm_car (s)); + SCM definition = scm_car (s); + + Translator *type = 0; + if (ly_is_symbol (definition)) + type = get_translator (definition); + if (!type) warning (_f ("cannot find: `%s'", ly_symbol2string (scm_car (s)).c_str ())); else { - Translator *tr = type->clone (); - SCM str = tr->self_scm (); + Translator *instance = type->clone (); + + SCM str = instance->self_scm (); - if (tr->must_be_last ()) + if (instance->must_be_last ()) { SCM cons = scm_cons (str, SCM_EOL); if (scm_is_pair (trans_list)) @@ -160,8 +166,8 @@ Translator_group::create_child_translator (SCM sev) else trans_list = scm_cons (str, trans_list); - tr->daddy_context_ = new_context; - tr->unprotect (); + instance->daddy_context_ = new_context; + instance->unprotect (); } } -- 2.39.2