[Gsrc-commit] /srv/bzr/gsrc/trunk r1153: clean up lilypond

[Brandon Invergo]

------------------------------------------------------------
revno: 1153
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-11 23:19:09 +0100
message:
  clean up lilypond
added:
  gnu/lilypond/config.mk
modified:
  gnu/lilypond/Makefile
  gnu/lilypond/sha256sums

=== modified file 'gnu/lilypond/Makefile'
--- a/gnu/lilypond/Makefile     2012-08-31 15:05:20 +0000
+++ b/gnu/lilypond/Makefile     2012-11-11 22:19:09 +0000
@@ -1,16 +1,28 @@
 GARNAME = lilypond
-GARVERSION = 2.16.0
-MAJORVERSION = 2.16
+GARVERSION = 2.16.1
+HOME_URL = http://lilypond.org/
+DESCRIPTION = A Music Typesetter
+
+######################################################################
+
+empty:=
+space:= $(empty) $(empty)
+VERSION_LIST = $(subst .,$(space),$(GARVERSION))
+SERIES = $(subst $(space),.,$(wordlist 1,2,$(VERSION_LIST)))
 
 MASTER_SITES = http://download.linuxaudio.org/
-MASTER_SUBDIR = lilypond/sources/v$(MAJORVERSION)/
+MASTER_SUBDIR = lilypond/sources/v$(SERIES)/
 DISTFILES = $(DISTNAME).tar.gz
-#SIGFILES = 
-
-#BUILDDEPS = automake autoconf ghostscript texinfo imagemagick texi2html guile 
texinfo python gettext flex perl bison pkgconfig texLive fontconfig freetype 
pango fontforge help2man
-USE_TESTS = 
-
-HOME_URL = http://lilypond.org/
-DESCRIPTION = GNU LilyPond Music Typesetter
+SIGFILES = 
+
+BUILDDEPS = automake autoconf ghostscript texinfo guile bison \
+           pkg-config fontforge #t1asm freetype pango fontconfig help2man \
+           imagemagick python flex perl texLive texi2html
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += GUILE_CONFIG=$(prefix)/bin/guile-config

=== added file 'gnu/lilypond/config.mk'
--- a/gnu/lilypond/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/lilypond/config.mk    2012-11-11 22:19:09 +0000
@@ -0,0 +1,4 @@
+## Configuration options for lilypond ##
+
+CONFIGURE_OPTS ?= TEXI2HTML=/usr/bin/texi2html
+BUILD_OPTS ?=

=== modified file 'gnu/lilypond/sha256sums'
--- a/gnu/lilypond/sha256sums   2012-08-31 15:05:20 +0000
+++ b/gnu/lilypond/sha256sums   2012-11-11 22:19:09 +0000
@@ -1,1 +1,1 @@
-ecd5b7a2da668c94de7757e366f34bdd5d49b89e9b40ce859174dd2a7edb163d  
download/lilypond-2.16.0.tar.gz
+f56e21fe92f29c88365eb6cf80b5be86a169e23cfb054ccbec457059f3df796e  
download/lilypond-2.16.1.tar.gz