SOURCES: lilypond-afm.patch, lilypond-info.patch, lilypond-po.patc...

qboosh qboosh at pld-linux.org
Mon Nov 20 23:18:05 CET 2006


Author: qboosh                       Date: Mon Nov 20 22:18:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.10.0

---- Files affected:
SOURCES:
   lilypond-afm.patch (1.1 -> 1.2) , lilypond-info.patch (1.13 -> 1.14) , lilypond-po.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/lilypond-afm.patch
diff -u SOURCES/lilypond-afm.patch:1.1 SOURCES/lilypond-afm.patch:1.2
--- SOURCES/lilypond-afm.patch:1.1	Fri Sep  1 00:06:47 2006
+++ SOURCES/lilypond-afm.patch	Mon Nov 20 23:18:00 2006
@@ -1,8 +1,8 @@
---- lilypond-2.8.6/mf/GNUmakefile.orig	2006-05-09 12:11:16.000000000 +0200
-+++ lilypond-2.8.6/mf/GNUmakefile	2006-08-31 22:44:43.946210000 +0200
-@@ -156,4 +156,4 @@
- $(NCSB_OTFS): $(NCSB_SOURCE_FILES) $(buildscript-dir)/pfx2ttf.fontforge
- 	$(foreach i,$(NCSB_SOURCE_FILES), \
+--- lilypond-2.10.0/mf/GNUmakefile.orig	2006-11-10 14:44:26.000000000 +0100
++++ lilypond-2.10.0/mf/GNUmakefile	2006-11-20 20:37:29.872935500 +0100
+@@ -155,4 +155,4 @@
+ $(NCSB_OTFS): $(NCSB_SOURCE_FILES)  $(buildscript-dir)/pfx2ttf.fontforge
+ 	$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
  		$(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
--	$(i) $(basename $(i)).afm $(outdir)/ && ) true
-+	$(i) $(dir $(i))afm/$(notdir $(basename $(i))).afm $(outdir)/ && ) true
+-			$(i).pfb $(i).afm $(outdir)/ && ) true
++			$(i).pfb $(dir $(i))afm/$(notdir $(i)).afm $(outdir)/ && ) true

================================================================
Index: SOURCES/lilypond-info.patch
diff -u SOURCES/lilypond-info.patch:1.13 SOURCES/lilypond-info.patch:1.14
--- SOURCES/lilypond-info.patch:1.13	Fri Sep  1 00:04:11 2006
+++ SOURCES/lilypond-info.patch	Mon Nov 20 23:18:00 2006
@@ -1,19 +1,17 @@
---- lilypond-2.8.6/Documentation/user/converters.itely.orig	2006-05-09 09:29:11.000000000 +0200
-+++ lilypond-2.8.6/Documentation/user/converters.itely	2006-08-31 21:34:37.783341250 +0200
-@@ -22,17 +22,17 @@
+--- lilypond-2.10.0/Documentation/user/converters.itely.orig	2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/converters.itely	2006-11-20 20:07:34.356722750 +0100
+@@ -25,16 +25,16 @@
  
  
  @menu
 -* Invoking midi2ly::            Importing MIDI.
 -* Invoking etf2ly::             Importing Finale.
 -* Invoking musicxml2ly::        
--* Invoking abc2ly::             Importing ABC.          
--* Invoking mup2ly::             Importing MUP. 
+-* Invoking abc2ly::             Importing ABC.      
 +* midi2ly::                     Importing MIDI.
 +* etf2ly::                      Importing Finale.
 +* musicxml2ly::                 
-+* abc2ly::                      Importing ABC.
-+* mup2ly::                      Importing MUP.
++* abc2ly::                      Importing ABC.      
  * Generating LilyPond files::   
  @end menu
  
@@ -24,7 +22,7 @@
  @section Invoking @command{midi2ly}
  
  @cindex MIDI
-@@ -119,7 +119,7 @@
+@@ -121,7 +121,7 @@
  to a single duration and add phrase markings or pedal indicators.
  
  
@@ -33,7 +31,7 @@
  @section Invoking @command{etf2ly}
  
  @cindex ETF
-@@ -158,7 +158,7 @@
+@@ -160,7 +160,7 @@
  The list of articulation scripts is incomplete.  Empty measures
  confuse @command{etf2ly}.  Sequences of grace notes are ended improperly.
  
