lilypond: images broken in info docs

Wed Jan 14 11:07:36 UTC 2009

Package: lilypond
Version: 2.10.33-2.2build1
Severity: normal
Tags: patch

The images do not work in the info docs: viewing
the lilypond docs with Emacs 22, you see

     [image of music]

due to a missing symlink (or set of symlinks with 2.10).

As a new major upstream release is available: 2.12,
may I suggest using something like attached patch
to also fix the images in the info documentation?

With 2.12, it takes only one symlink to fix this

     # Add symlink for Emacs/info to find images
       (cd $(CURDIR)/$(r_doc)/usr/share/info && rm -f lilypond && ln -sf ../doc/lilypond/html/Documentation/user lilypond)

Greetings,
Jan.
	    

-- System Information:
Debian Release: lenny/sid
  APT prefers intrepid-updates
  APT policy: (500, 'intrepid-updates'), (500, 'intrepid-security'), (500, 'intrepid-backports'), (500, 'intrepid')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.27-9-generic (SMP w/2 CPU cores)
Locale: LANG=nl_NL.UTF-8, LC_CTYPE=nl_NL.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages lilypond depends on:
ii  guile-1.8       1.8.5+1-3ubuntu1         The GNU extension language and Sch
ii  guile-1.8-libs  1.8.5+1-3ubuntu1         Main Guile libraries
ii  libc6           2.8~20080505-0ubuntu7    GNU C Library: Shared libraries
ii  libfontconfig1  2.6.0-1ubuntu4           generic font configuration library
ii  libfreetype6    2.3.7-2ubuntu1           FreeType 2 font engine, shared lib
ii  libgcc1         1:4.3.2-1ubuntu11        GCC support library
ii  libglib2.0-0    2.18.2-0ubuntu2          The GLib library of C routines
ii  libgmp3c2       2:4.2.2+dfsg-3ubuntu1    Multiprecision arithmetic library
ii  libltdl7        2.2.4-0ubuntu4           A system independent dlopen wrappe
ii  libpango1.0-0   1.22.2-0ubuntu1          Layout and rendering of internatio
ii  libstdc++6      4.3.2-1ubuntu11          The GNU Standard C++ Library v3
ii  lilypond-data   2.10.33-2.2build1        LilyPond music typesetter (data fi
ii  python          2.5.2-1ubuntu1           An interactive high-level object-o
ii  zlib1g          1:1.2.3.3.dfsg-12ubuntu1 compression library - runtime

Versions of packages lilypond recommends:
ii  lilypond-doc           2.10.33-2.2build1 LilyPond Documentation in HTML, PS

-- no debconf information
-------------- next part --------------
diff -purN -x'*~' lilypond-2.10.33/debian/changelog lilypond-2.12.1/debian/changelog

--- lilypond-2.10.33/debian/changelog	2009-01-13 21:30:03.000000000 +0100
+++ lilypond-2.12.1/debian/changelog	2009-01-13 15:13:48.000000000 +0100
@@ -1,3 +1,10 @@
+lilypond (2.12.1-1) intrepid; urgency=low
+
+  * New upstream release.
+  * Make images in info work again.
+
+ -- Jan Nieuwenhuizen <janneke at gnu.org>  Mon, 12 Jan 2009 20:12:15 +0100
+
 lilypond (2.10.33-2.2build1) intrepid; urgency=low
 
   * Rebuild against thread-enabled guile-1.8.
diff -purN -x'*~' lilypond-2.10.33/debian/lilypond-doc.doc-base lilypond-2.12.1/debian/lilypond-doc.doc-base
--- lilypond-2.10.33/debian/lilypond-doc.doc-base	2009-01-13 15:20:12.000000000 +0100
+++ lilypond-2.12.1/debian/lilypond-doc.doc-base	2009-01-14 10:15:37.000000000 +0100
@@ -11,5 +11,5 @@ Index: /usr/share/doc/lilypond/html/inde
 Files: /usr/share/doc/lilypond/html/*.html /usr/share/doc/lilypond/html/Documentation/out-www/*.html  /usr/share/doc/lilypond/html/Documentation/*/out-www/*.html
 
 Format: info
-Index: /usr/share/info/lilypond/lilypond.info.gz
-Files: /usr/share/info/lilypond/lilypond.info* /usr/share/info/lilypond/lilypond-internals.info* /usr/share/info/lilypond/music-glossary.info.gz
+Index: /usr/share/info/lilypond.info.gz
+Files: /usr/share/info/lilypond.info* /usr/share/info/lilypond-internals.info* /usr/share/info/lilypond-program.info.gz /usr/share/info/lilypond-learning.info.gz /usr/share/info/lilypond-snippets.info.gz /usr/share/info/music-glossary.info.gz
diff -purN -x'*~' lilypond-2.10.33/debian/rules lilypond-2.12.1/debian/rules
--- lilypond-2.10.33/debian/rules	2009-01-13 15:20:12.000000000 +0100
+++ lilypond-2.12.1/debian/rules	2009-01-14 10:18:21.000000000 +0100
@@ -73,11 +73,14 @@ clean:
 	rm -f build-stamp build-doc-stamp
 	[ ! -f Makefile ] || $(MAKE) WWW-clean top-WWW-clean
 	[ ! -f Makefile ] || $(MAKE) distclean
-	-rm lib/python
-	-rm -f ./stepmake/bin/config.guess ./stepmake/bin/config.guess.sub
+	-rm -f ./stepmake/bin/config.guess ./stepmake/bin/config.sub
 
 	# Still not clean enough?  Let's use... BRUTE STRENGTH!  :-)
 	find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf
+	find buildscripts python scripts -name '*.pyc' | xargs rm -f
+	rm -f config.log config.status config.status.lineno
+	rm -f local.make GNUmakefile
+	rm -f input/lsr/lilypond-snippets Documentation/user/lilypond
 	rm -f lib/lilypond/python examples.html
 	rm -f debian/emacsen-startup
 	rm -f debian/lilypond1.7*.dirs debian/lilypond.dirs
@@ -115,13 +118,8 @@ binary-indep: build-doc install
 	dh_testroot
 	# Install LilyPond web documentation...
 	$(MAKE) prefix=$(CURDIR)/$(r_doc)/usr webdir=$(CURDIR)/$(r_doc)/$(d)/html out=www web-install
-
-	# Add symlinks to the LilyPond logo PNGs ...
-#	cd $(r_doc)/$(d) \
-#	    && cp -s html/Documentation/pictures/out-www/*.png .
-#	# Copy the DVI docs too ...
-#	cp -a `find Documentation -name '*.dvi' ! -name 'lily-[0-9]*.dvi'` \
-#		$(r_doc)/$(d)/
+	# Add symlink for Emacs/info to find images
+	(cd $(CURDIR)/$(r_doc)/usr/share/info && rm -f lilypond && ln -sf ../doc/lilypond/html/Documentation/user lilypond)
 	dh_installdocs
 	dh_installemacsen
 	dh_scrollkeeper
@@ -183,3 +181,4 @@ binary-arch: build install
 #	dh_installcron
 #	dh_installman
 #	dh_undocumented
+	echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(VERSION)-1' > ChangeLog
	dh_installchangelogs ChangeLog
 
 	dh_strip
 	dh_compress
