patch::: 1.0.3.jcn1: kleine vix

pl 3.jcn1
	- bf: website: empty toplevel readme's
	- bf: xs4all (again?)
	- can't administer ftp site now: put patch into website

diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo
index 74c001b6d5cae5ebbe051bb4370c8328138c07ee..28f5ea8ee39df6c616d04e801971468d93cc2fae 100644 (file)
--- a/Documentation/topdocs/index.yo
+++ b/Documentation/topdocs/index.yo
@@ -24,6 +24,7 @@ LilyPond.  perhaps lily/VERSION, i.e. without my-patch-level would be
 best...
 )url(Download)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz)
 LilyPond.
+Or get the latest url(patch)(DOEXPAND(depth)/DOEXPAND(outdir)/lilypond-@TOPLEVEL_VERSION@.diff.gz).
 
 nsubsect(Introduction)
 
@@ -41,7 +42,7 @@ nsect(Sites)
 
 description(
 dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site.
-dit(lurl(http://www.digicash.com/~jan/lilypond/))Jan's site.
+dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site.
 )
 
 nsubsubsect(Mirrors)
@@ -66,8 +67,7 @@ verb(
 top_of_NEWS
 )
 
-
-Go get it at  lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/)
+Go get it at lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/)
 
 nsubsect(Documentation)
 

diff --git a/NEWS b/NEWS
index cfe890a1a02d4b2fb239a6d2df500042eddc8e7a..495fa13d5b0916c3a1e4c74916d092fc1161b536 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 3.jcn1
+       - bf: website: empty toplevel readme's
+       - bf: xs4all (again?)
+       - can't administer ftp site now: put patch into website
+
 pl 2.uu1
        - solaris 2.6 compile/make website fixes.
        - rm'd WWW.make

diff --git a/VERSION b/VERSION
index 7453b04628d795bcf6be18e3a284d22f238e14c4..d0191175820dc0f1d4e202bed71e9b40c2b71c69 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 

diff --git a/lily/VERSION b/lily/VERSION
index 7453b04628d795bcf6be18e3a284d22f238e14c4..d0191175820dc0f1d4e202bed71e9b40c2b71c69 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index 2f60c33f24e1e203f9975ad2feaf0fed2b0d985a..6e2775ab2005a040431b364f8b8dd567df6d7af0 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -64,3 +64,4 @@
 1.0.2
 1.0.2.hwn1
 1.0.3
+1.0.3.jcn1

diff --git a/stepmake/stepmake/Documentation_targets.make b/stepmake/stepmake/Documentation_targets.make
index cdf708b10e5c0d4f33c693a1a5be4eb20e83dceb..6c2ec85f2ecd9e574696e1c19e4513127cdee042 100644 (file)
--- a/stepmake/stepmake/Documentation_targets.make
+++ b/stepmake/stepmake/Documentation_targets.make
@@ -5,16 +5,20 @@ do-doc: $(OUTTXT_FILES)
 # ugh. FIXME
 ifeq ($(strip $(README_TOP_FILES)),)
 readme-top_FILES-html:
+readme-top_FILES-txt:
 else
 
+readme-top_FILES-txt:
+       $(foreach i, $(README_TOP_FILES), \
+         cp $(depth)/$(i) $(outdir)/$(i).txt && ) true
+       
 readme-top_FILES-html:
-       for i in $(README_TOP_FILES); do \
-         $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$$i.txt $(outdir)/$$i.html; \
-         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$$i.html; \
-       done
+       $(foreach i, $(README_TOP_FILES), \
+         $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$(i).txt $(outdir)/$(i).html && \
+         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$(i).html && ) true
 endif
 
-local-WWW:  readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
+local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
        echo $^ > $(depth)/wwwlist
 
 doc: do-doc

diff --git a/stepmake/stepmake/Toplevel.make b/stepmake/stepmake/Toplevel.make
index 57049f02d69bb4755b085faf469de771df60fb8a..450eaf55711a675c95fbf0d2c2b919f1ba8fa5aa 100644 (file)
--- a/stepmake/stepmake/Toplevel.make
+++ b/stepmake/stepmake/Toplevel.make
@@ -27,9 +27,10 @@ htmldoc:
        $(MAKE) CONFIGSUFFIX='www' local-WWW
        $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
        rm -f `find . -name \*.html~ -print`
+       -ln -f $(depth)/$(distname).diff.gz out-www
        find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist
 
-       tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` $(shell ls *.gif $(ERRORLOG))
+       tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` $(shell ls *.gif (ERRORLOG)) `ls out-www/$(distname).diff.gz $(ERRORLOG)`