@@ -42,7 +40,7 @@
  @section Invoking @code{musicxml2ly}
  
  @uref{http://@/www.@/recordarde@/.com/xml@/.html,MusicXML} is an XML dialect
-@@ -182,7 +182,7 @@
+@@ -184,7 +184,7 @@
  print version information.
  @end table
  
@@ -51,19 +49,10 @@
  @section Invoking @code{abc2ly}
  
  @cindex ABC
-@@ -243,7 +243,7 @@
- @command{abc2ly} ignores the ABC beaming.
- 
- 
-- at node Invoking mup2ly
-+ at node mup2ly
- @section Invoking @command{mup2ly}
- 
- Mup (Music Publisher) is a shareware music notation program by Arkkra
---- lilypond-2.8.6/Documentation/user/invoking.itely.orig	2006-05-09 09:29:11.000000000 +0200
-+++ lilypond-2.8.6/Documentation/user/invoking.itely	2006-08-31 21:36:42.315124000 +0200
-@@ -8,7 +8,7 @@
- 
+--- lilypond-2.10.0/Documentation/user/running.itely.orig	2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/running.itely	2006-11-20 20:08:46.477230000 +0100
+@@ -20,7 +20,7 @@
+ you are unfamiliar with the command-line.
  
  @menu
 -* Invoking lilypond::           
@@ -71,7 +60,7 @@
  * Notes for the MacOS X app::   
  * Updating files with convert-ly::  
  * Reporting bugs::              
-@@ -17,7 +17,7 @@
+@@ -29,7 +29,7 @@
  * Point and click::             
  @end menu
  
@@ -80,18 +69,18 @@
  @section Invoking lilypond
  @cindex Invoking LilyPond
  @cindex command line options
---- lilypond-2.8.6/Documentation/user/lilypond-book.itely.orig	2006-05-02 13:25:52.000000000 +0200
-+++ lilypond-2.8.6/Documentation/user/lilypond-book.itely	2006-08-31 21:37:00.248244750 +0200
-@@ -36,7 +36,7 @@
- * Integrating Texinfo and music::
- * Integrating HTML and music::
- * Music fragment options::
--* Invoking lilypond-book::
-+* lilypond-book::
- * Filename extensions::
- @end menu
- 
-@@ -294,7 +294,7 @@
+--- lilypond-2.10.0/Documentation/user/lilypond-book.itely.orig	2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/lilypond-book.itely	2006-11-20 20:09:06.130458250 +0100
+@@ -37,7 +37,7 @@
+ * Integrating HTML and music::  
+ * Integrating DocBook and music::
+ * Music fragment options::      
+-* Invoking lilypond-book::      
++* lilypond-book::      
+ * Filename extensions::         
+ * Many quotes of a large score::  
+ * Inserting LilyPond output into other programs::  
+@@ -299,7 +299,7 @@
  
  @noindent
  where the @var{file}@command{psfonts} file is obtained from
@@ -100,7 +89,7 @@
  can then be produced with a PostScript to PDF translator like
  @code{ps2pdf} (which is part of GhostScript).  Running @command{dvips}
  will produce some warnings about fonts; these are harmless and may
-@@ -557,7 +557,7 @@
+@@ -677,7 +677,7 @@
  @end table
  
  
@@ -109,7 +98,7 @@
  @section Invoking @command{lilypond-book}
  
  @command{lilypond-book} produces a file with one of the following
-@@ -677,7 +677,7 @@
+@@ -802,7 +802,7 @@
  
  You can use any filename extension for the input file, but if you do not
  use the recommended extension for a particular format you may need to
@@ -118,22 +107,22 @@
  details.  Otherwise, @command{lilypond-book} automatically selects the
  output format based on the input filename's extension.
  
---- lilypond-2.8.6/Documentation/user/lilypond.tely.orig	2006-05-09 09:29:11.000000000 +0200
-+++ lilypond-2.8.6/Documentation/user/lilypond.tely	2006-08-31 21:38:18.621142750 +0200
-@@ -5,15 +5,15 @@
- @afourpaper
- @end iftex
- 
-- at dircategory GNU music project
-+ at dircategory Miscellaneous:
+--- lilypond-2.10.0/Documentation/user/lilypond.tely.orig	2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/lilypond.tely	2006-11-20 20:15:39.171021750 +0100
+@@ -26,15 +26,15 @@
+ @c
+ @c Info files are installed in subdirectories to allow images to be present. 
+ @c 
+- at dircategory LilyPond
++ at dircategory LilyPond:
  @direntry
 -* LilyPond: (lilypond/lilypond).           The GNU music typesetter.
--* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.          
+-* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.      
 -* convert-ly: (lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
 -* etf2ly: (lilypond/lilypond)Invoking etf2ly.          Importing Finale.
 -* lilypond-book: (lilypond/lilypond)LilyPond-book.     Itegrating text and music.
 -* midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
--* mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup. 
+-* mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup.
 +* LilyPond: (lilypond/lilypond).	The GNU music typesetter
 +* abc2ly: (lilypond/lilypond)abc2ly.	Importing ABC
 +* convert-ly: (lilypond/lilypond)convert-ly.	Older LilyPond versions
@@ -143,29 +132,40 @@
 +* mup2ly: (lilypond/lilypond)mup2ly.	Importing Mup
  @end direntry
  
- 
---- lilypond-2.6.4/Documentation/user/music-glossary.tely.orig	2005-08-25 13:12:54.000000000 +0200
-+++ lilypond-2.6.4/Documentation/user/music-glossary.tely	2005-10-29 20:36:59.482078520 +0200
+ @c don't remove this comment.
+--- lilypond-2.10.0/Documentation/user/music-glossary.tely.orig	2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/music-glossary.tely	2006-11-20 20:16:07.108767750 +0100
 @@ -6,9 +6,9 @@
- @documentencoding utf-8
  @documentlanguage en
  
-- at dircategory GNU music project
-+ at dircategory Miscellaneous:
+ @c see lilypond.tely for info installation note
+- at dircategory LilyPond
++ at dircategory LilyPond:
  @direntry
 -* Glossary: (lilypond/music-glossary).  Glossary of music terms.
-+* Glossary: (music-glossary).		Glossary of music terms
++* Glossary: (lilypond/music-glossary).	Glossary of music terms
  @end direntry
  
  @ifhtml
---- lilypond-2.6.4/scm/documentation-lib.scm.orig	2005-06-14 02:44:14.000000000 +0200
-+++ lilypond-2.6.4/scm/documentation-lib.scm	2005-10-29 20:44:44.211428920 +0200
+--- lilypond-2.10.0/Documentation/user/non-music.itely.orig	2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/non-music.itely	2006-11-20 22:02:52.933106750 +0100
+@@ -178,7 +178,7 @@
+ @code{-dclip-systems}. The clips are output as EPS files, and are
+ converted to PDF and PNG if these formats are switched on as well.
+ 
+-For more information on output formats, see @ref{Invoking lilypond}.
++For more information on output formats, see @ref{lilypond}.
+ 
+ @seealso
+ 
+--- lilypond-2.10.0/scm/documentation-lib.scm.orig	2006-11-10 14:44:26.000000000 +0100
++++ lilypond-2.10.0/scm/documentation-lib.scm	2006-11-20 20:16:58.303967250 +0100
 @@ -111,10 +111,10 @@
     "\\input texinfo @c -*-texinfo-*-"
     "\n at setfilename " file-name ".info"
     "\n at settitle " name
--   "\n at dircategory GNU music project"
-+   "\n at dircategory Miscellaneous:"
+-   "\n at dircategory LilyPond"
++   "\n at dircategory LilyPond:"
     "\n at direntry"
     ;; prepend GNU for dir, must be unique
 -   "\n* GNU " name ": (" file-name ").          " name "."

================================================================
Index: SOURCES/lilypond-po.patch
diff -u SOURCES/lilypond-po.patch:1.3 SOURCES/lilypond-po.patch:1.4
--- SOURCES/lilypond-po.patch:1.3	Fri Sep  1 00:04:11 2006
+++ SOURCES/lilypond-po.patch	Mon Nov 20 23:18:00 2006
@@ -1,5 +1,5 @@
---- lilypond-2.8.6/po/it.po.orig	2006-03-20 12:55:22.000000000 +0100
-+++ lilypond-2.8.6/po/it.po	2006-08-31 21:43:36.264994250 +0200
+--- lilypond-2.10.0/po/it.po.orig	2006-11-10 14:44:26.000000000 +0100
++++ lilypond-2.10.0/po/it.po	2006-11-20 20:33:38.826496000 +0100
 @@ -2,14 +2,17 @@
  # Tineke de Munnik <jantien at xs4all.nl>, 1998.
  # Modified by Maurizio Umberto Puxeddu <umbpux at tin.it>, Feb1999
@@ -7,9 +7,9 @@
 -#, fuzzy
  msgid ""
  msgstr ""
++"Project-Id-Version: lilypond 2.10.0\n"
  "Report-Msgid-Bugs-To: \n"
-+"Project-Id-Version: lilypond 2.8.6\n"
- "POT-Creation-Date: 2006-03-20 12:53+0100\n"
+ "POT-Creation-Date: 2006-10-08 16:22+0200\n"
 +"PO-Revision-Date: 1998-05-30 00:17:12+0200\n"
 +"Last-Translator: <jantien at xs4all.nl>\n"
 +"Language-Team: Italian\n"
@@ -21,23 +21,3 @@
  "Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po/"
  "out --add-comments --keyword=_ --keyword=_f\n"
  "Files: bow.cc int.cc\n"
-diff -u lilypond-2.2.4/po.orig/ru.po lilypond-2.2.4/po/ru.po
---- lilypond-2.2.4/po.orig/ru.po	Thu Oct 30 00:32:56 2003
-+++ lilypond-2.2.4/po/ru.po	Tue Aug  3 16:29:45 2004
-@@ -2,7 +2,6 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
-@@ -12,7 +11,7 @@
- "Language-Team: Russian <ru at li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=koi8-r\n"
--"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- #. this is where special info is often stored
- #. ###############################################################
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lilypond-afm.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/lilypond-info.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SOURCES/lilypond-po.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list