From d62df6df677aeb8721715c5caf5b3e9e9053b411 Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Fri, 27 Jan 2017 13:01:56 -0700 Subject: [PATCH] Fix FTBFS when built with dpkg-buildpackage -A Previously, "$(MAKE) install" was not run for arch-independent build, hence dh_install was unable to find the non-documentation files that are destined for lilypond-data. Thanks to Santiago Vila for the bug report. (Closes: #806067) --- debian/rules | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/debian/rules b/debian/rules index f7fd2094a5..c74c571701 100755 --- a/debian/rules +++ b/debian/rules @@ -102,22 +102,13 @@ override_dh_auto_configure: cd guile18 && $(MAKE) ${guile_make_args} $(MAKE) -C guile18 install DESTDIR=$(CURDIR)/out/guile rm -f lily/out/parser.* - GUILE_LOAD_PATH=$(GUILE_LOAD_PATH) \ + GUILE_LOAD_PATH="$(GUILE_LOAD_PATH)" \ dh_auto_configure -- --disable-checking --enable-debugging $(config_opt) override_dh_auto_build-indep: - dh_auto_build + dh_auto_build -i -O--parallel $(MAKE) doc $(DOC_OPTIONS) -override_dh_auto_install-indep: debian/guile.reloc - $(MAKE) install-doc $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/ - $(MAKE) install-info $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr - rm -rf $(CURDIR)/debian/tmp/usr/share/omf - rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input - perl debian/move_info_images_from_html_doc $(CURDIR)/debian/tmp/usr/share/info/ $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/Documentation/ - perl debian/symlink_html_images_to_info_images $(CURDIR)/debian/tmp/usr/share/info/lilypond - perl debian/remove_w3c_callback $(CURDIR)/debian/tmp/usr/share/doc/lilypond/ $(CURDIR)/debian/tmp/usr/share/info/ - ## Unfortunately, lilypond is kind of broken, and installs the wrong ## info documentation (missing images) if we call their makefile ## directly. They also don't provide an install rule which doesn't @@ -130,6 +121,18 @@ override_dh_auto_install-arch: debian/lilypond.sh debian/lilypond-invoke-editor. sed -i -e '1s!$(CURDIR)/out/guile/usr/bin/guile!/usr/bin/guile!' \ debian/tmp/usr/bin/lilypond-invoke-editor +## We need the non-Documentation arch-independent files installed by +## the arch-dependent "$(MAKE) install" too, hence the dependency +## on override_dh_auto_install-arch +override_dh_auto_install-indep: override_dh_auto_install-arch debian/guile.reloc + $(MAKE) install-doc $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/ + $(MAKE) install-info $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr + rm -rf $(CURDIR)/debian/tmp/usr/share/omf + rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input + perl debian/move_info_images_from_html_doc $(CURDIR)/debian/tmp/usr/share/info/ $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/Documentation/ + perl debian/symlink_html_images_to_info_images $(CURDIR)/debian/tmp/usr/share/info/lilypond + perl debian/remove_w3c_callback $(CURDIR)/debian/tmp/usr/share/doc/lilypond/ $(CURDIR)/debian/tmp/usr/share/info/ + ## we need to nuke the parser files, because if there is a mismatch ## between upstreams bison and our bison, the build will fail epically override_dh_auto_clean: @@ -138,12 +141,15 @@ override_dh_auto_clean: rm -f lily/out/parser.* dh_auto_clean --no-parallel +override_dh_install-arch: + dh_install -a -O--parallel --list-missing + ## we need to install only the png, jpg, css, ly and english html ## files into the doc-html package, and only the english pdfs into the ## doc-pdf package. Because dh_install doesn't support regexes, we'll ## use find to replace the contents of the .install file before we ## call dh_install -override_dh_install: +override_dh_install-indep: /bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.ly\nusr/share/doc/lilypond/html/*/*/*.png' \ > $(CURDIR)/debian/lilypond-doc-html.install /bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.jpg\nusr/share/doc/lilypond/html/*/*/*.css' \ @@ -158,7 +164,7 @@ override_dh_install: find $(CURDIR)/debian/tmp/ -type f \ -regex '.*usr/share/doc/lilypond/.*/[^\.]+.preview.pdf' \ -printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-pdf.install - dh_install --list-missing + dh_install -i -O--parallel --list-missing override_dh_python2: dh_python2 --verbose @@ -175,9 +181,9 @@ override_dh_installdocs: install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \ done -override_dh_shlibdeps: +override_dh_shlibdeps-arch: $(eval unexport LD_LIBRARY_PATH) - dh_shlibdeps -lusr/lib/$(DEB_HOST_MULTIARCH)/lilypond/$(LILYPOND_VERSION)/guile + dh_shlibdeps -a -O--parallel -lusr/lib/$(DEB_HOST_MULTIARCH)/lilypond/$(LILYPOND_VERSION)/guile override_dh_auto_test: ifneq (,$(filter $(DEB_BUILD_OPTIONS),nocheck)) -- 2.39.2