Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16618

Modified Files:
        lilypond-devel.info lilypond-devel.patch 
Log Message:
New upstream version

Index: lilypond-devel.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond-devel.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lilypond-devel.patch        3 Dec 2006 06:49:18 -0000       1.5
+++ lilypond-devel.patch        26 Dec 2006 06:21:47 -0000      1.6
@@ -1,6 +1,6 @@
-diff -ruN lilypond-2.9.16-orig/Documentation/user/lilypond.tely 
lilypond-2.9.16/Documentation/user/lilypond.tely
---- lilypond-2.9.16-orig/Documentation/user/lilypond.tely      2006-08-26 
20:47:12.000000000 -0700
-+++ lilypond-2.9.16/Documentation/user/lilypond.tely   2006-08-26 
20:47:43.000000000 -0700
+diff -ruN lilypond-2.10.5-orig/Documentation/user/lilypond.tely 
lilypond-2.10.5/Documentation/user/lilypond.tely
+--- lilypond-2.10.5-orig/Documentation/user/lilypond.tely      2006-12-25 
20:04:11.000000000 -0800
++++ lilypond-2.10.5/Documentation/user/lilypond.tely   2006-12-25 
20:43:40.000000000 -0800
 @@ -28,13 +28,13 @@
  @c 
  @dircategory LilyPond
@@ -22,9 +22,9 @@
  @end direntry
  
  @c don't remove this comment.
-diff -ruN lilypond-2.9.16-orig/Documentation/user/music-glossary.tely 
lilypond-2.9.16/Documentation/user/music-glossary.tely
---- lilypond-2.9.16-orig/Documentation/user/music-glossary.tely        
2006-08-26 20:47:12.000000000 -0700
-+++ lilypond-2.9.16/Documentation/user/music-glossary.tely     2006-08-26 
20:47:43.000000000 -0700
+diff -ruN lilypond-2.10.5-orig/Documentation/user/music-glossary.tely 
lilypond-2.10.5/Documentation/user/music-glossary.tely
+--- lilypond-2.10.5-orig/Documentation/user/music-glossary.tely        
2006-12-25 20:04:11.000000000 -0800
++++ lilypond-2.10.5/Documentation/user/music-glossary.tely     2006-12-25 
20:43:40.000000000 -0800
 @@ -17,6 +17,11 @@
  and as @uref{source/Documentation/user/music-glossary.html,one big page}.
  @end ifhtml
@@ -37,21 +37,21 @@
  @titlepage
  @title Music Glossary
  @author Christian Mondrup   @c Original author of LilyPond glossary
-diff -ruN lilypond-2.9.16-orig/aclocal.m4 lilypond-2.9.16/aclocal.m4
---- lilypond-2.9.16-orig/aclocal.m4    2006-08-26 20:47:16.000000000 -0700
-+++ lilypond-2.9.16/aclocal.m4 2006-08-26 21:43:45.000000000 -0700
+diff -ruN lilypond-2.10.5-orig/aclocal.m4 lilypond-2.10.5/aclocal.m4
+--- lilypond-2.10.5-orig/aclocal.m4    2006-12-25 20:04:12.000000000 -0800
++++ lilypond-2.10.5/aclocal.m4 2006-12-25 20:43:40.000000000 -0800
 @@ -34,7 +34,7 @@
      ## grab the first version number in  --version output.
      eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| 
