]> git.donarmstrong.com Git - lilypond.git/commitdiff
*** empty log message ***
authorJan Nieuwenhuizen <janneke@gnu.org>
Tue, 22 Jun 2004 09:24:13 +0000 (09:24 +0000)
committerJan Nieuwenhuizen <janneke@gnu.org>
Tue, 22 Jun 2004 09:24:13 +0000 (09:24 +0000)
18 files changed:
ChangeLog
debian/GNUmakefile
debian/changelog
debian/compat [new file with mode: 0644]
debian/control
debian/copyright
debian/lilypond-data.dirs [new file with mode: 0644]
debian/lilypond-data.doc-base [new file with mode: 0644]
debian/lilypond-data.emacsen-startup [new file with mode: 0644]
debian/lilypond-data.install [new file with mode: 0644]
debian/lilypond-data.postinst [new file with mode: 0644]
debian/lilypond-data.postrm [new file with mode: 0644]
debian/lilypond-doc.postinst [new file with mode: 0644]
debian/lilypond-doc.prerm [new file with mode: 0644]
debian/lilypond.install [new file with mode: 0644]
debian/rules
debian/watch
vim/GNUmakefile

index 13f0e78e508c10274a0843e90ebb55c36d893f5c..adf2f58ac2d1038b590e4873f7c84c17d0eb420c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,18 @@
+2004-06-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * debian/: Apply Debian patch (Anthony Fok).
+
 2004-06-22  Heikki Junes   <hjunes@cc.hut.fi>
 
-        * Documentation/user/music-glossary.tely: fix titling; @top is already
-        an @unnumbered @chapter.
+       * Documentation/user/music-glossary.tely: fix titling; @top is already
+       an @unnumbered @chapter.
  
 2004-06-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
