Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5211/main/finkinfo/text
Modified Files:
Tag: pangocairo-branch
doclifter.info lilypond-devel.info lilypond-devel.patch
lilypond.info lilypond.patch
Log Message:
merge from HEAD
Index: lilypond.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.info,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- lilypond.info 22 Dec 2006 05:02:21 -0000 1.7.2.2
+++ lilypond.info 28 Dec 2006 17:50:22 -0000 1.7.2.3
@@ -1,15 +1,16 @@
Package: lilypond
-Version: 2.10.0
-Revision: 1002
+Version: 2.10.5
+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
<<
+BuildConflicts: ccache-default
Depends: <<
python24 (>= 1:2.4.2-1005), guile16 (>= 1.6.7-1010), ghostscript (>= 8.15-1),
freetype219-shlibs (>= 2.1.9-1), pango1-xft2-ft219 (>= 1.8.1-5),
@@ -19,7 +20,7 @@
Conflicts: lilypond, lilypond-unstable, lilypond-devel, lilypond-devel-tex
Replaces: lilypond-devel, lilypond-unstable
Source: http://www.lilypond.org/ftp/v2.10/lilypond-%v.tar.gz
-Source-MD5: 82e4487c5c1fa1d2e478d5974a3630df
+Source-MD5: dd7934eb98266c176950b1486e50831c
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -lexpat -L%p/lib/pango-ft219/lib
@@ -30,6 +31,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
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.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- lilypond-devel.patch 3 Dec 2006 06:49:18 -0000 1.5
+++ lilypond-devel.patch 28 Dec 2006 17:50:22 -0000 1.5.2.1
@@ -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.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- lilypond.patch 3 Dec 2006 06:49:18 -0000 1.5
+++ lilypond.patch 28 Dec 2006 17:50:22 -0000 1.5.2.1
@@ -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,27 +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: doclifter.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/doclifter.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- doclifter.info 20 Jan 2006 20:32:31 -0000 1.1
+++ doclifter.info 28 Dec 2006 17:50:22 -0000 1.1.2.1
@@ -1,3 +1,19 @@
+# DISCLAIMER: Max Horn is the sole maintainer of this package.
+# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
+# Preferably, send a patch to me instead of making changes yourself!
+# If that is not possible due to extra urgency, at least send me a mail.
+#
+# Explanation: I am sick and tired of getting back to my packages and
+# discovering that people have messed with it. I am then forced to
+# retrace their steps, find out who, when and why did make a certain
+# change etc. -- i.e. it makes my life as maintainer harder.
+# Furthermore, as maintainer I am responsible for problems caused by my
+# packages. But I am not willing to take responsibility for something I
+# did not do. In particular, for changes that other people introduced
+# behind my back, no matter how good and noble their intentions were. As
+# such, I may see myself forced to drop responsibility for (and hence,
+# maintainership of) the affected package.
+
Package: doclifter
Version: 2.1
Revision: 1
Index: lilypond-devel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond-devel.info,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -d -r1.14.2.2 -r1.14.2.3
--- lilypond-devel.info 22 Dec 2006 05:02:21 -0000 1.14.2.2
+++ lilypond-devel.info 28 Dec 2006 17:50:22 -0000 1.14.2.3
@@ -1,15 +1,16 @@
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
<<
+BuildConflicts: ccache-default
Depends: <<
python24 (>= 1:2.4.2-1005), guile16 (>= 1.6.7-1010), ghostscript (>= 8.15-1),
freetype219-shlibs (>= 2.1.9-1), pango1-xft2-ft219 (>= 1.8.1-5),
@@ -19,7 +20,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 +31,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
