* Apply patch from 77c34ddc (Werner Lemberg <wl@gnu.org>)

  to fix compilation with g++ 4.5 (Closes: #606642).
* Add parts of patch f113bf2f (Benjamin Peterson <benjamin@python.org>)
  to fix segfaults on invalid engraver names.
* Update standards version; no changes

diff --git a/debian/changelog b/debian/changelog
index 629ddf370177b6087b6debdbb8fe94a1566fba90..4de06518c9c6462de884c9668b0c0e2e35f6c199 100644 (file)
--- 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 <wl@gnu.org>) to fix compilation with g++ 4.5 (Closes: #606642).
+  * Apply patch from 77c34ddc (Werner Lemberg <wl@gnu.org>)
+    to fix compilation with g++ 4.5 (Closes: #606642).
     Thanks to Colin Watson for an alternative patch.
+  * Add parts of patch f113bf2f (Benjamin Peterson <benjamin@python.org>)
+    to fix segfaults on invalid engraver names.
+  * Update standards version; no changes
 
- -- Don Armstrong <don@debian.org>  Wed, 08 Sep 2010 22:31:46 -0700
+ -- Don Armstrong <don@debian.org>  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 c411c7567ce0bc875783783d11abfd20d0ffc8a9..15b9465fb8c2acd96c670aeb1a4d391ecdbf5cc1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep: netpbm, imagemagick,
 Section: tex
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>
-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 2b06f9b76b385a49e3ea234d797da410bbb83faa..18394fdb7c6dff6994d116a52c6c22c6d8dfc138 100644 (file)
--- 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 1d54e3fef44355b3f307ba3885a39e229ec6999b..09fb56bc1fc7e9ecbd946ceb22c41e7467bbc4d2 100644 (file)
--- 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 3af72145b1e7f0fd16f05c8e587c424da60fa730..d2d3f1bbd9514dba960b2470787ee43548622a39 100644 (file)
--- 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 1384909fcbc8cccffb4f1b125d86718101cab05a..e1c28bc912d1a677711e98704504a72e2086ad9e 100755 (executable)
--- 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 64c28ac83dc5ed57fc4addfbe1ad589ec8e8e43b..1980da53d05611cf6db3e2f1d95afa9bc758526f 100644 (file)
--- 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 ();
        }
     }