From: D Haley Date: Mon, 26 Jul 2010 04:33:10 +0000 (+1000) Subject: Merge commit 'HEAD'; commit '090745' X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~313 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7954559c0447b83ebb295b2982cfe30ddd1091ae;p=mathgl.git Merge commit 'HEAD'; commit '090745' Conflicts: debian/mathgl.manpages --- 7954559c0447b83ebb295b2982cfe30ddd1091ae diff --cc debian/.pc/.version index 0cfbf08,0cfbf08..0000000 deleted file mode 100644,100644 --- a/debian/.pc/.version +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --2 diff --cc debian/mglview.1 index 8ff3c22,0000000..71a4e5a mode 100644,000000..100644 --- a/debian/mglview.1 +++ b/debian/mglview.1 @@@ -1,25 -1,0 +1,35 @@@ - .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. - .TH MGLVIEW "1" "July 2010" - .SH NAME - mglview \- Show MGL script in FLTK window - .SH DESCRIPTION - Couldn't open file \fB\-\-help\fR ++.TH "mglview" "1" "May 2010" ++.SH "NAME" ++mglview \- Execute MathGL scripts and show in an FLTK window ++.SH "SYNOPSIS" ++.PP ++mglview < scriptfile > [outputname] [parameters] +.PP - Current version is 1.10.2 - Usage: mglview scriptfile [parameter(s)] - .IP - Parameters have format "\-Nval". - Here N=0,1...9 is parameter ID and val is its value. - Option \fB\-Lval\fR set locale to val. - .SH "SEE ALSO" - The full documentation for - .B mglview - is maintained as a Texinfo manual. If the - .B info - and - .B mglview - programs are properly installed at your site, the command - .IP - .B info mglview ++.SH "DESCRIPTION" ++.PP ++mglview reads mathgl scripts, to produce plots of specified functions or data. When called with only the script file name, the program will create a GUI window showing the script result. ++.PP ++.SH "OPTIONS" ++.PP ++.IP "\fB-L\fP" ++Set the locale +.PP - should give you access to the complete manual. ++.IP "-N" ++Sets the nth parameter, such that -0 is the zeroth parameter. This is supported up to -9. Parameters are passed to the mgl script, and can be used to influence execution. ++ ++.PP ++.SH "SEE ALSO" ++.PP ++mgl2png, mgl2gif, mgl2svg, mgl2cpp, mgl2eps ++.PP ++.PP ++.SH "AUTHOR" ++.PP ++.SH "AUTHOR" ++.PP ++mglview was written by Alexey Balakin ++http://mathgl.sourceforge.net/ ++.PP ++Bugs may be submitted online to the MathGL forums at the above web address. ++.PP ++This build of mglview is released under the GNU General Public Licence version 2 or later\& Please see the file COPYING for license details\&. diff --cc debian/patches/parallel-build-png.patch index 0000000,0000000..38a0fbd new file mode 100644 --- /dev/null +++ b/debian/patches/parallel-build-png.patch @@@ -1,0 -1,0 +1,38 @@@ ++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 = . ++ ++ 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 @@ ++ rm -rf $(mglpng) ++ ++ #all-local: html pdf ++-all-local: html +++all-local: +++ $(top_builddir)/examples/mgl_example ${shell $(top_builddir)/examples/mgl_example -list} +++ mv *.png png/ +++ $(MAKE) html +++ $(MAKE) pdf diff --cc debian/patches/png-parallel-deps.patch index f439ab7,f439ab7..0000000 deleted file mode 100644,100644 --- a/debian/patches/png-parallel-deps.patch +++ /dev/null @@@ -1,67 -1,67 +1,0 @@@ --* Work around parallel building fails with no rule error. --Index: mathgl-ds/texinfo/Makefile.am --=================================================================== ----- 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 \ -- mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 --@@ -11,20 +11,32 @@ -- -- 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 -- -- 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 --+ --+png_build: --+ $(top_builddir)/examples/mgl_example --+ mv ${png_images} png/ --+ touch mathgl.texi --+ --+install-data-local: install-html install-pdf -- mkdir -p $(mglpng) -- cp -r $(top_srcdir)/texinfo/png_static/*.png $(mglpng) -- --@@ -32,4 +44,10 @@ -- rm -rf $(mglpng) -- -- #all-local: html pdf ---all-local: html --+all-local: html pdf --+ --+html: png_build --+ --+pdf: png_build --+ texi2pdf mathgl_en.texi --+ diff --cc debian/patches/series index d12db4c,2566063..1e69804 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,5 -1,4 +1,4 @@@ 00_add_info_section.diff --mglview-ldflags.patch examples-ldflags.patch --png-parallel-deps.patch - debian-changes-1.10.2.1-1 ++mglview-ldflags.patch ++parallel-build-png.patch diff --cc debian/rules index 37a07a3,67a0fb4..8186293 --- a/debian/rules +++ b/debian/rules @@@ -1,5 -1,5 +1,7 @@@ #!/usr/bin/make -f ++include /usr/share/quilt/quilt.make ++ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@@ -17,7 -17,7 +19,7 @@@ ifneq (,$(filter parallel=%,$(DEB_BUILD endif configure: configure-stamp --configure-stamp: ++configure-stamp: $(QUILT_STAMPFN) dh_testdir autoreconf CFLAGS="$(CFLAGS)" \ @@@ -32,7 -32,7 +34,7 @@@ build-stamp: configur $(MAKE) touch $@ --clean: ++clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp @@@ -46,6 -46,6 +48,7 @@@ install: buil dh_testroot dh_prep $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp ++ cp texinfo/*.pdf $(CURDIR)/debian/tmp/usr/share/doc/mathgl/ rm -f debian/tmp/usr/bin/*_example rm -f debian/tmp/usr/share/info/dir @@@ -56,8 -56,9 +59,9 @@@ binary-arch: build instal dh_testroot dh_installchangelogs ChangeLog.txt dh_installdocs ++ dh_installman dh_install --fail-missing rm -f debian/mathgl-doc/usr/share/doc/mathgl-doc/png/all.png - dh_installman dh_link dh_strip dh_compress diff --cc debian/source/format index 163aaf8,163aaf8..0000000 deleted file mode 100644,100644 --- a/debian/source/format +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --3.0 (quilt)