-       * debian/GNUmakefile (#OUTCONF_FILES): update file list.
+       * debian/GNUmakefile (EXTRA_DIST_FILES):
+       (CONF_FILES): update file list.
 
-       * lily/stencil.cc (interpret_stencil_expression): bugfix 
+       * lily/stencil.cc (interpret_stencil_expression): bugfix.
 
 2004-06-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
index ddc7f137a6f4b0ac03c93fc3f24ef1c54e541531..ae868e97a6752e97e0e0a8544daf134748b3dc6f 100644 (file)
@@ -7,7 +7,7 @@ at-dir = $(outdir)/
 at-ext =
 
 CONF_FILES = changelog control copyright emacsen-startup \
-       preinst  rules watch
+       preinst rules watch
 EXTRA_DIST_FILES = README.Debian $(CONF_FILES) \
        control.foka control.potato \
        lilypond.doc-base \
index d4c384b66d7a366aee0258700c19bd2f5ec454b0..b01db3f5581ed6d2a4481c48062760cb9870adcc 100644 (file)
@@ -1,3 +1,33 @@
+lilypond (2.2.2-2) unstable; urgency=low
+
+  * New upstream release.  (Closes: Bug#242861)
+    - Thanks to Pedro Kroeger for providing interim sid packages while
+      I was away for an extended period of time.
+  * Copied some ideas from Ferenc Wagner's LilyPond for woody (Thanks!):
+     - Split out shared data to lilypond-data package.  (Closes: Bug#233406)
+     - Make lilypond-data conflict with earlier lilypond versions.
+     - debian/control: Relaxed autotrace Build-Depends (>= 0.29).
+     - debian/control: Added imagemagick Build-Depends (>= 5.4.4.5).
+  * Added more details to lilypond package description.  (Closes: Bug#245370)
+  * gs-gpl 8.01 (and gs-afpl 8.14) dies when building LilyPond docs.
+    (Known -sDEVICE=bbox bug in gs 8.01 and newer, see gs-gpl Bug#250290.)
+    Added Build-Conflict-Indep: gs-gpl (>= 8.01) | gs-afpl (Closes: Bug#250622)
+  * Build-Depends: fontforge | pfaedit.
+  * debian/watch: Updated to new URL and new format.
+  * vim/GNUmakefile: Install $(vimdir)/*/lilypond.vim scripts with "-m 644".
+
+ -- Anthony Fok <foka@debian.org>  Fri, 18 Jun 2004 02:39:58 +0800
+
+lilypond (2.1.0-2) unstable; urgency=low
+  * A few HTML links in Documentation/user/{introduction,tutorial}.itely
+    went up one too few level in the directory tree, i.e. broken links.
+    Thanks to D. Raleigh Arnold for the bug report.  (Closes: Bug#208208)
+  * Build-Depends: imagemagick; lilypond uses "convert" nowadays.
+    Thanks to Daniel Schepler for the bug report.  (Closes: Bug#221062)
+
+ -- Anthony Fok <foka@debian.org>  Wed, 19 Nov 2003 10:12:16 +0800
+
 lilypond (2.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
@@ -0,0 +1 @@
+4
index d7f0c16c96cfbaa99fa7be1d5ce1201b68c8cd95..c09439f1a61d12b786e4b2c3b25fae18051be915 100644 (file)
@@ -1,6 +1,7 @@
 Source: lilypond
-Build-Depends: debhelper (>= 4.0.0), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20031020-3), autotrace (>= 0.29-1.4), t1utils
-Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1)
+Build-Depends: debhelper (>= 4.0.0), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), fontforge | pfaedit (>= 0.0.20031020-3), autotrace (>= 0.29), t1utils, imagemagick (>= 5.4.4.5)
+Build-Depends-Indep: gs-esp | gs (<= 7.07-1), netpbm (>= 2:9.10-1)
+Build-Conflicts-Indep: gs-gpl (>= 8.01) | gs-afpl
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
@@ -10,22 +11,50 @@ Package: lilypond
 Architecture: any
 Replaces: lilypond1.3
 Provides: lilypond1.3
-Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile-1.6 | guile, ${misc:Depends}
+Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), tetex-extra (>= 1.0-1), python, guile-1.6 | guile, ${misc:Depends}, lilypond-data (= ${Source-Version})
 Recommends: lilypond-doc
 Conflicts: lilypond1.3 (<= 1.3.132-1), musixtex-fonts
-Description: A program for printing sheet music
- LilyPond is a music typesetter.  It produces beautiful sheet music
- using a high level description file as input.  LilyPond is part of 
- the GNU Project.
+Description: A 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.
+ .
+ LilyPond supports many forms of music notation constructs, including
+ chord names, drum notation, figured bass, grace notes, guitar tablature,
+ modern notation (cluster notation and rhythmic grouping), tremolos,
+ (nested) tuplets in arbitrary ratios, and more.
+ .
+ LilyPond's text-based music input language support can integrate into
+ LaTeX, HTML and Texinfo seemlessly, allowing single sheet music
+ or musicological treatises to be written from a single source.  Form and
+ content are separate, and with LilyPond's expert automated formatting,
+ users don't need typographical expertise to produce good notation.
+ .
+ LilyPond produces PostScript and PDF (via TeX) printed output, as well
+ as MIDI for listening pleasures.  LilyPond is exported from the
+ RoseGarden and NoteEdit GUIs, and can import ABC, ETF and MIDI.
+ .
+ LilyPond is part of the GNU Project.
  .
   Home Page: http://lilypond.org/
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 
+Package: lilypond-data
+Section: tex
+Architecture: all
+Depends: tetex-bin
+Recommends: lilypond (= ${Source-Version})
+Conflicts: lilypond (<< 2.2.2-2)
+Description: LilyPond music typesetter (data files)
+ LilyPond is a music typesetter, an automated engraving system.  It
+ produces beautiful sheet music using a high level description file as input.
+ . 
+ This package contains architecture-independent data files for LilyPond.
+
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= ${Source-Version}), postscript-viewer, www-browser
+Suggests: lilypond (>= ${Source-Version}), gv | postscript-viewer, mozilla-browser | www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the
  LilyPond music typesetting software.
@@ -35,8 +64,7 @@ Architecture: arm i386 m68k powerpc sparc
 Depends: lilypond (>= ${Source-Version})
 Description: Dummy package for transition to new stable lilypond
  This dummy package provides a transition from the previous lilypond1.3
- package back to a newer lilypond because the stable 1.4/1.6/1.8 series
- have arrived.
+ package back to a newer lilypond stable releases.
  .
  Please feel free to remove this dummy package after you have upgraded
  to the latest lilypond.
index 5ce05852a309334b97385da995f542e82aa703e1..1d9be19f7832ff2e6b66240f26d6f202fc9e4216 100644 (file)
@@ -7,10 +7,10 @@ but was merged back into the lilypond package
 as of Mon, 16 Apr 2001 21:58:42 -0600
 
 It was downloaded from
-    ftp://ftp.lilypond.org/pub/LilyPond/
+    http://lilypond.org/download/v2.2/lilypond-2.2.2.tar.gz
 
 For more information about GNU LilyPond, please visit:
-    http://www.lilypond.org/
+    http://lilypond.org/
 
 Authors:
       Han-Wen Nienhuys <hanwen@cs.uu.nl>
diff --git a/debian/lilypond-data.dirs b/debian/lilypond-data.dirs
new file mode 100644 (file)
index 0000000..2465286
--- /dev/null
@@ -0,0 +1,2 @@
+usr/share/doc/lilypond/examples
+etc/texmf/dvips
diff --git a/debian/lilypond-data.doc-base b/debian/lilypond-data.doc-base
new file mode 100644 (file)
index 0000000..44f43ae
--- /dev/null
@@ -0,0 +1,11 @@
+Document: lilypond
+Title: GNU LilyPond, the music typesetter
+Author: Various
+Abstract: This documentation describes LilyPond (the GNU Project music
+ typesetter), the LilyPond music input language, and the Mutopia project,
+ a.k.a. "Music To the People."
+Section: Apps/Music
+
+Format: info
+Index: /usr/share/info/lilypond.info.gz
+Files: /usr/share/info/lilypond.info* /usr/share/info/lilypond-internals.info*
diff --git a/debian/lilypond-data.emacsen-startup b/debian/lilypond-data.emacsen-startup
new file mode 100644 (file)
index 0000000..379d566
--- /dev/null
@@ -0,0 +1,3 @@
+(autoload 'LilyPond-mode "lilypond-mode" nil t)
+(setq auto-mode-alist (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
+(add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))
diff --git a/debian/lilypond-data.install b/debian/lilypond-data.install
new file mode 100644 (file)
index 0000000..7cc93b4
--- /dev/null
@@ -0,0 +1,3 @@
+usr/share/lilypond
+usr/share/omf
+usr/share/emacs/site-lisp
diff --git a/debian/lilypond-data.postinst b/debian/lilypond-data.postinst
new file mode 100644 (file)
index 0000000..50a9e72
--- /dev/null
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# postinst script for the Debian GNU/Linux lilypond-data package
+#   by Anthony Fok <foka@debian.org>
+#   Initial release:  Sun, 26 Oct 1997 03:23:00 -0700
+#     Last modified:  Thu, 17 Jun 2004 11:40:36 +0800
+
+set -e
+
+package=lilypond               # This is used for filenames!  Don't change it!
+pkg_name="GNU LilyPond"
+
+std_TEXMFMAIN=/usr/share/texmf # Debian's standard $TEXMFMAIN
+
+TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+
+echo " Running /usr/bin/mktexlsr $TEXMFMAIN..."
+/usr/bin/mktexlsr $TEXMFMAIN
+
+#DEBHELPER#
+echo
+echo " $pkg_name configuration completed."
+echo " Please read /usr/share/doc/lilypond/README.Debian to get started."
diff --git a/debian/lilypond-data.postrm b/debian/lilypond-data.postrm
new file mode 100644 (file)
index 0000000..a6461fb
--- /dev/null
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# postrm script for the Debian GNU/Linux lilypond package
+#   by Anthony Fok <foka@debian.org>
+#   This is free software; see the GNU General Public Licence
+#   version 2 or later for copying conditions.  There is NO warranty.
+#   Last modified:  Tue, 11 May 1999 11:16:35 -0600
+
+set -e
+
+package=lilypond
+font_supplier=public
+font_typeface=lilypond
+std_TEXMFMAIN=/usr/share/texmf
+std_VARTEXFONTS=/var/spool/texmf
+
+#DEBHELPER#
+TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+VARTEXFONTS=`/usr/bin/kpsewhich -expand-var '$VARTEXFONTS'`
+: ${VARTEXFONTS=$std_VARTEXFONTS}
+
+case "$1" in
+    upgrade)
+       # Clear out the old TFM and PK files in case the fonts were modified
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+    ;;
+
+    remove|purge)
+       # Clear out the old TFM and PK files in case the fonts were modified
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+    ;;
+
+    failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+       echo "postrm called with unknown argument \`$1'" >&2
+       exit 0
+    ;;
+esac
diff --git a/debian/lilypond-doc.postinst b/debian/lilypond-doc.postinst
new file mode 100644 (file)
index 0000000..e9f8694
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# postinst script for the Debian GNU/Linux lilypond-doc package
+#   by Anthony Fok <foka@debian.org>
+
+set -e
+
+/usr/sbin/install-info --quiet \
+       --section "Music" "Music" \
+       --description='LilyPond, the GNU Project music typesetter' \
+       /usr/share/info/lilypond.info.gz
+
+#DEBHELPER#
diff --git a/debian/lilypond-doc.prerm b/debian/lilypond-doc.prerm
new file mode 100644 (file)
index 0000000..e2b075d
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+/usr/sbin/install-info --quiet --remove /usr/share/info/lilypond.info.gz
+
+#DEBHELPER#
diff --git a/debian/lilypond.install b/debian/lilypond.install
new file mode 100644 (file)
index 0000000..42724ac
--- /dev/null
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib
+usr/share/locale
+usr/share/man
index c95956fbd1527b66f56ed386c86d740d2674e8d8..04b677b0852383bd698634588020c42cd9afec4f 100644 (file)
@@ -11,6 +11,7 @@ package = lilypond
 
 SHELL = /bin/sh
 r = debian/$(package)
+r_data = debian/$(package)-data
 r_doc = debian/$(package)-doc
 d = usr/share/doc/$(package)
 
@@ -33,9 +34,6 @@ export MAILADDRESS = lilypond@packages.debian.org
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -73,6 +71,10 @@ clean:
 
        # Still not clean enough?  Let's use... BRUTE STRENGTH!  :-)
        find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf
+       rm -f lib/lilypond/python examples.html
+       rm -f debian/emacsen-startup
+       rm -f debian/lilypond1.7*.dirs debian/lilypond.dirs
+       rm -f debian/postinst debian/prerm debian/postrm
 
        dh_clean
 
@@ -81,12 +83,12 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k
+       dh_installdirs
 
        # Add here commands to install the package into debian/tmp.
-       dh_installdirs
-       $(MAKE) prefix=$(PWD)/$(r)/usr MAKE_PFA_FILES=1 install
-       # Ugh, remove hundred music-glossary copies
-#      find . -name 'music-glossary.info-*' | xargs rm -f
+       $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr MAKE_PFA_FILES=1
+
+       dh_install --sourcedir=debian/tmp --list-missing
 
 #      # Change from an absolute symlink to a relative symlink (Lintian)
 #      if [ -L $(r)/usr/share/lilypond/cmtfm ]; then \
@@ -109,8 +111,29 @@ binary-indep: build-doc install
 #      cp -a `find Documentation -name '*.dvi' ! -name 'lily-[0-9]*.dvi'` \
 #              $(r_doc)/$(d)/
        dh_installdocs
+       dh_installemacsen
+       dh_scrollkeeper
+
+       find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) ! -regex '.*/out-www/.*' \
+               -exec cp -a --parents '{}' $(r_data)/$(d)/examples ';'
        dh_installchangelogs
-       dh_link
+
+       mv $(r_data)/usr/share/lilypond/$(VERSION)/dvips/lilypond.map \
+          $(r_data)/etc/texmf/dvips/lilypond.map
+
+       dh_link usr/share/lilypond/$(VERSION)/tex \
+                       usr/share/texmf/tex/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/source \
+                       usr/share/texmf/fonts/source/public/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/afm \
+                       usr/share/texmf/fonts/afm/public/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/tfm \
+                       usr/share/texmf/fonts/tfm/public/lilypond \
+               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
+
        dh_compress -X$(d)/html/
        dh_fixperms
        dh_installdeb
@@ -135,8 +158,6 @@ binary-arch: build install
 
 #      dh_installexamples input
 
-       find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) ! -regex '.*/out-www/.*' \
-               -exec cp -a --parents '{}' $(r)/$(d)/examples ';'
 #      for i in `find $(r)/$(d)/examples/ -type d -name out`; do \
 #              mv -fv $$i/* $$i/..; rmdir $$i; done
 
@@ -148,20 +169,6 @@ binary-arch: build install
 #      dh_undocumented
        dh_installchangelogs ChangeLog
 
-       mv $(r)/usr/share/lilypond/$(VERSION)/dvips/lilypond.map \
-          $(r)/etc/texmf/dvips/lilypond.map
-       dh_link usr/share/lilypond/$(VERSION)/tex \
-                       usr/share/texmf/tex/lilypond \
-               usr/share/lilypond/$(VERSION)/fonts/source \
-                       usr/share/texmf/fonts/source/public/lilypond \
-               usr/share/lilypond/$(VERSION)/fonts/afm \
-                       usr/share/texmf/fonts/afm/public/lilypond \
-               usr/share/lilypond/$(VERSION)/fonts/tfm \
-                       usr/share/texmf/fonts/tfm/public/lilypond \
-               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
        dh_strip
        dh_compress
        dh_fixperms
index 7f3b86469e31b55317d5669f9bfdd35d2b620f87..697cc149626bac1ede8aae677e179cdf75fe13af 100644 (file)
@@ -1,5 +1,6 @@
-# Example watch control file for uscan
+# LilyPond watch control file for uscan
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
 # Site         Directory               Pattern                 Version Script
-ftp.lilypond.org       /pub/LilyPond/v1.9      lilypond-*.tar.gz       debian  uupdate
+version=2
+http://lilypond.org/download/v2.2/lilypond-(.*)\.tar\.gz       debian  uupdate
index 9d3dc74a6de820e35e3be8421d7a11bb46efa0cb..81772b86f40d1a935aafd95d29fec61ec98a1b86 100644 (file)
@@ -20,19 +20,19 @@ include $(depth)/make/stepmake.make
 
 local-install:
        mkdir -p $(vimdir)/compiler
-       $(INSTALL) lilypond-compiler.vim $(vimdir)/compiler/lilypond.vim
+       $(INSTALL) -m 644 lilypond-compiler.vim $(vimdir)/compiler/lilypond.vim
 
        mkdir -p $(vimdir)/ftdetect
-       $(INSTALL) lilypond-ftdetect.vim $(vimdir)/ftdetect/lilypond.vim
+       $(INSTALL) -m 644 lilypond-ftdetect.vim $(vimdir)/ftdetect/lilypond.vim
 
        mkdir -p $(vimdir)/ftplugin
-       $(INSTALL) lilypond-ftplugin.vim $(vimdir)/ftplugin/lilypond.vim
+       $(INSTALL) -m 644 lilypond-ftplugin.vim $(vimdir)/ftplugin/lilypond.vim
 
        mkdir -p $(vimdir)/indent
-       $(INSTALL) lilypond-indent.vim $(vimdir)/indent/lilypond.vim
+       $(INSTALL) -m 644 lilypond-indent.vim $(vimdir)/indent/lilypond.vim
 
        mkdir -p $(vimdir)/syntax
-       $(INSTALL) lilypond-syntax.vim $(vimdir)/syntax/lilypond.vim
+       $(INSTALL) -m 644 lilypond-syntax.vim $(vimdir)/syntax/lilypond.vim
 
 local-uninstall:
        rm $(vimdir)/compiler/lilypond.vim