--- Begin Message ---
Package: lilypond
Version: 2.10.33-2
Severity: normal
Tags: patch
Hi,
Attached is the diff for my lilypond 2.10.33-2.1 NMU.
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,11 @@
+lilypond (2.10.33-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.3 (Closes: #413427).
+ * Copy config.{guess,sub} to fix FTBFS on GNU/kFreeBSD (Closes: #404441).
+
+ -- Luk Claes <[email protected]> Sat, 08 Mar 2008 13:43:35 +0000
+
lilypond (2.10.33-2) unstable; urgency=low
* debian/control (Build-Depends-Indep): Use ttf-dejavu instead of
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
+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-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)
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
@@ -45,6 +45,7 @@
build-stamp:
dh_testdir
+ cp -f /usr/share/misc/config.{guess,sub} ./stepmake/bin/
./configure --disable-checking --enable-debugging \
--prefix=/usr --enable-optimising \
--infodir='$${prefix}/share/info' \
@@ -73,6 +74,7 @@
[ ! -f Makefile ] || $(MAKE) WWW-clean top-WWW-clean
[ ! -f Makefile ] || $(MAKE) distclean
-rm lib/python
+ -rm -f ./stepmake/bin/config.{guess,sub}
# Still not clean enough? Let's use... BRUTE STRENGTH! :-)
find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/lily/prob.cc
+++ lilypond-2.10.33/lily/prob.cc
@@ -10,7 +10,7 @@
#include "main.hh"
#include "item.hh"
#include "input.hh"
-
+#include <cstring>
#include "ly-smobs.icc"
IMPLEMENT_SMOBS (Prob);
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/lily/piano-pedal-engraver.cc
+++ lilypond-2.10.33/lily/piano-pedal-engraver.cc
@@ -25,6 +25,7 @@
#include "warn.hh"
#include "protected-scm.hh"
#include "translator.icc"
+#include <cstring>
/*
TODO:
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/lily/translator.cc
+++ lilypond-2.10.33/lily/translator.cc
@@ -7,7 +7,7 @@
*/
#include "translator.hh"
-
+#include <cstring>
#include "context-def.hh"
#include "dispatcher.hh"
#include "global-context.hh"
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/lily/midi-stream.cc
+++ lilypond-2.10.33/lily/midi-stream.cc
@@ -7,7 +7,7 @@
*/
#include "midi-stream.hh"
-
+#include <cstring>
#include <cerrno>
using namespace std;
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/lily/relocate.cc
+++ lilypond-2.10.33/lily/relocate.cc
@@ -14,8 +14,10 @@
/* TODO: autoconf support */
+#include <ctype.h>
#include <sys/types.h>
#include <dirent.h>
+#include <cstring>
#if HAVE_GETTEXT
#include <libintl.h>
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/lily/source-file.cc
+++ lilypond-2.10.33/lily/source-file.cc
@@ -8,7 +8,7 @@
*/
#include "source-file.hh"
-
+#include <cstring>
#include "config.hh"
#if HAVE_UTF8_WCHAR_H
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/flower/include/rational.hh
+++ lilypond-2.10.33/flower/include/rational.hh
@@ -11,7 +11,7 @@
#include "std-string.hh"
-#include "std-string.hh"
+#include <limits.h>
/**
Rational numbers. Included is support for + and - infinity.
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/flower/include/std-vector.hh
+++ lilypond-2.10.33/flower/include/std-vector.hh
@@ -22,6 +22,7 @@
#include <algorithm> /* find, reverse, sort */
#include <functional> /* unary_function */
#include <cassert>
+#include <string>
using namespace std;
only in patch2:
unchanged:
--- lilypond-2.10.33.orig/flower/file-name.cc
+++ lilypond-2.10.33/flower/file-name.cc
@@ -12,6 +12,7 @@
#include <cstdio>
#include <cerrno>
#include <unistd.h>
+#include <limits.h>
using namespace std;
--- End Message ---
