The NMU diff is attatched to this mail (note: please do not
upload/commit this
change yet, I want to see if it actually solves the problem first).
Sorry I screwed up, corrected NMU diff is attatched. Again please don't
upload/
commit until I confirm that this solves the problem.
diff -ur texlive-bin-2012.20120623/debian/changelog texlive-bin-2012.20120623.new/debian/changelog
--- texlive-bin-2012.20120623/debian/changelog 2012-06-26 07:04:40.000000000 +0000
+++ texlive-bin-2012.20120623.new/debian/changelog 2012-06-27 22:51:35.000000000 +0000
@@ -1,3 +1,10 @@
+texlive-bin (2012.20120623-2.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Build with -marm on armhf to fix lilypond FTBFS (Closes: #678604)
+
+ -- Peter Michael Green <plugw...@p10link.net> Wed, 27 Jun 2012 22:35:41 +0000
+
texlive-bin (2012.20120623-2) unstable; urgency=low
* fix reading from and writing to pipes from within tex: new
diff -ur texlive-bin-2012.20120623/debian/rules texlive-bin-2012.20120623.new/debian/rules
--- texlive-bin-2012.20120623/debian/rules 2012-05-15 23:25:27.000000000 +0000
+++ texlive-bin-2012.20120623.new/debian/rules 2012-06-28 00:09:42.000000000 +0000
@@ -16,6 +16,11 @@
export LDFLAGS = -Wl,--no-relax
endif
+ifeq ($(DEB_HOST_ARCH), armhf)
+ export CFLAGS = -marm
+endif
+
+
# warning: if the --with autoreconf is removed then
# the patch debian/patches/debian-no-linked-scripts
# must be adapted to also patch the Makefile.in!
