From b5cd9b70a0c936051e93b3e9a0ca9f03d2960714 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Tue, 24 Aug 2010 16:35:44 -0700 Subject: [PATCH] Properly remove empty /usr/share/info/lilypond directory and replace with symlink --- debian/changelog | 3 ++- debian/lilypond-data.postinst | 13 ++++++++++--- debian/rules | 10 +--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3be69f72a..241c6f9cc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ lilypond (2.12.3-7) unstable; urgency=low * Use /dev/stderr instead of /dev/tty (Closes: #574629) * Use py_support to require rebuilds when python's API changes (Closes: #380855) - * Fix broken links in some info documentation + * Properly remove empty /usr/share/info/lilypond directory and replace + with symlink -- Don Armstrong Tue, 24 Aug 2010 15:52:59 -0700 diff --git a/debian/lilypond-data.postinst b/debian/lilypond-data.postinst index f86c19db8c..2b06f9b76b 100644 --- a/debian/lilypond-data.postinst +++ b/debian/lilypond-data.postinst @@ -19,6 +19,13 @@ echo " Running mktexlsr $TEXMFMAIN..." mktexlsr $TEXMFMAIN #DEBHELPER# -echo -echo " $pkg_name configuration completed." -echo " Please read /usr/share/doc/lilypond/README.Debian to get started." +# echo +# echo " $pkg_name configuration completed." +# echo " Please read /usr/share/doc/lilypond/README.Debian to get started." + +if [ "$1" = "configure" ]; then + if [ -d /usr/share/info/lilypond ] && [ ! -L /usr/share/info/lilypond ] \ + && 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 diff --git a/debian/rules b/debian/rules index a481b5d279..ac50d8b899 100755 --- a/debian/rules +++ b/debian/rules @@ -123,16 +123,10 @@ binary-indep: build-doc install -type d -empty -delete dh_installemacsen - #find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) ! -regex '.*/out-www/.*' \ - # -exec cp -a --parents '{}' $(r_data)/$(d)/examples ';' install -m 644 debian/xiao-haizi-guai-guai.ly debian/sakura-sakura.ly \ $(r_data)/$(d)/examples dh_installchangelogs -# mv $(r_data)/usr/share/lilypond/$(VERSION)/fonts/map/lilypond.map \ -# $(r_data)/etc/texmf/dvips/lilypond.map - rmdir $(CURDIR)/debian/lilypond-doc/usr/share/info/lilypond - dh_link usr/share/lilypond/$(VERSION)/tex \ usr/share/texmf/tex/lilypond \ usr/share/lilypond/$(VERSION)/fonts/source \ @@ -144,9 +138,7 @@ binary-indep: build-doc install usr/share/lilypond/$(VERSION)/fonts/type1 \ usr/share/texmf/fonts/type1/public/lilypond \ etc/texmf/dvips/lilypond.map \ - usr/share/lilypond/$(VERSION)/dvips/lilypond.map \ - usr/share/doc/lilypond/ \ - usr/share/doc/lilypond/html/Documentation/user + usr/share/lilypond/$(VERSION)/dvips/lilypond.map dh_pysupport /usr/share/lilypond/${VERSION}/python -- 2.39.2