Package: lilypond
Version: 2.10.33-2.3
Severity: normal
Tags: patch
Here's the diff to my 2.10.33-2.3 NMU.
Michael
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (x86_64)
Kernel: Linux 2.6.26-1-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages lilypond depends on:
pn guile-1.8 <none> (no description available)
pn guile-1.8-libs <none> (no description available)
ii libc6 2.7-14 GNU C Library: Shared libraries
ii libfontconfig1 2.6.0-1 generic font configuration library
ii libfreetype6 2.3.7-2 FreeType 2 font engine, shared lib
ii libgcc1 1:4.3.2-1 GCC support library
ii libglib2.0-0 2.16.6-1 The GLib library of C routines
ii libgmp3c2 2:4.2.2+dfsg-3 Multiprecision arithmetic library
ii libltdl3 1.5.26-4 A system independent dlopen wrappe
ii libpango1.0-0 1.20.5-2 Layout and rendering of internatio
ii libstdc++6 4.3.2-1 The GNU Standard C++ Library v3
pn lilypond-data <none> (no description available)
ii python 2.5.2-2 An interactive high-level object-o
ii zlib1g 1:1.2.3.3.dfsg-12 compression library - runtime
Versions of packages lilypond recommends:
pn lilypond-doc <none> (no description available)
lilypond suggests no packages.
diff -u lilypond-2.10.33/debian/rules lilypond-2.10.33/debian/rules
--- lilypond-2.10.33/debian/rules
+++ lilypond-2.10.33/debian/rules
@@ -78,6 +78,7 @@
# Still not clean enough? Let's use... BRUTE STRENGTH! :-)
find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf
+ rm -f buildscripts/*.pyc
rm -f lib/lilypond/python examples.html
rm -f debian/emacsen-startup
rm -f debian/lilypond1.7*.dirs debian/lilypond.dirs
diff -u lilypond-2.10.33/debian/changelog lilypond-2.10.33/debian/changelog
--- lilypond-2.10.33/debian/changelog
+++ lilypond-2.10.33/debian/changelog
@@ -1,3 +1,15 @@
+lilypond (2.10.33-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix double build problem as patched by Peter Eisentraut
+ <[EMAIL PROTECTED]> (Closes: #482911).
+ * Do not list transitional package first in Pre-Depends
+ line (Closes: #481776).
+ * Changed build dependency from gs-gpl|gs-esp to ghostscript
+ to not reference transitional packages.
+
+ -- Michael Meskes <[EMAIL PROTECTED]> Sun, 05 Oct 2008 13:48:20 +0200
+
lilypond (2.10.33-2.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u lilypond-2.10.33/debian/control lilypond-2.10.33/debian/control
--- lilypond-2.10.33/debian/control
+++ lilypond-2.10.33/debian/control
@@ -1,5 +1,5 @@
Source: lilypond
-Build-Depends: debhelper (>= 5), python-dev (>= 2.4), guile-1.8-dev, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.8.dfsg.1-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.1.19), fontforge (>= 0.0.20060125-1), pkg-config (>= 0.9.0), libfreetype6-dev, libpango1.0-dev, libfontconfig1-dev (>= 2.4.1-1), python-support (>= 0.4), libgmp3-dev, libltdl3-dev, gs-gpl (>= 8.50) | gs-esp (>= 8.50), texlive-latex-base, texlive-generic-recommended, autotools-dev
+Build-Depends: debhelper (>= 5), python-dev (>= 2.4), guile-1.8-dev, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.8.dfsg.1-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.1.19), fontforge (>= 0.0.20060125-1), pkg-config (>= 0.9.0), libfreetype6-dev, libpango1.0-dev, libfontconfig1-dev (>= 2.4.1-1), python-support (>= 0.4), libgmp3-dev, libltdl3-dev, ghostscript (>= 8.50), texlive-latex-base, texlive-generic-recommended, autotools-dev
Build-Conflicts: guile-1.8-dev (= 1.8.2+1-2)
Build-Depends-Indep: netpbm (>= 2:9.10-1), imagemagick, 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, gsfonts | gsfonts-x11, rsync
Build-Conflicts-Indep: gs-gpl (= 8.01-1), gs-gpl (= 8.01-2), gs-gpl (= 8.01-3), gs-gpl (= 8.01-4)
@@ -44,7 +44,7 @@
Section: tex
Architecture: all
Depends: texinfo | texlive-texinfo, ${python:Depends}
-Pre-Depends: tetex-bin | texlive-base
+Pre-Depends: texlive-base | tetex-bin
Recommends: lilypond (>= ${source:Version})
Conflicts: lilypond (<< 2.2.2-2)
Description: LilyPond music typesetter (data files)
