[SCM] UNNAMED PROJECT branch, master, updated. 7954559c0447b83ebb295b2982cfe30ddd1091ae

Sun Aug 8 00:56:38 UTC 2010

The following commit has been merged in the master branch:
commit 7954559c0447b83ebb295b2982cfe30ddd1091ae
Merge: 797a6b7b8ce228f94f5b1e15977848623f4644ec 0907454bb92b03cb86d4c72ab4277f77ffb227ae
Author: D Haley <mycae at yahoo.com>
Date:   Mon Jul 26 14:33:10 2010 +1000

    Merge commit 'HEAD'; commit '090745'
    
    Conflicts:
    
    	debian/mathgl.manpages

diff --combined debian/.pc/.version
index 0cfbf08,0cfbf08..0000000
deleted file mode 100644,100644

--- a/debian/.pc/.version
+++ /dev/null
diff --combined 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 --combined 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 --combined debian/patches/png-parallel-deps.patch
index f439ab7,f439ab7..0000000
deleted file mode 100644,100644
--- a/debian/patches/png-parallel-deps.patch
+++ /dev/null
diff --combined 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 --combined 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,16 -56,15 +59,17 @@@ 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
  	dh_fixperms
  	dh_makeshlibs
  	dh_installdeb
 +	dh_installman
 +	gzip -9 debian/mathgl/usr/share/man/man1/*.1
  	dh_shlibdeps
  	dh_gencontrol
  	dh_md5sums
diff --combined debian/source/format
index 163aaf8,163aaf8..0000000
deleted file mode 100644,100644
--- a/debian/source/format
+++ /dev/null

-- 
UNNAMED PROJECT

