Bug#696608: unlock: lilypond/2.14.2-4 (preapproval)
On Sat, 19 Jan 2013, Don Armstrong wrote:
On Sat, 19 Jan 2013, Julien Cristau wrote:
On Mon, Dec 24, 2012 at 19:43:58 +, Adam D. Barratt wrote:
Control: tags -1 + confirmed
On 23.12.2012 21:31, Don Armstrong wrote:
In making a fix to the RC bug #684817, I also fixed a problem in
disabling optimization when noopt is present, and a patch which fixes
an install-info warning which had previously collected.
I'd be okay with accepting those. Please go ahead; thanks.
Ping?
Sorry, I actually have to change the patch for this after talking to
upstream. It's going to be relatively trivial still, but slightly
different. I just haven't had a chance to completely test it yet.
I have just uploaded a new lilypond which fixes this bug with the
attached changes. The only change from the previously approved patch
is properly fixing #684817. [The complete patch, and the changes to
the preapproved patch are attached.]
Don Armstrong
--
Good people are good because they've come to wisdom through failure.
We get very little wisdom from success, you know.
-- William Saroyan _My Heart's in the Highlands_
http://www.donarmstrong.com http://rzlab.ucr.edu
diff -u lilypond-2.14.2/debian/control lilypond-2.14.2/debian/control
--- lilypond-2.14.2/debian/control
+++ lilypond-2.14.2/debian/control
@@ -17,6 +17,8 @@
Maintainer: Don Armstrong d...@debian.org
Standards-Version: 3.9.2
Homepage: http://lilypond.org/
+Vcs-Git: git://git.donarmstrong.com/lilypond.git
+Vcs-Browser: http://git.donarmstrong.com/lilypond.git
Package: lilypond
Architecture: any
diff -u lilypond-2.14.2/debian/changelog lilypond-2.14.2/debian/changelog
--- lilypond-2.14.2/debian/changelog
+++ lilypond-2.14.2/debian/changelog
@@ -1,6 +1,19 @@
+lilypond (2.14.2-4) unstable; urgency=low
+
+ * Fix warnings from install-info by splitting the direntry sections
+across the texinfo files (Closes: #648689). Thanks to Julian Gilbey
+for the patch.
+ * Fix noopt support to use --disable-optimising as ./configure does
+crazy things.
+ * Apply patch from 13fc2437e2aaa9 to fix segfault in font-mark where a
+garbage collection can trigger a null pointer dereference (closes:
+#684817)
+
+ -- Don Armstrong d...@donarmstrong.com Sun, 23 Dec 2012 13:25:44 -0800
+
lilypond (2.14.2-3) unstable; urgency=low
- * Fix redefinition of s in Music_sequence::first_start. (Closes
+ * Fix redefinition of s in Music_sequence::first_start. (Closes:
#672087).
-- Don Armstrong d...@debian.org Sun, 13 May 2012 16:07:16 -0700
diff -u lilypond-2.14.2/debian/rules lilypond-2.14.2/debian/rules
--- lilypond-2.14.2/debian/rules
+++ lilypond-2.14.2/debian/rules
@@ -56,8 +56,12 @@
CFLAGS := $(filter-out -O%, $(CFLAGS))
CXXFLAGS := $(filter-out -O%, $(CXXFLAGS))
else
+ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))
+ config_opt = --disable-optimising
+else
config_opt = --enable-optimising
endif
+endif
build: build-stamp
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/lily/pango-font.cc
+++ lilypond-2.14.2/lily/pango-font.cc
@@ -47,6 +47,10 @@
PangoFontDescription const *description,
Real output_scale)
{
+ // This line looks stupid, but if we don't initialize physical_font_tab_ befo
+ // we allocate memory in scm_c_make_hash_table, then that could trigger a gar
+ // collection.
+ physical_font_tab_ = SCM_EOL;
physical_font_tab_ = scm_c_make_hash_table (11);
PangoDirection pango_dir = PANGO_DIRECTION_LTR;
context_ = pango_context_new ();
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/learning.tely
+++ lilypond-2.14.2/Documentation/learning.tely
@@ -13,6 +13,11 @@
@documentlanguage en
@afourpaper
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Learning Manual: (lilypond-learning). Start here.
+@end direntry
+
@macro manualIntro
This file provides an introduction to LilyPond version
@version{}.
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/music-glossary.tely
+++ lilypond-2.14.2/Documentation/music-glossary.tely
@@ -6,6 +6,11 @@
@documentlanguage en
@afourpaper
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* Music Glossary: (music-glossary). For non-English users.
+@end direntry
+
@macro manualIntro
This glossary provides definitions and translations of musical
terms used in the documentation manuals for LilyPond version
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/usage.tely
+++ lilypond-2.14.2/Documentation/usage.tely
@@ -13,6 +13,18 @@
@documentlanguage en
@afourpaper
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
+* lilypond: (lilypond-usage)Running lilypond. Invoking the LilyPond program.
+* abc2ly: (lilypond-usage)Invoking abc2ly. Importing ABC.
+* convert-ly: (lilypond-usage)Updating files with convert-ly. Older
Bug#696608: unlock: lilypond/2.14.2-4 (preapproval)
On Mon, Dec 24, 2012 at 19:43:58 +, Adam D. Barratt wrote: Control: tags -1 + confirmed On 23.12.2012 21:31, Don Armstrong wrote: In making a fix to the RC bug #684817, I also fixed a problem in disabling optimization when noopt is present, and a patch which fixes an install-info warning which had previously collected. I'd be okay with accepting those. Please go ahead; thanks. Ping? Cheers, Julien signature.asc Description: Digital signature
Bug#696608: unlock: lilypond/2.14.2-4 (preapproval)
On Sat, 19 Jan 2013, Julien Cristau wrote: On Mon, Dec 24, 2012 at 19:43:58 +, Adam D. Barratt wrote: Control: tags -1 + confirmed On 23.12.2012 21:31, Don Armstrong wrote: In making a fix to the RC bug #684817, I also fixed a problem in disabling optimization when noopt is present, and a patch which fixes an install-info warning which had previously collected. I'd be okay with accepting those. Please go ahead; thanks. Ping? Sorry, I actually have to change the patch for this after talking to upstream. It's going to be relatively trivial still, but slightly different. I just haven't had a chance to completely test it yet. Don Armstrong -- There are two major products that come out of Berkeley: LSD and UNIX. We don't believe this to be a coincidence. -- Jeremy S. Anderson http://www.donarmstrong.com http://rzlab.ucr.edu -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#696608: unlock: lilypond/2.14.2-4 (preapproval)
Control: tags -1 + confirmed On 23.12.2012 21:31, Don Armstrong wrote: In making a fix to the RC bug #684817, I also fixed a problem in disabling optimization when noopt is present, and a patch which fixes an install-info warning which had previously collected. I'd be okay with accepting those. Please go ahead; thanks. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#696608: unlock: lilypond/2.14.2-4 (preapproval)
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
In making a fix to the RC bug #684817, I also fixed a problem in
disabling optimization when noopt is present, and a patch which fixes
an install-info warning which had previously collected.
The first is necessary, but the second two would be nice to have, and
don't introduce anything that is particularly odd to the package.
[However, I can strip both of them out if it is not ok at this point
in the release; I only hadn't added them before because I had to fix
#684817 first.]
Diff attached for proposed upload to unstable.
Don Armstrong
--
My spelling ability, or rather the lack thereof, is one of the wonders
of the modern world.
http://www.donarmstrong.com http://rzlab.ucr.edu
diff -u lilypond-2.14.2/debian/control lilypond-2.14.2/debian/control
--- lilypond-2.14.2/debian/control
+++ lilypond-2.14.2/debian/control
@@ -17,6 +17,8 @@
Maintainer: Don Armstrong d...@debian.org
Standards-Version: 3.9.2
Homepage: http://lilypond.org/
+Vcs-Git: git://git.donarmstrong.com/lilypond.git
+Vcs-Browser: http://git.donarmstrong.com/lilypond.git
Package: lilypond
Architecture: any
diff -u lilypond-2.14.2/debian/changelog lilypond-2.14.2/debian/changelog
--- lilypond-2.14.2/debian/changelog
+++ lilypond-2.14.2/debian/changelog
@@ -1,6 +1,18 @@
+lilypond (2.14.2-4) unstable; urgency=low
+
+ * Fix warnings from install-info by splitting the direntry sections
+across the texinfo files (Closes: #648689). Thanks to Julian Gilbey
+for the patch.
+ * Fix noopt support to use --disable-optimising as ./configure does
+crazy things.
+ * Make sure that the guile garbage collection does not collect s in
+font-metric.cc when it gets optimized away (closes: #684817)
+
+ -- Don Armstrong d...@donarmstrong.com Sun, 23 Dec 2012 13:25:44 -0800
+
lilypond (2.14.2-3) unstable; urgency=low
- * Fix redefinition of s in Music_sequence::first_start. (Closes
+ * Fix redefinition of s in Music_sequence::first_start. (Closes:
#672087).
-- Don Armstrong d...@debian.org Sun, 13 May 2012 16:07:16 -0700
diff -u lilypond-2.14.2/debian/rules lilypond-2.14.2/debian/rules
--- lilypond-2.14.2/debian/rules
+++ lilypond-2.14.2/debian/rules
@@ -56,8 +56,12 @@
CFLAGS := $(filter-out -O%, $(CFLAGS))
CXXFLAGS := $(filter-out -O%, $(CXXFLAGS))
else
+ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))
+ config_opt = --disable-optimising
+else
config_opt = --enable-optimising
endif
+endif
build: build-stamp
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/essay.tely
+++ lilypond-2.14.2/Documentation/essay.tely
@@ -13,6 +13,11 @@
@documentlanguage en
@afourpaper
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Engraving Functions: (lilypond-essay). Automatic engraving functions within LilyPond.
+@end direntry
+
@macro manualIntro
This essay discusses automatic music engraving functions within
LilyPond version @version{}.
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/changes.tely
+++ lilypond-2.14.2/Documentation/changes.tely
@@ -29,6 +29,11 @@
@end macro
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Changes: (lilypond-changes). Changes to recent versions.
+@end direntry
+
@documentencoding utf-8
@documentlanguage en
@afourpaper
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/web.texi
+++ lilypond-2.14.2/Documentation/web.texi
@@ -56,20 +56,8 @@
@c expected to be found in lilypond/ subdirectory.
@dircategory GNU LilyPond --- the music typesetter
@direntry
-* LilyPond Learning Manual: (lilypond-learning). Start here.
-* Music Glossary: (music-glossary). For non-English users.
-* LilyPond: (lilypond-notation). LilyPond Notation Reference.
-* LilyPond Snippets: (lilypond-snippets). Short tricks, tips, and examples.
* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking.
-* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
* LilyPond Website: (lilypond-web).Preview of new website.
-* lilypond: (lilypond-usage)Running lilypond. Invoking the LilyPond program.
-* abc2ly: (lilypond-usage)Invoking abc2ly. Importing ABC.
-* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond-usage)Invoking etf2ly. Importing Finale.
-* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
-* midi2ly: (lilypond-usage)Invoking midi2ly.Importing MIDI.
-* musicxml2ly: (lilypond-usage)Invoking musicxml2ly. Importing MusicXML.
@end direntry
only in patch2:
unchanged:
--- lilypond-2.14.2.orig/Documentation/extending.tely
+++ lilypond-2.14.2/Documentation/extending.tely
@@ -13,6 +13,11 @@
@documentlanguage en
@afourpaper
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
