From d76dd9786f4e1e9f2b932a75563c9d2a33c266c3 Mon Sep 17 00:00:00 2001 From: D Haley Date: Mon, 26 Jul 2010 14:43:49 +1000 Subject: [PATCH] * Unscrew repository. Git is so problematic. --- debian/patches/parallel-build-png.patch | 47 +++++++++++-------------- examples/Makefile.am | 10 +++--- texinfo/mathgl_en.texi | 8 ++--- utils/Makefile.am | 3 +- 4 files changed, 30 insertions(+), 38 deletions(-) diff --git a/debian/patches/parallel-build-png.patch b/debian/patches/parallel-build-png.patch index 38a0fbd..100c9df 100644 --- a/debian/patches/parallel-build-png.patch +++ b/debian/patches/parallel-build-png.patch @@ -1,36 +1,29 @@ Index: mathgl-1.10.2.1/texinfo/Makefile.am =================================================================== ---- mathgl-1.10.2.1.orig/texinfo/Makefile.am 2010-07-26 10:55:02.000000000 +1000 -+++ mathgl-1.10.2.1/texinfo/Makefile.am 2010-07-26 11:04:43.000000000 +1000 -@@ -1,4 +1,4 @@ --SUBDIRS = png . -+SUBDIRS = . +--- mathgl-1.10.2.1.orig/texinfo/Makefile.am 2010-07-26 14:40:29.000000000 +1000 ++++ mathgl-1.10.2.1/texinfo/Makefile.am 2010-07-26 14:43:05.000000000 +1000 +@@ -15,8 +15,7 @@ + class_en.texi fdl.texi data_en.texi \ + core_en.texi gpl-2.0.texi mgl_en.texi - 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 -@@ -15,11 +15,12 @@ - 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 -+#-RU is broken due to disallowed unicode chars -+#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 - - mglpng=$(DESTDIR)$(docdir)/png_static - -@@ -32,4 +33,8 @@ +-#Disabled. This throws UTF8 errors on attempt to build, and drops texinfo +-#into interactive mode. ++# Disabled due to Unicode problems with russian chars + #info_TEXINFOS += mathgl_ru.texi + #mathgl_ru_TEXINFOS = \ + samples_ru.texi class_ru.texi overview_ru.texi appendix_ru.texi \ +@@ -44,10 +43,9 @@ rm -rf $(mglpng) #all-local: html pdf --all-local: html +-all-local: html pdf +- +-html: png_build +- +-pdf: png_build +- texi2pdf mathgl_en.texi +- ++all-local: html +all-local: + $(top_builddir)/examples/mgl_example ${shell $(top_builddir)/examples/mgl_example -list} + mv *.png png/ diff --git a/examples/Makefile.am b/examples/Makefile.am index 1385c30..30a9608 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -8,24 +8,24 @@ mgl_example_LDADD = $(top_builddir)/mgl/libmgl.la if USE_FLTK bin_PROGRAMS += mgl_fltk_example mgl_fltk_example_SOURCES = wnd_samples.cpp fltk_example.cpp -mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la +mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la mgl_fltk_example_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS) check_PROGRAMS += test test_SOURCES = wnd_samples.cpp main.cpp -test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la +test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la test_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS) endif if USE_GLUT bin_PROGRAMS += mgl_glut_example mgl_glut_example_SOURCES = wnd_samples.cpp glut_example.cpp -mgl_glut_example_LDADD = $(top_builddir)/widgets/libmgl-glut.la $(top_builddir)/mgl/libmgl.la +mgl_glut_example_LDADD = $(top_builddir)/widgets/libmgl-glut.la endif if USE_WX bin_PROGRAMS += mgl_wx_example -mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la $(top_builddir)/mgl/libmgl.la +mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS) mgl_wx_example_SOURCES = wnd_samples.cpp wx_example.cpp endif @@ -36,7 +36,7 @@ ACLOCAL_AMFLAGS = -I $(top_srcdir)/config/ bin_PROGRAMS += mgl_qt_example mgl_qt_example_SOURCES = wnd_samples.cpp $(top_builddir)/include/mgl/mgl_qt.moc.cpp $(top_srcdir)/include/mgl/mgl_qt.h qt_example.cpp -mgl_qt_example_LDADD = $(QT_LIBS) $(top_builddir)/widgets/libmgl-qt.la $(top_builddir)/mgl/libmgl.la +mgl_qt_example_LDADD = $(QT_LIBS) $(top_builddir)/widgets/libmgl-qt.la mgl_qt_example_LDFLAGS = $(QT_LDFLAGS) mgl_qt_example_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) mgl_qt_example_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) diff --git a/texinfo/mathgl_en.texi b/texinfo/mathgl_en.texi index 7f3b3ca..70a6ec0 100644 --- a/texinfo/mathgl_en.texi +++ b/texinfo/mathgl_en.texi @@ -25,10 +25,10 @@ supports it in developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory MathGL documentation system -@direntry -* MathGL: (mathgl). The library for scientific graphics. -@end direntry +@c @dircategory MathGL documentation system +@c @direntry +@c * MathGL: (mathgl). The library for scientific graphics. +@c @end direntry @titlepage @title MathGL diff --git a/utils/Makefile.am b/utils/Makefile.am index eaa1417..00afdcb 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -21,10 +21,9 @@ mgl2eps_LDADD = $(top_builddir)/mgl/libmgl.la mgl2svg_SOURCES = mgl2svg.cpp mgl2svg_LDADD = $(top_builddir)/mgl/libmgl.la - if USE_FLTK mglview_SOURCES = mglview.cpp -mglview_LDADD = $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la +mglview_LDADD = $(top_builddir)/widgets/libmgl-fltk.la mglview_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS) endif -- 2.30.2