From: Dr. Tobias Quathamer Date: Tue, 3 Oct 2017 12:50:45 +0000 (+0200) Subject: Use a/b diff prefix instead of upstream name and version X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=7de12acd8a2b525832dfebbf50e4085c987bcf05;p=lilypond.git Use a/b diff prefix instead of upstream name and version --- diff --git a/debian/patches/add_dircategories_to_documentation b/debian/patches/add_dircategories_to_documentation index c1c9cd2f34..3bb7cbeed1 100644 --- a/debian/patches/add_dircategories_to_documentation +++ b/debian/patches/add_dircategories_to_documentation @@ -3,8 +3,8 @@ Description: Lilypond texinfo is missing direntries in some cases Origin: vendor Bug-Debian: http://bugs.debian.org/648689 Author: Julian Gilbey ---- lilypond-2.18.0.orig/Documentation/changes.tely -+++ lilypond-2.18.0/Documentation/changes.tely +--- a/Documentation/changes.tely ++++ b/Documentation/changes.tely @@ -29,6 +29,11 @@ @end macro @@ -17,8 +17,8 @@ Author: Julian Gilbey @documentencoding utf-8 @documentlanguage en @afourpaper ---- lilypond-2.18.0.orig/Documentation/contributor.texi -+++ lilypond-2.18.0/Documentation/contributor.texi +--- a/Documentation/contributor.texi ++++ b/Documentation/contributor.texi @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -31,8 +31,8 @@ Author: Julian Gilbey @macro manualIntro This manual documents contributing to LilyPond version @version{}. It discusses technical issues and policies that ---- lilypond-2.18.0.orig/Documentation/cs/learning.tely -+++ lilypond-2.18.0/Documentation/cs/learning.tely +--- a/Documentation/cs/learning.tely ++++ b/Documentation/cs/learning.tely @@ -12,6 +12,11 @@ @settitle Příručka k učení se @afourpaper @@ -45,8 +45,8 @@ Author: Julian Gilbey @macro manualIntro Tento soubor poskytuje úvod pro LilyPond verze @version{}. ---- lilypond-2.18.0.orig/Documentation/cs/web.texi -+++ lilypond-2.18.0/Documentation/cs/web.texi +--- a/Documentation/cs/web.texi ++++ b/Documentation/cs/web.texi @@ -58,7 +58,6 @@ @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond --- the music typesetter @@ -55,8 +55,8 @@ Author: Julian Gilbey * Slovníček: (music-glossary). Překlad pojmů z angličtiny do dalších řečí. * Příručka pro zápis not v LilyPondu: (lilypond-notation). Příručka pro zápis not v LilyPondu. * Úryvky LilyPondu: (lilypond-snippets). Mnoho triků, rad a příkladů. ---- lilypond-2.18.0.orig/Documentation/de/essay.tely -+++ lilypond-2.18.0/Documentation/de/essay.tely +--- a/Documentation/de/essay.tely ++++ b/Documentation/de/essay.tely @@ -12,6 +12,11 @@ @documentlanguage de @afourpaper @@ -69,8 +69,8 @@ Author: Julian Gilbey @c Translators: Till Paala @include macros.itexi ---- lilypond-2.18.0.orig/Documentation/de/extending.tely -+++ lilypond-2.18.0/Documentation/de/extending.tely +--- a/Documentation/de/extending.tely ++++ b/Documentation/de/extending.tely @@ -13,6 +13,11 @@ @documentlanguage de @afourpaper @@ -83,8 +83,8 @@ Author: Julian Gilbey @c Translators: Till Paala @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/de/learning.tely -+++ lilypond-2.18.0/Documentation/de/learning.tely +--- a/Documentation/de/learning.tely ++++ b/Documentation/de/learning.tely @@ -12,6 +12,11 @@ @settitle LilyPond Handbuch zum Lernen @afourpaper @@ -97,8 +97,8 @@ Author: Julian Gilbey @macro manualIntro Diese Datei stellt eine Einleitung für LilyPond Version @version{} zur Verfügung. ---- lilypond-2.18.0.orig/Documentation/de/notation.tely -+++ lilypond-2.18.0/Documentation/de/notation.tely +--- a/Documentation/de/notation.tely ++++ b/Documentation/de/notation.tely @@ -11,6 +11,11 @@ @setfilename lilypond.info @settitle LilyPond Benutzerhandbuch @@ -111,8 +111,8 @@ Author: Julian Gilbey @c Translators: Till Paala @afourpaper ---- lilypond-2.18.0.orig/Documentation/de/usage.tely -+++ lilypond-2.18.0/Documentation/de/usage.tely +--- a/Documentation/de/usage.tely ++++ b/Documentation/de/usage.tely @@ -12,7 +12,17 @@ @settitle GNU LilyPond Programmbenutzung @afourpaper @@ -132,8 +132,8 @@ Author: Julian Gilbey @macro manualIntro Diese Datei erklärt, wie man die Programme, die mit LilyPond ---- lilypond-2.18.0.orig/Documentation/de/web.texi -+++ lilypond-2.18.0/Documentation/de/web.texi +--- a/Documentation/de/web.texi ++++ b/Documentation/de/web.texi @@ -58,20 +58,10 @@ @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond --- the music typesetter @@ -155,8 +155,8 @@ Author: Julian Gilbey @end direntry ---- lilypond-2.18.0.orig/Documentation/es/changes.tely -+++ lilypond-2.18.0/Documentation/es/changes.tely +--- a/Documentation/es/changes.tely ++++ b/Documentation/es/changes.tely @@ -36,6 +36,11 @@ @end macro @@ -169,8 +169,8 @@ Author: Julian Gilbey @documentencoding UTF-8 @documentlanguage es @afourpaper ---- lilypond-2.18.0.orig/Documentation/es/essay.tely -+++ lilypond-2.18.0/Documentation/es/essay.tely +--- a/Documentation/es/essay.tely ++++ b/Documentation/es/essay.tely @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -183,8 +183,8 @@ Author: Julian Gilbey @c translator: Francisco Vila @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/es/extending.tely -+++ lilypond-2.18.0/Documentation/es/extending.tely +--- a/Documentation/es/extending.tely ++++ b/Documentation/es/extending.tely @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -197,8 +197,8 @@ Author: Julian Gilbey @c translator: Francisco Vila @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/es/learning.tely -+++ lilypond-2.18.0/Documentation/es/learning.tely +--- a/Documentation/es/learning.tely ++++ b/Documentation/es/learning.tely @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -211,8 +211,8 @@ Author: Julian Gilbey @macro manualIntro Este archivo ofrece una introducción al programa LilyPond versión @version{}. ---- lilypond-2.18.0.orig/Documentation/es/notation.tely -+++ lilypond-2.18.0/Documentation/es/notation.tely +--- a/Documentation/es/notation.tely ++++ b/Documentation/es/notation.tely @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -225,8 +225,8 @@ Author: Julian Gilbey @macro manualIntro Este manual ofrece una referencia para toda la notación musical que se puede producir con LilyPond versión @version{}. Da por sentado que el ---- lilypond-2.18.0.orig/Documentation/essay.tely -+++ lilypond-2.18.0/Documentation/essay.tely +--- a/Documentation/essay.tely ++++ b/Documentation/essay.tely @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -239,8 +239,8 @@ Author: Julian Gilbey @macro manualIntro This essay discusses automatic music engraving functions within LilyPond version @version{}. ---- lilypond-2.18.0.orig/Documentation/es/usage.tely -+++ lilypond-2.18.0/Documentation/es/usage.tely +--- a/Documentation/es/usage.tely ++++ b/Documentation/es/usage.tely @@ -13,6 +13,18 @@ @documentlanguage es @afourpaper @@ -260,8 +260,8 @@ Author: Julian Gilbey @c Translators: Francisco Vila @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/es/web.texi -+++ lilypond-2.18.0/Documentation/es/web.texi +--- a/Documentation/es/web.texi ++++ b/Documentation/es/web.texi @@ -57,20 +57,10 @@ @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond: el tipografiador de música @@ -283,8 +283,8 @@ Author: Julian Gilbey @end direntry ---- lilypond-2.18.0.orig/Documentation/extending.tely -+++ lilypond-2.18.0/Documentation/extending.tely +--- a/Documentation/extending.tely ++++ b/Documentation/extending.tely @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -297,8 +297,8 @@ Author: Julian Gilbey @macro manualIntro This file explains how to extend the functionality of LilyPond version @version{}. ---- lilypond-2.18.0.orig/Documentation/fr/essay.tely -+++ lilypond-2.18.0/Documentation/fr/essay.tely +--- a/Documentation/fr/essay.tely ++++ b/Documentation/fr/essay.tely @@ -16,6 +16,11 @@ @documentlanguage fr @afourpaper @@ -311,8 +311,8 @@ Author: Julian Gilbey @macro manualIntro Cet essai traite de la gravure de la musique et de la notation assistée par ordinateur à l'aide de LilyPond version @version{}. ---- lilypond-2.18.0.orig/Documentation/fr/learning.tely -+++ lilypond-2.18.0/Documentation/fr/learning.tely +--- a/Documentation/fr/learning.tely ++++ b/Documentation/fr/learning.tely @@ -13,6 +13,11 @@ @afourpaper @@ -325,8 +325,8 @@ Author: Julian Gilbey @macro manualIntro Ce document constitue le manuel d'initiation à GNU LilyPond @version{}. ---- lilypond-2.18.0.orig/Documentation/fr/notation.tely -+++ lilypond-2.18.0/Documentation/fr/notation.tely +--- a/Documentation/fr/notation.tely ++++ b/Documentation/fr/notation.tely @@ -13,6 +13,11 @@ @documentlanguage fr @afourpaper @@ -339,8 +339,8 @@ Author: Julian Gilbey @macro manualIntro Ce document constitue le manuel de notation de GNU LilyPond @version{}. Sa lecture requiert une familiarité avec le contenu ---- lilypond-2.18.0.orig/Documentation/fr/usage.tely -+++ lilypond-2.18.0/Documentation/fr/usage.tely +--- a/Documentation/fr/usage.tely ++++ b/Documentation/fr/usage.tely @@ -13,6 +13,17 @@ @documentlanguage fr @afourpaper @@ -359,8 +359,8 @@ Author: Julian Gilbey @c Translators: John Mandereau, Jean-Charles Malahieude @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/fr/web.texi -+++ lilypond-2.18.0/Documentation/fr/web.texi +--- a/Documentation/fr/web.texi ++++ b/Documentation/fr/web.texi @@ -59,19 +59,10 @@ @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond -- le typographe de musique @@ -381,8 +381,8 @@ Author: Julian Gilbey @end direntry ---- lilypond-2.18.0.orig/Documentation/hu/learning.tely -+++ lilypond-2.18.0/Documentation/hu/learning.tely +--- a/Documentation/hu/learning.tely ++++ b/Documentation/hu/learning.tely @@ -13,6 +13,11 @@ @documentlanguage hu @afourpaper @@ -395,8 +395,8 @@ Author: Julian Gilbey @c Translators: Harmath Dénes @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/hu/usage.tely -+++ lilypond-2.18.0/Documentation/hu/usage.tely +--- a/Documentation/hu/usage.tely ++++ b/Documentation/hu/usage.tely @@ -13,6 +13,18 @@ @documentlanguage hu @afourpaper @@ -416,8 +416,8 @@ Author: Julian Gilbey @c translator: Team-hu @macro manualIntro ---- lilypond-2.18.0.orig/Documentation/hu/web.texi -+++ lilypond-2.18.0/Documentation/hu/web.texi +--- a/Documentation/hu/web.texi ++++ b/Documentation/hu/web.texi @@ -59,20 +59,11 @@ @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond --- the music typesetter @@ -439,8 +439,8 @@ Author: Julian Gilbey @end direntry ---- lilypond-2.18.0.orig/Documentation/it/learning.tely -+++ lilypond-2.18.0/Documentation/it/learning.tely +--- a/Documentation/it/learning.tely ++++ b/Documentation/it/learning.tely @@ -13,6 +13,11 @@ @documentlanguage it @afourpaper @@ -453,8 +453,8 @@ Author: Julian Gilbey @macro manualIntro Questo file fornisce un'introduzione alla versione di LilyPond @version{}. ---- lilypond-2.18.0.orig/Documentation/it/usage.tely -+++ lilypond-2.18.0/Documentation/it/usage.tely +--- a/Documentation/it/usage.tely ++++ b/Documentation/it/usage.tely @@ -13,6 +13,18 @@ @documentlanguage it @afourpaper @@ -474,8 +474,8 @@ Author: Julian Gilbey @c Translators: Federico Bruni @c Translation checkers: Luca Rossetto Casel ---- lilypond-2.18.0.orig/Documentation/it/web.texi -+++ lilypond-2.18.0/Documentation/it/web.texi +--- a/Documentation/it/web.texi ++++ b/Documentation/it/web.texi @@ -228,15 +228,7 @@ * LilyPond: (lilypond-notation). Guida alla Notazione di LilyPond. * Frammenti di Codice di LilyPond: (lilypond-snippets). Piccoli trucchi, consigli, e esempi. @@ -492,8 +492,8 @@ Author: Julian Gilbey @end direntry ---- lilypond-2.18.0.orig/Documentation/ja/learning.tely -+++ lilypond-2.18.0/Documentation/ja/learning.tely +--- a/Documentation/ja/learning.tely ++++ b/Documentation/ja/learning.tely @@ -13,6 +13,11 @@ @documentlanguage ja @afourpaper @@ -506,8 +506,8 @@ Author: Julian Gilbey @macro manualIntro このマニュアルは LilyPond バージョン @version{} の導入部です。 @end macro ---- lilypond-2.18.0.orig/Documentation/ja/notation.tely -+++ lilypond-2.18.0/Documentation/ja/notation.tely +--- a/Documentation/ja/notation.tely ++++ b/Documentation/ja/notation.tely @@ -12,6 +12,11 @@ @documentlanguage ja @afourpaper @@ -520,8 +520,8 @@ Author: Julian Gilbey @macro manualIntro このマニュアルは LilyPond バージョン @version{} で提供される@c すべての記譜法についての参照を提供します。@c ---- lilypond-2.18.0.orig/Documentation/ja/usage.tely -+++ lilypond-2.18.0/Documentation/ja/usage.tely +--- a/Documentation/ja/usage.tely ++++ b/Documentation/ja/usage.tely @@ -13,6 +13,19 @@ @documentlanguage ja @afourpaper @@ -542,8 +542,8 @@ Author: Julian Gilbey @macro manualIntro このマニュアルは LilyPond バージョン @version{} で配布される@c プログラムの実効方法について説明します。@c ---- lilypond-2.18.0.orig/Documentation/learning.tely -+++ lilypond-2.18.0/Documentation/learning.tely +--- a/Documentation/learning.tely ++++ b/Documentation/learning.tely @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -556,8 +556,8 @@ Author: Julian Gilbey @macro manualIntro This file provides an introduction to LilyPond version @version{}. ---- lilypond-2.18.0.orig/Documentation/music-glossary.tely -+++ lilypond-2.18.0/Documentation/music-glossary.tely +--- a/Documentation/music-glossary.tely ++++ b/Documentation/music-glossary.tely @@ -6,6 +6,11 @@ @documentlanguage en @afourpaper @@ -570,8 +570,8 @@ Author: Julian Gilbey @macro manualIntro This glossary provides definitions and translations of musical terms used in the documentation manuals for LilyPond version ---- lilypond-2.18.0.orig/Documentation/nl/learning.tely -+++ lilypond-2.18.0/Documentation/nl/learning.tely +--- a/Documentation/nl/learning.tely ++++ b/Documentation/nl/learning.tely @@ -19,6 +19,11 @@ @documentlanguage nl @afourpaper @@ -584,8 +584,8 @@ Author: Julian Gilbey @macro manualIntro This file provides an introduction to LilyPond version @version{}. ---- lilypond-2.18.0.orig/Documentation/notation.tely -+++ lilypond-2.18.0/Documentation/notation.tely +--- a/Documentation/notation.tely ++++ b/Documentation/notation.tely @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -598,8 +598,8 @@ Author: Julian Gilbey @macro manualIntro This manual provides a reference for all notation that can be produced with LilyPond version @version{}. It assumes that ---- lilypond-2.18.0.orig/Documentation/snippets.tely -+++ lilypond-2.18.0/Documentation/snippets.tely +--- a/Documentation/snippets.tely ++++ b/Documentation/snippets.tely @@ -6,6 +6,11 @@ @documentlanguage en @afourpaper @@ -612,8 +612,8 @@ Author: Julian Gilbey @macro manualIntro This document shows a selected set of LilyPond snippets from the @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository} ---- lilypond-2.18.0.orig/Documentation/usage.tely -+++ lilypond-2.18.0/Documentation/usage.tely +--- a/Documentation/usage.tely ++++ b/Documentation/usage.tely @@ -13,6 +13,18 @@ @documentlanguage en @afourpaper @@ -633,8 +633,8 @@ Author: Julian Gilbey @macro manualIntro This file explains how to execute the programs distributed with LilyPond version @version{}. In addition, it suggests some ---- lilypond-2.18.0.orig/Documentation/web.texi -+++ lilypond-2.18.0/Documentation/web.texi +--- a/Documentation/web.texi ++++ b/Documentation/web.texi @@ -56,20 +56,8 @@ @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond --- the music typesetter diff --git a/debian/patches/more_debug_output_during_build b/debian/patches/more_debug_output_during_build index 50de562095..18ce5781b9 100644 --- a/debian/patches/more_debug_output_during_build +++ b/debian/patches/more_debug_output_during_build @@ -2,8 +2,8 @@ Description: Increase debug output when builds fail Forwarded: not-needed Origin: vendor Author: Don Armstrong ---- lilypond-2.18.0.orig/scripts/build/run-and-check.sh -+++ lilypond-2.18.0/scripts/build/run-and-check.sh +--- a/scripts/build/run-and-check.sh ++++ b/scripts/build/run-and-check.sh @@ -7,7 +7,8 @@ RetVal=$? # captures the return value of the command if [ $RetVal -ne 0 ]; then @@ -14,8 +14,8 @@ Author: Don Armstrong echo fi exit $RetVal ---- lilypond-2.18.0.orig/scm/ps-to-png.scm -+++ lilypond-2.18.0/scm/ps-to-png.scm +--- a/scm/ps-to-png.scm ++++ b/scm/ps-to-png.scm @@ -132,6 +132,7 @@ ~a\ ~a\ diff --git a/debian/patches/use_cstring_and_ctype_includes b/debian/patches/use_cstring_and_ctype_includes index d61661af9b..94294b9b1e 100644 --- a/debian/patches/use_cstring_and_ctype_includes +++ b/debian/patches/use_cstring_and_ctype_includes @@ -2,8 +2,8 @@ Description: Include missing cstring include files Forwarded: Origin: vendor Author: Don Armstrong ---- lilypond-2.18.0.orig/lily/midi-stream.cc -+++ lilypond-2.18.0/lily/midi-stream.cc +--- a/lily/midi-stream.cc ++++ b/lily/midi-stream.cc @@ -18,7 +18,7 @@ */ @@ -13,8 +13,8 @@ Author: Don Armstrong #include using namespace std; ---- lilypond-2.18.0.orig/lily/piano-pedal-engraver.cc -+++ lilypond-2.18.0/lily/piano-pedal-engraver.cc +--- a/lily/piano-pedal-engraver.cc ++++ b/lily/piano-pedal-engraver.cc @@ -38,6 +38,7 @@ #include "item.hh" @@ -23,8 +23,8 @@ Author: Don Armstrong #include ---- lilypond-2.18.0.orig/lily/prob.cc -+++ lilypond-2.18.0/lily/prob.cc +--- a/lily/prob.cc ++++ b/lily/prob.cc @@ -22,7 +22,7 @@ #include "item.hh" #include "input.hh" @@ -34,8 +34,8 @@ Author: Don Armstrong #include "ly-smobs.icc" IMPLEMENT_SMOBS (Prob); ---- lilypond-2.18.0.orig/lily/relocate.cc -+++ lilypond-2.18.0/lily/relocate.cc +--- a/lily/relocate.cc ++++ b/lily/relocate.cc @@ -23,8 +23,10 @@ /* TODO: autoconf support */ @@ -47,8 +47,8 @@ Author: Don Armstrong #if HAVE_GETTEXT #include ---- lilypond-2.18.0.orig/lily/source-file.cc -+++ lilypond-2.18.0/lily/source-file.cc +--- a/lily/source-file.cc ++++ b/lily/source-file.cc @@ -24,7 +24,7 @@ #endif /* GCC_MAJOR < 4 */ @@ -58,8 +58,8 @@ Author: Don Armstrong #include "config.hh" #include ---- lilypond-2.18.0.orig/lily/translator.cc -+++ lilypond-2.18.0/lily/translator.cc +--- a/lily/translator.cc ++++ b/lily/translator.cc @@ -18,7 +18,7 @@ */ diff --git a/debian/patches/use_debians_help2man b/debian/patches/use_debians_help2man index 77af1dc11e..6dd411ad75 100644 --- a/debian/patches/use_debians_help2man +++ b/debian/patches/use_debians_help2man @@ -2,8 +2,8 @@ Description: Use debian's help2man instead of the version distributed Forwarded: not-needed Origin: vendor Author: Don Armstrong ---- lilypond-2.18.0.orig/stepmake/stepmake/help2man-rules.make -+++ lilypond-2.18.0/stepmake/stepmake/help2man-rules.make +--- a/stepmake/stepmake/help2man-rules.make ++++ b/stepmake/stepmake/help2man-rules.make @@ -1,24 +1,8 @@ -# We must invoke the generated $(outdir)/help2man script instead of -# the help2man.pl source, which means that the scripts/build directory