Import Debian changes 2.18.2-4.1

lilypond (2.18.2-4.1) unstable; urgency=medium

  * Non-maintainer upload.
  * debian/control:
    - Replace ttf-kochi fonts with ipafonts (Closes: #804514).

diff --git a/debian/changelog b/debian/changelog
index fdfd44081d64323d2dd89aad26edbd25a0f09301..7de7835fe22fadbcd9672c7f0ffbc19e90a2579a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lilypond (2.18.2-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control:
+    - Replace ttf-kochi fonts with ipafonts (Closes: #804514).
+
+ -- Luca Falavigna <dktrkranz@debian.org>  Wed, 30 Dec 2015 14:57:33 +0100
+
 lilypond (2.18.2-4) unstable; urgency=medium
 
   * Fix the wrong maintscript-helper invocation which was trying to

diff --git a/debian/control b/debian/control
index a1d483fe7042a41f21cca46414585015093577d9..eaf890ea03a53c6572a6e27c07168176141d1315 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), quilt, python-all-dev (>= 2.6.6-3~), dh-python,
  emacs-intl-fonts, xfonts-intl-arabic, xfonts-intl-asian,
  xfonts-intl-chinese, xfonts-intl-chinese-big, xfonts-intl-european,
  xfonts-intl-japanese, xfonts-intl-japanese-big, xfonts-intl-phonetic,
- ttf-kochi-gothic, ttf-kochi-mincho, ttf-dejavu, ttf-freefont,
+ fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-dejavu, ttf-freefont,
  texlive-lang-cyrillic,
  gsfonts | gsfonts-x11
 Section: tex

diff --git a/debian/patches/switch_to_texinfo b/debian/patches/switch_to_texinfo
new file mode 100644 (file)
index 0000000..22950be
--- /dev/null
+++ b/debian/patches/switch_to_texinfo
@@ -0,0 +1,97 @@
+--- a/configure
++++ b/configure
+@@ -12717,7 +12717,7 @@
+     fi
+ 
+ 
+-    for ac_prog in texi2html
++    for ac_prog in makeinfo
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,7 +227,7 @@
+ STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
+ 
+ STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
+-STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
++STEPMAKE_PROGS(TEXI2HTML, makeinfo, $DOCUMENTATION_REQUIRED, 1.82)
+ STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
+ STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
+ STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED)
+--- a/make/website.make
++++ b/make/website.make
+@@ -17,7 +17,7 @@
+   top-htaccess=$(trusted-dir)/lilypond.org.htaccess
+   dir-htaccess=$(trusted-dir)/website-dir.htaccess
+   # grab it from PATH
+-  TEXI2HTML_PROGRAM=texi2html
++  TEXI2HTML_PROGRAM=makeinfo
+   PYTHON=python
+   PYTHONPATH=$(TRUSTED_DIR)
+ else
+@@ -55,7 +55,7 @@
+ WEB_LANGS := $(shell MAKEWEB=1 $(PYTHON) $(top-src-dir)/python/langdefs.py)
+ 
+ TEXI2HTML=ONLY_WEB_VERSION=v$(MAJOR_VERSION).$(MINOR_VERSION) TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD \
+-      $(TEXI2HTML_PROGRAM) -D web_version --prefix=index --split=section \
++      $(TEXI2HTML_PROGRAM) --html -D web_version --split=section \
+               --init-file=$(texi2html-init-file) \
+               --I=$(dir $<) \
+               --I=$(top-src-dir)/Documentation \
+--- a/scripts/auxiliar/cg-section.sh
++++ b/scripts/auxiliar/cg-section.sh
+@@ -54,7 +54,7 @@
+ : "${LILYPOND_BUILD_DIR:=$LILYPOND_GIT/build}"
+ DOC_DIR="${LILYPOND_TEMPDOCS:-$LILYPOND_BUILD_DIR/tempdocs}"
+ LILYPOND_BOOK="$LILYPOND_BUILD_DIR/out/bin/lilypond-book"
+-TEXI2HTML="texi2html"
++TEXI2HTML="makeinfo --html"
+ REFCHECK="$LILYPOND_GIT/scripts/auxiliar/ref_check.py"
+ 
+ SECTION="$1"
+@@ -93,7 +93,7 @@
+ echo "Running $TEXI2HTML"
+ cat "$DOC_DIR/macros.itexi" "$SECTION_PATH" > "$OUTPUT_DIR/$SECTION.texi"
+ 
+-"$TEXI2HTML" \
++$TEXI2HTML \
+     --no-validate \
+     --output="$OUTPUT_DIR/out/$SECTION.html" \
+     --I="$LILYPOND_GIT/Documentation" \
+--- a/scripts/auxiliar/doc-section.sh
++++ b/scripts/auxiliar/doc-section.sh
+@@ -75,7 +75,7 @@
+ : "${LILYPOND_BUILD_DIR:=$LILYPOND_GIT/build}"
+ DOC_DIR="${LILYPOND_TEMPDOCS:-$LILYPOND_BUILD_DIR/tempdocs}"
+ LILYPOND_BOOK="$LILYPOND_BUILD_DIR/out/bin/lilypond-book"
+-TEXI2HTML="texi2html"
++TEXI2HTML="makeinfo --html"
+ REFCHECK="$LILYPOND_GIT/scripts/auxiliar/ref_check.py"
+ 
+ MANUAL="$1"
+@@ -147,7 +147,7 @@
+ if test -f "$OUTPUT_DIR/out/$SECTION.texi"; then
+     echo "Running $TEXI2HTML"
+     cat "$DOC_DIR/macros.itexi" "$OUTPUT_DIR/out/$SECTION.texi" > "$OUTPUT_DIR/$SECTION.texi"
+-    "$TEXI2HTML" \
++    $TEXI2HTML \
+         --no-validate \
+         --output="$OUTPUT_DIR/out/$SECTION.html" \
+         --I="$OUTPUT_DIR/out" \
+--- a/stepmake/stepmake/texinfo-vars.make
++++ b/stepmake/stepmake/texinfo-vars.make
+@@ -52,10 +52,10 @@
+ 
+ TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+ 
+-TEXI2HTML_SPLIT = --prefix=index --split=section
++TEXI2HTML_SPLIT = --split=section
+ 
+ TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
+-TEXI2HTML_FLAGS += --error-limit=0 $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
++TEXI2HTML_FLAGS += -html --error-limit=0 $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
+ TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+ ###########
+