\)[0-9][0-9]*\.[0-9]' \
          | head -n 1 \
--      | tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 
's/\([0-9.]*\).*/\1/g'\`\"
-+      | tr ' ' '\n' | grep '^[0-9][0-9]*\.[0-9]' | head -n 1 | sed 
's/\([0-9.]*\).*/\1/g'\`\"
+-      | tr ' ' '\n' | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g' | grep 
'\(^\| \)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
++      | tr ' ' '\n' | sed 
's/\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\)\?.*/\1\2/g' | grep '\(^\| 
\)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
  
      if test -z "$_ver"; then
          ## If empty, try date [fontforge]
-diff -ruN lilypond-2.9.16-orig/config.make.in lilypond-2.9.16/config.make.in
---- lilypond-2.9.16-orig/config.make.in        2006-08-26 20:47:16.000000000 
-0700
-+++ lilypond-2.9.16/config.make.in     2006-08-26 20:47:43.000000000 -0700
+diff -ruN lilypond-2.10.5-orig/config.make.in lilypond-2.10.5/config.make.in
+--- lilypond-2.10.5-orig/config.make.in        2006-12-25 20:04:12.000000000 
-0800
++++ lilypond-2.10.5/config.make.in     2006-12-25 20:43:40.000000000 -0800
 @@ -28,7 +28,7 @@
  FREETYPE2_LIBS = @FREETYPE2_LIBS@
  PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
@@ -70,26 +70,15 @@
  package_libdir = $(libdir)/$(package)
  package_docdir = $(docdir)/$(package)
  package_omfdir = $(omfdir)/$(package)
-diff -ruN lilypond-2.9.16-orig/stepmake/aclocal.m4 
lilypond-2.9.16/stepmake/aclocal.m4
---- lilypond-2.9.16-orig/stepmake/aclocal.m4   2006-08-26 20:47:13.000000000 
-0700
-+++ lilypond-2.9.16/stepmake/aclocal.m4        2006-08-26 21:43:45.000000000 
-0700
+diff -ruN lilypond-2.10.5-orig/stepmake/aclocal.m4 
lilypond-2.10.5/stepmake/aclocal.m4
+--- lilypond-2.10.5-orig/stepmake/aclocal.m4   2006-12-25 20:04:12.000000000 
-0800
++++ lilypond-2.10.5/stepmake/aclocal.m4        2006-12-25 20:43:40.000000000 
-0800
 @@ -34,7 +34,7 @@
      ## grab the first version number in  --version output.
      eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| 
\)[0-9][0-9]*\.[0-9]' \
          | head -n 1 \
--      | tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 
's/\([0-9.]*\).*/\1/g'\`\"
-+      | tr ' ' '\n' | grep '^[0-9]\.[0-9]' | head -n 1 | sed 
's/\([0-9.]*\).*/\1/g'\`\"
+-      | tr ' ' '\n' | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g' | grep 
'\(^\| \)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
++      | tr ' ' '\n' | sed 
's/\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\)\?.*/\1\2/g' | grep '\(^\| 
\)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
  
      if test -z "$_ver"; then
          ## If empty, try date [fontforge]
-diff -ruN lilypond-2.9.16-orig/stepmake/stepmake/c++-rules.make 
lilypond-2.9.16/stepmake/stepmake/c++-rules.make
---- lilypond-2.9.16-orig/stepmake/stepmake/c++-rules.make      2006-08-26 
20:47:13.000000000 -0700
-+++ lilypond-2.9.16/stepmake/stepmake/c++-rules.make   2006-08-26 
20:47:43.000000000 -0700
-@@ -17,6 +17,7 @@
- 
- $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -o$@ $<
-+      perl -i.bak -pe 's/^class istream;/#include <iostream>;\nusing 
namespace std;/' $@
- 
- $(outdir)/%-rc.o: $(outdir)/%.rc
-       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<

Index: lilypond-devel.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond-devel.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- lilypond-devel.info 17 Dec 2006 22:12:24 -0000      1.15
+++ lilypond-devel.info 26 Dec 2006 06:21:47 -0000      1.16
@@ -1,11 +1,11 @@
 Package: lilypond-devel
-Version: 2.11.0
-Revision: 1002
+Version: 2.11.4
+Revision: 1001
 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
 GCC: 4.0
 BuildDepends: <<
 guile16-dev (>= 1.6.7-1010), libkpathsea4 | system-tetex, 
-flex, libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2), 
+libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2), 
 mftrace (>= 1.2.4-1001), freetype219 (>= 2.1.9-1), 
 pango1-xft2-ft219-dev (>= 1.8.1-5), glib2-dev, bison (>= 2.0-1), 
 fontconfig2-dev (>= 2.2.3-10), expat, pkgconfig
@@ -19,7 +19,7 @@
 Conflicts: lilypond, lilypond-unstable, lilypond-devel, lilypond-devel-tex
 Replaces: lilypond, lilypond-unstable
 Source: http://www.lilypond.org/ftp/v2.11/lilypond-%v.tar.gz
-Source-MD5: e39cb70b23e689b7a2247e1d9acb26a7
+Source-MD5: 83afe0918aebfcfcefee17bf7aa49f80
 Patch: %n.patch
 SetCPPFLAGS: -no-cpp-precomp 
 SetLDFLAGS: -lexpat -L%p/lib/pango-ft219/lib 
@@ -30,6 +30,7 @@
 export PYTHON=%p/bin/python2.4 
 export GUILE=%p/bin/guile-1.6 
 export GUILE_CONFIG=guile-1.6-config
+export FLEX=/usr/bin/flex
 ./autogen.sh %c
 mkdir mf/out
 gnumake 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to