[SCM] Packaging for mathgl branch, master, updated. debian/1.10.2.1-3-9-g772ad9a

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit 772ad9a8fbb52a8b4d77a2345f3a6c0f8111f6f9
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Oct 11 04:43:49 2010 +0300

    Make .pdf sample pictures accessible from the html documentation

diff --git a/debian/changelog b/debian/changelog
index 40b9f8e..ef6f62c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 mathgl (1.10.2.1-3) experimental; urgency=low
 
+  * Make .pdf sample pictures accessible from the html documentation.
   * Correct several spelling mistakes in manpages and in lang/numpy.i
-  * Created symbol files for libraries.
+  * Create symbol files for libraries.
   * Add title to patch 00_add_info_section.diff.
   * Register documentation to doc-base.
 
diff --git a/debian/control b/debian/control
index d16bdc3..18f735d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,12 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>, D Haley <mycae at yahoo.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), libltdl-dev, libgsl0-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-serial-dev | libhdf5-dev, libjpeg-dev, libtiff-dev, libfltk-dev, libqt4-dev, libwxgtk2.8-dev, swig, texinfo, texi2html, texlive, texlive-generic-recommended, 
- octave3.2-headers, libgif-dev, autoconf, automake, quilt, python, python-dev,
- python-numpy
+Build-Depends: debhelper (>= 7), libltdl-dev, libgsl0-dev, freeglut3-dev, 
+ libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-serial-dev | libhdf5-dev, 
+ libjpeg-dev, libtiff-dev, libfltk-dev, libqt4-dev, libwxgtk2.8-dev, swig, 
+ texinfo, texi2html, texlive, texlive-generic-recommended, octave3.2-headers,
+ libgif-dev, autoconf, automake, quilt, python, python-dev, python-numpy,
+ imagemagick
 Standards-Version: 3.9.1
 Homepage: http://mathgl.sourceforge.net/index.html
 Vcs-Git: git://git.debian.org/debian-science/packages/mathgl.git
diff --git a/debian/mathgl-doc.install b/debian/mathgl-doc.install
index e6f8b51..f165f03 100644
--- a/debian/mathgl-doc.install
+++ b/debian/mathgl-doc.install
@@ -1,6 +1,7 @@
 usr/share/doc/mathgl/mathgl_en.html/ usr/share/doc/mathgl-doc/en/
 usr/share/doc/mathgl/png_static/ usr/share/doc/mathgl-doc/en/mathgl_en.html/
 usr/share/doc/mathgl/png/ usr/share/doc/mathgl-doc/en/mathgl_en.html/
+usr/share/doc/mathgl/pdf_u3d/ usr/share/doc/mathgl-doc/en/mathgl_en.html/
 usr/share/doc/mathgl/mathgl_en.pdf usr/share/doc/mathgl-doc/
 usr/share/info/mathgl_en.info*
 debian/folder/mathgl-doc /usr/share/doc-base/
\ No newline at end of file
diff --git a/debian/patches/00_add_info_section.diff b/debian/patches/00_add_info_section.diff
index ea1e47e..449c519 100644
--- a/debian/patches/00_add_info_section.diff
+++ b/debian/patches/00_add_info_section.diff
@@ -1,8 +1,6 @@
 * Let the directory entries appear in the manual.
-Index: mathgl-ds/texinfo/mathgl_en.texi
-===================================================================
---- mathgl-ds.orig/texinfo/mathgl_en.texi	2010-05-15 05:52:09.000000000 +1000
-+++ mathgl-ds/texinfo/mathgl_en.texi	2010-05-15 05:52:14.000000000 +1000
+--- a/texinfo/mathgl_en.texi
++++ b/texinfo/mathgl_en.texi
 @@ -25,10 +25,10 @@
  @end quotation
  @end copying
@@ -18,3 +16,12 @@ Index: mathgl-ds/texinfo/mathgl_en.texi
  
  @titlepage
  @title MathGL
+@@ -84,7 +84,7 @@
+ @xref{\arg\}, for sample code and picture.
+ @end rmacro
+ @macro tdref{nam}
+- at uref{pdf_u3d/\nam\.pdf, 3D pdf}
++ at uref{http://mathgl.sourceforge.net/pdf_u3d/\nam\.pdf, 3D pdf}
+ @end macro
+ 
+ @include overview_en.texi
diff --git a/debian/patches/debian-changes-1.10.2.1-3 b/debian/patches/debian-changes-1.10.2.1-3
index d3748c3..40bd29a 100644
--- a/debian/patches/debian-changes-1.10.2.1-3
+++ b/debian/patches/debian-changes-1.10.2.1-3
@@ -26,6 +26,17 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
+--- mathgl-1.10.2.1.orig/texinfo/mathgl_en.texi
++++ mathgl-1.10.2.1/texinfo/mathgl_en.texi
+@@ -84,7 +84,7 @@ supports it in developing GNU and promot
+ @xref{\arg\}, for sample code and picture.
+ @end rmacro
+ @macro tdref{nam}
+- at uref{http://mathgl.sourceforge.net/pdf_u3d/\nam\.pdf, 3D pdf}
++ at uref{pdf_u3d/\nam\.pdf, 3D pdf}
+ @end macro
+ 
+ @include overview_en.texi
 --- mathgl-1.10.2.1.orig/lang/numpy.i
 +++ mathgl-1.10.2.1/lang/numpy.i
 @@ -111,7 +111,7 @@
diff --git a/debian/rules b/debian/rules
index 2937064..d53078c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,8 @@ install: build
 	rm -f debian/tmp/usr/bin/*_example
 	rm -f debian/tmp/usr/share/info/dir
 	find debian \( -name mathgl.pyc -o -name mathgl.pyo \) -print0 | xargs -0 -r rm -f \;
+	mkdir -p debian/tmp/usr/share/doc/mathgl/pdf_u3d
+	mogrify -path debian/tmp/usr/share/doc/mathgl/pdf_u3d -format pdf debian/tmp/usr/share/doc/mathgl/png/*.png
 
 binary-indep: build install
 
@@ -61,10 +63,12 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog.txt
 	dh_installdocs
 	dh_install --fail-missing
-	rm -f debian/mathgl-doc/usr/share/doc/mathgl-doc/png/all.png
+#	rm -f debian/mathgl-doc/usr/share/doc/mathgl-doc/png/all.png
+#	rm -f debian/mathgl-doc/usr/share/doc/mathgl-doc/en/mathgl_en.html/pdf_u3d/*pdf.gz
 	dh_link
 	dh_strip
 	dh_compress
+	gunzip -r debian/mathgl-doc/usr/share/doc/mathgl-doc/en/mathgl_en.html/pdf_u3d
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
diff --git a/texinfo/mathgl_en.texi b/texinfo/mathgl_en.texi
index 70a6ec0..14ce854 100644
--- a/texinfo/mathgl_en.texi
+++ b/texinfo/mathgl_en.texi
@@ -84,7 +84,7 @@ supports it in developing GNU and promoting software freedom.''
 @xref{\arg\}, for sample code and picture.
 @end rmacro
 @macro tdref{nam}
- at uref{http://mathgl.sourceforge.net/pdf_u3d/\nam\.pdf, 3D pdf}
+ at uref{pdf_u3d/\nam\.pdf, 3D pdf}
 @end macro
 
 @include overview_en.texi

-- 
Packaging for mathgl