Package: lilypond
Version: 2.10.33-2.3
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: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.26.webdev.nl (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash

Versions of packages lilypond depends on:
pn  guile-1.8              <none>            (no description available)
pn  guile-1.8-libs         <none>            (no description available)
ii  libc6                  2.7-18            GNU C Library: Shared libraries
ii  libfontconfig1         2.6.0-3           generic font configuration library
ii  libfreetype6           2.3.7-2           FreeType 2 font engine, shared lib
ii  libgcc1                1:4.3.2-2         GCC support library
ii  libglib2.0-0           2.16.6-1          The GLib library of C routines
ii  libgmp3c2              2:4.2.2+dfsg-3    Multiprecision arithmetic library
ii  libltdl3               1.5.26-4          A system independent dlopen wrappe
ii  libpango1.0-0          1.20.5-3          Layout and rendering of internatio
ii  libstdc++6             4.3.2-2           The GNU Standard C++ Library v3
pn  lilypond-data          <none>            (no description available)
ii  python                 2.5.2-3           An interactive high-level object-o
ii  zlib1g                 1:1.2.3.3.dfsg-12 compression library - runtime

Versions of packages lilypond recommends:
pn  lilypond-doc                  <none>     (no description available)

lilypond suggests no packages.
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 <jann...@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

Reply via email to