From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 8 Jun 2008 15:57:48 +0000 (-0300)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.49-1~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5812c51e16f1f28cf306e62ec43bc7597beb166c;hp=4940757317e19b6cb315976cf4a3a8b58b763166;p=lilypond.git

Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
---

diff --git a/ROADMAP b/ROADMAP
index 0450cbd9f1..59a4fbecbd 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -19,10 +19,8 @@ source files.
 		  	(README.txt, INSTALL.txt, NEWS.txt etc.)
        user/		User manuals
        po/              translated manual node names
-       fr/              docs translated to French.
+       fr/ es/ de/      docs translated to French, Spanish, German resp.
    buildscripts/	Scripts for the build process
-   cygwin/		Cygwin (Windows) package support
-   debian/		Debian package support
    elisp/		Emacs LilyPond mode and syntax coloring
    flower/		A simple c++ library
        include/
@@ -33,6 +31,8 @@ source files.
        mutopia/		Real music, more at www.mutopiaproject.org
        new/         Snippets which are too new for LSR
        regression/	Testing of features, one test per file
+       texidocs/    Translations of texidoc and doctitle fields
+                    (for input/lsr)
        tutorial/	Examples from the tutorial 
    lily/		C++ sources for LilyPond (lilypond-bin)
      include/
diff --git a/stepmake/stepmake/debian-rules.make b/stepmake/stepmake/debian-rules.make
deleted file mode 100644
index 11638b9201..0000000000
--- a/stepmake/stepmake/debian-rules.make
+++ /dev/null
@@ -1,7 +0,0 @@
-$(outdir)/%: %
-	rm -f $@
-	ln $< $@
-
-$(outdir)/%: $(doc-dir)/%.in
-	rm -f $@
-	cat $< | sed 's%^% %' > $@
diff --git a/stepmake/stepmake/debian-targets.make b/stepmake/stepmake/debian-targets.make
deleted file mode 100644
index 73d27e60c5..0000000000
--- a/stepmake/stepmake/debian-targets.make
+++ /dev/null
@@ -1,5 +0,0 @@
-
-default: $(OUTCONF_FILES)
-
-
-# local-dist: default
diff --git a/stepmake/stepmake/debian-vars.make b/stepmake/stepmake/debian-vars.make
deleted file mode 100644
index e032d7ee59..0000000000
--- a/stepmake/stepmake/debian-vars.make
+++ /dev/null
@@ -1,2 +0,0 @@
-# empty
-
diff --git a/stepmake/stepmake/intlrules.make b/stepmake/stepmake/intlrules.make
deleted file mode 100644
index 8a44f880b3..0000000000
--- a/stepmake/stepmake/intlrules.make
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LIBINTL=$(outdir)/libintl.a
-check-lib-intl:
-	$(MAKE) -C $(depth)/intl lib
-
-include $(stepdir)/c.make
-
diff --git a/stepmake/stepmake/pod-rules.make b/stepmake/stepmake/pod-rules.make
deleted file mode 100644
index 8842736259..0000000000
--- a/stepmake/stepmake/pod-rules.make
+++ /dev/null
@@ -1,30 +0,0 @@
-
-.SUFFIXES: .1 .5 .html .pod .txt
-
-pod2html=pod2html
-pod2groff=pod2man --center="$(PACKAGE_NAME) documentation" --section="0"\
-	--release="$(PACKAGE_NAME) $(VERSION)" $< > $@
-
-
-# perl 5.003/4
-POD2HTML_5003=$(POD2HTML) $< ; mv $(notdir $@) $(outdir)/ || true
-# urg, broken.  if you must have perl 5004, better install pod2html from 5003
-POD2HTML_5004=$(POD2HTML) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/add-URLs.sh $@
-
-do_pod2html=$($(POD2HTML_VERSION))
-
-$(outdir)/%.html: $(outdir)/%.pod
-	$(do_pod2html)
-
-$(outdir)/%.pod: %.pod
-	cp $< $@
-
-$(outdir)/%.5: %.pod
-	$(pod2groff)
-
-$(outdir)/%.1: %.pod
-	$(pod2groff)
-
-$(outdir)/%.1: $(outdir)/%.pod
-	-$(pod2groff)
-
diff --git a/stepmake/stepmake/pod-vars.make b/stepmake/stepmake/pod-vars.make
deleted file mode 100644
index af195dc475..0000000000
--- a/stepmake/stepmake/pod-vars.make
+++ /dev/null
@@ -1,3 +0,0 @@
-POD_FILES := $(call src-wildcard,*.pod)
-
-OUTPOD_FILES = $(addprefix $(outdir)/,$(POD_FILES))