Make .pdf sample pictures accessible from the html documentation

diff --git a/debian/changelog b/debian/changelog
index 40b9f8ecfbaa591d852788fe4e4821e61bcefa1c..ef6f62c35a7804f1bf7e17c9f291329701821d86 100644 (file)
--- 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 d16bdc36d1ec0c115564fcd271468be0ef327979..18f735d92eec2f698612e908b1a6afbd18df01d7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,12 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>, D Haley <mycae@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 e6f8b5169da8db73a726e1a78c237d7d2f51dc72..f165f03960face8166313679c0dedecf95a8072e 100644 (file)
--- 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 ea1e47e52f64477c9e2d2c88ead526484e29884e..449c519aafba65c638db310834e9d64067a3ed4a 100644 (file)
--- 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}
+-@uref{pdf_u3d/\nam\.pdf, 3D pdf}
++@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 d3748c3b9afbacffc1cc1daa87b56a265c39e301..40bd29a77570fcf316e052522c520079b1e92143 100644 (file)
--- 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}
+-@uref{http://mathgl.sourceforge.net/pdf_u3d/\nam\.pdf, 3D pdf}
++@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 2937064fd049ae7d0777cb91226cac94a435f0ad..d53078c05afc5f43156acf71597ffc45220f3dc2 100755 (executable)
--- 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 70a6ec01a0676099fcffc4a46a1374028c1aebe5..14ce854f2e1ef0056e8e981491c34a40c9a0f51b 100644 (file)
--- 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}
-@uref{http://mathgl.sourceforge.net/pdf_u3d/\nam\.pdf, 3D pdf}
+@uref{pdf_u3d/\nam\.pdf, 3D pdf}
 @end macro
 
 @include overview_en.texi