From a0e7358795008aa747ec9c390cbc8afe9fe011d0 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sat, 15 May 2010 05:36:40 +1000 Subject: [PATCH] * Refresh png-parallel-deps.patch --- debian/patches/png-parallel-deps.patch | 66 +++++++++++++------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/debian/patches/png-parallel-deps.patch b/debian/patches/png-parallel-deps.patch index b2759e3..f439ab7 100644 --- a/debian/patches/png-parallel-deps.patch +++ b/debian/patches/png-parallel-deps.patch @@ -1,65 +1,67 @@ * Work around parallel building fails with no rule error. -Index: mathgl-1.10.2.1/texinfo/Makefile.am +Index: mathgl-ds/texinfo/Makefile.am =================================================================== ---- mathgl-1.10.2.1.orig/texinfo/Makefile.am 2010-05-01 06:47:12.000000000 +1000 -+++ mathgl-1.10.2.1/texinfo/Makefile.am 2010-05-01 06:54:26.000000000 +1000 +--- mathgl-ds.orig/texinfo/Makefile.am 2010-05-15 05:34:33.000000000 +1000 ++++ mathgl-ds/texinfo/Makefile.am 2010-05-15 05:35:33.000000000 +1000 @@ -1,4 +1,4 @@ -SUBDIRS = png . +SUBDIRS = . - CLEANFILES = mathgl_en.info mathgl_en.info-1 mathgl_en.info-2 mathgl_en.info-3 *.html *.ky *.vr *.tp *.tps *.vrs *.aux *.toc *.pdf *.pg *.png + CLEANFILES = mathgl_en.info mathgl_en.info-1 mathgl_en.info-2 mathgl_en.info-3 \ + mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 +@@ -11,20 +11,32 @@ -@@ -8,19 +8,47 @@ - AM_MAKEINFOHTMLFLAGS = --split=chapter - AM_MAKEINFOFLAGS = --no-validate - --info_TEXINFOS = mathgl.texi --mathgl_TEXINFOS = \ --cint.texi example.texi gpl-3.0.texi overview.texi samples.texi \ --class.texi fdl.texi data.texi \ --core.texi gpl-2.0.texi mgl.texi python.texi -+info_TEXINFOS = mathgl_en.texi -+mathgl_en_TEXINFOS = \ -+example_en.texi gpl-3.0.texi overview_en.texi samples_en.texi \ -+class_en.texi fdl.texi data_en.texi \ -+core_en.texi gpl-2.0.texi mgl_en.texi + info_TEXINFOS = mathgl_en.texi + mathgl_en_TEXINFOS = \ +-example_en.texi gpl-3.0.texi overview_en.texi samples_en.texi \ +-class_en.texi fdl.texi data_en.texi \ +-core_en.texi gpl-2.0.texi mgl_en.texi +- +-info_TEXINFOS += mathgl_ru.texi +-mathgl_ru_TEXINFOS = \ +-samples_ru.texi class_ru.texi overview_ru.texi appendix_ru.texi \ +-data_ru.texi mgl_ru.texi core_ru.texi example_ru.texi fdl.texi \ +-gpl-2.0.texi gpl-3.0.texi ++ example_en.texi gpl-3.0.texi overview_en.texi samples_en.texi \ ++ class_en.texi fdl.texi data_en.texi \ ++ core_en.texi gpl-2.0.texi mgl_en.texi + +#Disabled. This throws UTF8 errors on attempt to build, and drops texinfo +#into interactive mode. +#info_TEXINFOS += mathgl_ru.texi +#mathgl_ru_TEXINFOS = \ -+samples_ru.texi class_ru.texi overview_ru.texi appendix_ru.texi \ -+data_ru.texi mgl_ru.texi core_ru.texi example_ru.texi fdl.texi \ -+gpl-2.0.texi gpl-3.0.texi ++ samples_ru.texi class_ru.texi overview_ru.texi appendix_ru.texi \ ++ data_ru.texi mgl_ru.texi core_ru.texi example_ru.texi fdl.texi \ ++ gpl-2.0.texi gpl-3.0.texi mglpng=$(DESTDIR)$(docdir)/png_static +-#install-data-local: install-html install-pdf +-install-data-local: install-html +images = ${shell $(top_builddir)/examples/mgl_example -list} +png_images = ${images:=.png} + + -+all-local: png_build ++all-local: png_build + +png_build: -+ $(top_builddir)/examples/mgl_example ++ $(top_builddir)/examples/mgl_example + mv ${png_images} png/ + touch mathgl.texi + -+#install-data-local: install-html install-pdf - install-data-local: install-html install-pdf ++install-data-local: install-html install-pdf mkdir -p $(mglpng) -- cp -r $(top_builddir)/texinfo/png_static/*.png $(mglpng) -+ cp -r $(top_srcdir)/texinfo/png_static/*.png $(mglpng) -+ -+ + cp -r $(top_srcdir)/texinfo/png_static/*.png $(mglpng) - uninstall-local: +@@ -32,4 +44,10 @@ rm -rf $(mglpng) -+#all-local: html pdf - all-local: html pdf + #all-local: html pdf +-all-local: html ++all-local: html pdf + +html: png_build + +pdf: png_build + texi2pdf mathgl_en.texi ++ -- 2.30.2