[plplot] 36/68: Import Debian changes 5.9.0-1
Ole Streicher
olebole at moszumanska.debian.org
Mon Jul 10 07:38:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository plplot.
commit 8828aa763b281a5fed48cba2b4b118b52fecc9a9
Merge: 6776036 4d21586
Author: Rafael Laboissiere <rafael at debian.org>
Date: Sun Feb 24 12:43:28 2008 +0100
Import Debian changes 5.9.0-1
plplot (5.9.0-1) unstable; urgency=low
[ Andrew Ross ]
* New upstream release
* debian/patches/00list: Remove patches
05_octave_documentation.dpatch
06_build_dir_use_physical_path.dpatch
08_fix_cxx_includes.dpatch
as they are now included upstream
* debian/rules, debian/control, debian/libplplot-ada.files,
debian/liplplot-dev.files:
Add new package libplplot-ada to contain the Ada bindings. Include
examples and source in with the libplplot-dev package (following
Ada policy).
* debian/libplplot9.README.Debian: Update to include new ada
bindings package.
[ Rafael Laboissiere ]
* debian/control:
+ Fixed capitalization of GNOME (Lintian warning)
+ Force build-dependency on octave3.0 >= 3.0.0-2, ensuring the
transition from g77 to gfortran. Also, drop the unnecessary
build-dependencies on blas, atlas, and lapack, since they are pulled
in by octave3.0.
* Add dpatches:
+ 09_pdftex-EC-encoding: Include the correct ec.enc file for the EC
encoding, such that ligatures like "ff" and "fi" display correctly
in the PDF form of the documentation (closes: #461343)
+ 10_print-usage-octave-3.0: Use the appropriate call to print_usage
in wrap_octave.pl when building against octave3.0
* debian/patches/04_use-mkoctfile.dpatch: Adjust for installing
plplot_octave.oct with the appropriate execution permissions,
otherwise dpkg-shlibdeps does not work correctly for the octave-plplot
package
INSTALL | 676 +-
Makefile.am | 89 -
Makefile.in | 1029 -
README.Release_Manager_Cookbook | 161 +-
README.release | 397 +-
TODO.AM-LT | 90 -
aclocal.m4 | 7444 --
autom4te.cache/output.0 | 38404 ----------
autom4te.cache/output.1 | 38392 ----------
autom4te.cache/requests | 388 -
autom4te.cache/traces.0 | 11700 ---
autom4te.cache/traces.1 | 1659 -
bindings/Makefile.am | 58 -
bindings/Makefile.in | 826 -
bindings/ada/CMakeLists.txt | 85 +-
bindings/c++/Makefile.am | 40 -
bindings/c++/Makefile.in | 783 -
bindings/c++/plstream.cc | 119 +-
bindings/c++/plstream.h | 70 +-
bindings/f77/CMakeLists.txt | 6 +-
bindings/f77/Makefile.am | 84 -
bindings/f77/Makefile.in | 839 -
bindings/f77/configurable.f.in | 50 -
bindings/f77/plstubs.h | 9 +-
bindings/f77/sccont.c | 18 +-
bindings/f77/scstubs.c | 98 +-
bindings/f77/sfstubs.fm4 | 15 +-
bindings/f95/CMakeLists.txt | 8 +-
bindings/f95/Makefile.am | 94 -
bindings/f95/Makefile.in | 901 -
bindings/f95/plstubs.h | 11 +-
bindings/f95/sccont.c | 18 +-
bindings/f95/scstubs.c | 107 +-
bindings/f95/sfstubs.f90 | 18 +-
bindings/f95/sfstubsf95.f90 | 91 +-
bindings/gnome2/Makefile.in | 770 -
bindings/gnome2/lib/CMakeLists.txt | 2 +-
bindings/gnome2/lib/Makefile.am | 33 -
bindings/gnome2/lib/Makefile.in | 765 -
bindings/gnome2/python/Makefile.am | 127 -
bindings/gnome2/python/Makefile.in | 948 -
bindings/java/CMakeLists.txt | 130 +-
bindings/java/Makefile.am | 124 -
bindings/java/Makefile.in | 846 -
bindings/java/PLStream.java | 47 +
bindings/java/plplotjavac.i | 8 +-
bindings/octave/.octaverc | 2 -
bindings/octave/CMakeLists.txt | 5 +
bindings/octave/INSTALL | 17 +-
bindings/octave/Makefile.am | 143 -
bindings/octave/Makefile.in | 991 -
bindings/octave/PLplot/Makefile.am | 136 -
bindings/octave/PLplot/Makefile.in | 928 -
bindings/octave/PLplot/support/Makefile.am | 62 -
bindings/octave/PLplot/support/Makefile.in | 676 -
bindings/octave/USAGE | 33 +-
bindings/octave/demos/CMakeLists.txt | 2 +
bindings/octave/demos/Makefile.am | 76 -
bindings/octave/demos/Makefile.in | 690 -
bindings/octave/demos/x28c.m | 2 +-
bindings/octave/demos/x29c.m | 178 +
bindings/octave/demos/x30c.m | 153 +
bindings/octave/misc/Makefile.am | 36 -
bindings/octave/misc/Makefile.in | 650 -
bindings/octave/octaverc.in | 9 +
bindings/octave/plplot_octave.h.in | 43 +-
bindings/python/CMakeLists.txt | 13 +-
bindings/python/Makefile.am | 156 -
bindings/python/Makefile.in | 904 -
bindings/python/plplotcmodule.i | 4 +-
bindings/swig-support/plplotcapi.i | 63 +-
bindings/tcl/CMakeLists.txt | 2 +-
bindings/tcl/Makefile.am | 118 -
bindings/tcl/Makefile.in | 951 -
bindings/tcl/pltcl.h | 10 +-
bindings/tcl/pltclgen.tcl | 6 +-
bindings/tcl/tclAPI.c | 68 +-
bindings/tcl/tclMain.c | 23 +-
bindings/tcl/tclMatrix.c | 26 +-
bindings/tcl/tclMatrix.h | 10 +-
bindings/tcl/tclcmd.tpl | 2 +-
bindings/tk-x-plat/plplotter.c | 12 +-
bindings/tk/CMakeLists.txt | 17 +-
bindings/tk/Makefile.am | 101 -
bindings/tk/Makefile.in | 892 -
bindings/tk/plframe.c | 95 +-
bindings/tk/plserver.c | 8 +-
bindings/tk/plserver.h | 6 +-
bindings/tk/pltk.h | 4 +-
bindings/tk/tkMain.c | 23 +-
bindings/wxwidgets/CMakeLists.txt | 2 +-
bindings/wxwidgets/wxPLplotstream.cpp | 4 +-
bindings/wxwidgets/wxPLplotstream.h.in | 10 +-
bindings/wxwidgets/wxPLplotwindow.cpp | 37 +-
bindings/wxwidgets/wxPLplotwindow.h | 6 +-
bootstrap.sh.out | 10 -
cf/CMakeLists.txt | 41 -
cf/Makefile.am | 33 -
cf/Makefile.in | 623 -
cf/README | 193 -
cf/ac_pkg_swig.m4 | 130 -
cf/ac_python_devel.m4 | 228 -
cf/acinclude.m4 | 414 -
cf/aqt.ac | 99 -
cf/bootstrap.sh | 142 -
cf/c++.ac | 130 -
cf/cgm.ac | 97 -
cf/compile | 142 -
cf/config.guess | 1471 -
cf/config.sub | 1599 -
cf/csiro.ac | 122 -
cf/depcomp | 530 -
cf/docbook.ac | 307 -
cf/docbook.m4 | 232 -
cf/double.ac | 47 -
cf/drivers-finish.ac | 28 -
cf/drivers-init.ac | 96 -
cf/f77.ac | 100 -
cf/f95.ac | 61 -
cf/freetype.ac | 330 -
cf/gcw.ac | 177 -
cf/gd.ac | 261 -
cf/gnome.ac | 80 -
cf/gnome.m4 | 130 -
cf/gnu-make.m4 | 24 -
cf/gtk.m4 | 194 -
cf/install-sh | 323 -
cf/instdirs.ac | 87 -
cf/java.ac | 172 -
cf/libtool.ac | 88 -
cf/linuxvga.ac | 40 -
cf/ltmain.sh | 6863 --
cf/missing | 360 -
cf/octave.ac | 169 -
cf/pdl.ac | 69 -
cf/pkg-config.ac | 65 -
cf/pkg.m4 | 57 -
cf/ps.ac | 27 -
cf/psttf.ac | 58 -
cf/pthread.ac | 50 -
cf/python.ac | 121 -
cf/rpath.ac | 43 -
cf/summary.ac | 98 -
cf/swig.ac | 30 -
cf/tcl.ac | 268 -
cf/test.ac | 55 -
cf/tk.ac | 150 -
cf/unicode.ac | 43 -
cf/wingcc.ac | 97 -
cf/wxwidgets.ac | 78 -
cf/xwin.ac | 35 -
cmake/modules/CheckTCL_GT_84.tcl | 1 +
cmake/modules/FindGD.cmake | 186 +-
cmake/modules/FindTCL.cmake | 169 +
cmake/modules/FindTclsh.cmake | 37 +
cmake/modules/UseSWIG.cmake | 207 +
cmake/modules/cairo.cmake | 128 +-
cmake/modules/drivers-init.cmake | 30 +-
cmake/modules/instdirs.cmake | 8 +
cmake/modules/pkg-config.cmake | 100 +-
cmake/modules/plplot.cmake | 5 +-
cmake/modules/plplot_version.cmake | 8 +-
cmake/modules/psttf.cmake | 22 +-
cmake/modules/summary.cmake | 2 +
cmake/modules/tcl-related.cmake | 14 +-
cmake/modules/wxwidgets.cmake | 1 -
config.h.cmake | 3 +
config.h.in | 417 -
configure | 38392 ----------
configure.ac | 317 -
data/Makefile.in | 651 -
debian/changelog | 37 +
debian/control | 19 +-
debian/libplplot-ada.files | 3 +
debian/libplplot-dev.files | 1 +
debian/libplplot9.README.Debian | 4 +-
debian/patches/00list | 5 +-
debian/patches/03_tclIndex-src-tree.dpatch | 62 -
debian/patches/04_use-mkoctfile.dpatch | 32 +-
debian/patches/05_octave_documentation.dpatch | 0
debian/patches/07_octave_prune_examples.dpatch | 0
debian/patches/08_fix_cxx_includes.dpatch | 0
debian/patches/09_pdftex-EC-encoding.dpatch | 69 +
debian/patches/10_print-usage-octave-3.0.dpatch | 38 +
debian/rules | 8 +-
doc/Makefile.am | 37 -
doc/Makefile.in | 832 -
doc/docbook/Makefile.am | 32 -
doc/docbook/Makefile.in | 781 -
doc/docbook/cnf/test.dsl.in | 9 -
doc/docbook/cnf/test.xml.in | 3 -
doc/docbook/src/CMakeLists.txt | 93 +-
doc/docbook/src/HTML-MANIFEST | 10 +-
doc/docbook/src/MAN-MANIFEST | 8 +
doc/docbook/src/Makefile.am | 275 -
doc/docbook/src/Makefile.in | 972 -
doc/docbook/src/api-c.html | 2 +-
doc/docbook/src/api-compat.html | 154 +-
doc/docbook/src/api-fortran-77.html | 2 +-
doc/docbook/src/api-obsolete.html | 8 +-
doc/docbook/src/api.html | 74 +-
doc/docbook/src/api.xml | 1186 +-
doc/docbook/src/djgpp-notes.html | 2 +-
doc/docbook/src/index.html | 82 +-
doc/docbook/src/os-notes.html | 4 +-
doc/docbook/src/pl_setcontlabelformat.3plplot | 2 +-
doc/docbook/src/pl_setcontlabelparam.3plplot | 2 +-
doc/docbook/src/plabort.html | 2 +-
doc/docbook/src/pladv.3plplot | 4 +-
doc/docbook/src/pladv.html | 2 +-
doc/docbook/src/plaxes.3plplot | 3 +-
doc/docbook/src/plaxes.html | 10 +
doc/docbook/src/plbin.3plplot | 2 +-
doc/docbook/src/plbin.html | 2 +-
doc/docbook/src/plbop.3plplot | 2 +-
doc/docbook/src/plbop.html | 2 +-
doc/docbook/src/plbox.3plplot | 5 +-
doc/docbook/src/plbox.html | 14 +-
doc/docbook/src/plbox3.3plplot | 2 +-
doc/docbook/src/plbox3.html | 2 +-
doc/docbook/src/plcalc_world.3plplot | 2 +-
doc/docbook/src/plcalc_world.html | 2 +-
doc/docbook/src/plclear.3plplot | 2 +-
doc/docbook/src/plclear.html | 2 +-
doc/docbook/src/plcol.html | 2 +-
doc/docbook/src/plcol0.3plplot | 4 +-
doc/docbook/src/plcol0.html | 4 +-
doc/docbook/src/plcol1.3plplot | 2 +-
doc/docbook/src/plcol1.html | 2 +-
doc/docbook/src/plcon1.html | 2 +-
doc/docbook/src/plcon2.html | 2 +-
doc/docbook/src/plcont.3plplot | 2 +-
doc/docbook/src/plcont.html | 2 +-
doc/docbook/src/plcontfortran77.html | 2 +-
doc/docbook/src/plcpstrm.3plplot | 2 +-
doc/docbook/src/plcpstrm.html | 2 +-
doc/docbook/src/plend.3plplot | 2 +-
doc/docbook/src/plend.html | 2 +-
doc/docbook/src/plend1.3plplot | 2 +-
doc/docbook/src/plend1.html | 2 +-
doc/docbook/src/plenv.3plplot | 16 +-
doc/docbook/src/plenv.html | 160 +-
doc/docbook/src/plenv0.3plplot | 14 +-
doc/docbook/src/plenv0.html | 158 +-
doc/docbook/src/pleop.3plplot | 2 +-
doc/docbook/src/pleop.html | 2 +-
doc/docbook/src/plerrx.3plplot | 2 +-
doc/docbook/src/plerrx.html | 2 +-
doc/docbook/src/plerry.3plplot | 2 +-
doc/docbook/src/plerry.html | 2 +-
doc/docbook/src/plexit.html | 2 +-
doc/docbook/src/plfamadv.3plplot | 2 +-
doc/docbook/src/plfamadv.html | 2 +-
doc/docbook/src/plfill.3plplot | 2 +-
doc/docbook/src/plfill.html | 2 +-
doc/docbook/src/plfill3.3plplot | 2 +-
doc/docbook/src/plfill3.html | 2 +-
doc/docbook/src/plflush.3plplot | 2 +-
doc/docbook/src/plflush.html | 2 +-
doc/docbook/src/plfont.3plplot | 2 +-
doc/docbook/src/plfont.html | 2 +-
doc/docbook/src/plfontld.3plplot | 2 +-
doc/docbook/src/plfontld.html | 2 +-
doc/docbook/src/plgchr.3plplot | 2 +-
doc/docbook/src/plgchr.html | 2 +-
doc/docbook/src/plgcol0.3plplot | 2 +-
doc/docbook/src/plgcol0.html | 18 +-
.../src/{plgcol0.3plplot => plgcol0a.3plplot} | 16 +-
doc/docbook/src/{plgcol0.html => plgcol0a.html} | 64 +-
doc/docbook/src/plgcolbg.3plplot | 2 +-
doc/docbook/src/plgcolbg.html | 34 +-
.../src/{plgcolbg.3plplot => plgcolbga.3plplot} | 14 +-
doc/docbook/src/{plgcolbg.html => plgcolbga.html} | 57 +-
doc/docbook/src/plgcompression.3plplot | 2 +-
doc/docbook/src/plgcompression.html | 18 +-
doc/docbook/src/plgdev.3plplot | 2 +-
doc/docbook/src/plgdev.html | 2 +-
doc/docbook/src/plgdidev.3plplot | 2 +-
doc/docbook/src/plgdidev.html | 2 +-
doc/docbook/src/plgdiori.3plplot | 2 +-
doc/docbook/src/plgdiori.html | 2 +-
doc/docbook/src/plgdiplt.3plplot | 2 +-
doc/docbook/src/plgdiplt.html | 2 +-
doc/docbook/src/plgfam.3plplot | 2 +-
doc/docbook/src/plgfam.html | 2 +-
doc/docbook/src/plgfci.3plplot | 2 +-
doc/docbook/src/plgfci.html | 2 +-
doc/docbook/src/plgfile.html | 2 +-
doc/docbook/src/plgfnam.3plplot | 2 +-
doc/docbook/src/plgfnam.html | 2 +-
doc/docbook/src/plglevel.3plplot | 2 +-
doc/docbook/src/plglevel.html | 2 +-
doc/docbook/src/plgpage.3plplot | 2 +-
doc/docbook/src/plgpage.html | 2 +-
doc/docbook/src/plgra.3plplot | 2 +-
doc/docbook/src/plgra.html | 2 +-
doc/docbook/src/plgriddata.3plplot | 4 +-
doc/docbook/src/plgriddata.html | 4 +-
doc/docbook/src/plgspa.3plplot | 2 +-
doc/docbook/src/plgspa.html | 2 +-
doc/docbook/src/plgstrm.3plplot | 2 +-
doc/docbook/src/plgstrm.html | 2 +-
doc/docbook/src/plgver.3plplot | 2 +-
doc/docbook/src/plgver.html | 2 +-
doc/docbook/src/plgvpd.3plplot | 2 +-
doc/docbook/src/plgvpd.html | 2 +-
doc/docbook/src/plgvpw.3plplot | 2 +-
doc/docbook/src/plgvpw.html | 2 +-
doc/docbook/src/plgxax.3plplot | 2 +-
doc/docbook/src/plgxax.html | 2 +-
doc/docbook/src/plgyax.3plplot | 2 +-
doc/docbook/src/plgyax.html | 2 +-
doc/docbook/src/plgzax.3plplot | 2 +-
doc/docbook/src/plgzax.html | 2 +-
doc/docbook/src/plhist.3plplot | 2 +-
doc/docbook/src/plhist.html | 2 +-
doc/docbook/src/plhls.html | 2 +-
doc/docbook/src/plhls_rgb.html | 2 +-
doc/docbook/src/plhlsrgb.3plplot | 2 +-
doc/docbook/src/plhlsrgb.html | 2 +-
doc/docbook/src/plinit.3plplot | 2 +-
doc/docbook/src/plinit.html | 2 +-
doc/docbook/src/pljoin.3plplot | 2 +-
doc/docbook/src/pljoin.html | 2 +-
doc/docbook/src/pllab.3plplot | 4 +-
doc/docbook/src/pllab.html | 4 +-
doc/docbook/src/pllightsource.3plplot | 2 +-
doc/docbook/src/pllightsource.html | 2 +-
doc/docbook/src/plline.3plplot | 4 +-
doc/docbook/src/plline.html | 4 +-
doc/docbook/src/plline3.3plplot | 2 +-
doc/docbook/src/plline3.html | 2 +-
doc/docbook/src/pllsty.3plplot | 2 +-
doc/docbook/src/pllsty.html | 2 +-
doc/docbook/src/plmap.3plplot | 2 +-
doc/docbook/src/plmap.html | 2 +-
doc/docbook/src/plmeridians.3plplot | 2 +-
doc/docbook/src/plmeridians.html | 2 +-
doc/docbook/src/plmesh.3plplot | 2 +-
doc/docbook/src/plmesh.html | 2 +-
doc/docbook/src/plmeshc.3plplot | 2 +-
doc/docbook/src/plmeshc.html | 2 +-
doc/docbook/src/plmeshfortran77.html | 2 +-
doc/docbook/src/plmeshfortran95.html | 2 +-
doc/docbook/src/plmkstrm.3plplot | 2 +-
doc/docbook/src/plmkstrm.html | 2 +-
doc/docbook/src/plmtex.3plplot | 2 +-
doc/docbook/src/plmtex.html | 2 +-
doc/docbook/src/plmtex3.3plplot | 2 +-
doc/docbook/src/plmtex3.html | 2 +-
doc/docbook/src/plot3d.3plplot | 2 +-
doc/docbook/src/plot3d.html | 2 +-
doc/docbook/src/plot3dc.3plplot | 2 +-
doc/docbook/src/plot3dc.html | 2 +-
doc/docbook/src/plot3dfortran77.html | 2 +-
doc/docbook/src/plot3dfortran95.html | 2 +-
doc/docbook/src/plp_getinitdriverlist.html | 2 +-
doc/docbook/src/plpage.html | 2 +-
doc/docbook/src/plparseopts.3plplot | 2 +-
doc/docbook/src/plparseopts.html | 2 +-
doc/docbook/src/plparseoptsfortran77.html | 2 +-
doc/docbook/src/plparseoptsfortran95.html | 2 +-
doc/docbook/src/plpat.3plplot | 2 +-
doc/docbook/src/plpat.html | 2 +-
doc/docbook/src/plplot-5.8.0.pdf | 68589 ------------------
doc/docbook/src/plplot-5.8.0.ps.gz | Bin 664958 -> 0 bytes
.../src/{plplot-5.8.0.dvi => plplot-5.9.0.dvi} | Bin 3126172 -> 3218264 bytes
.../{plplot-5.8.0.jadetex => plplot-5.9.0.jadetex} | 44439 +++++++-----
doc/docbook/src/plplot-5.9.0.pdf | 71041 +++++++++++++++++++
doc/docbook/src/plplot-5.9.0.ps.gz | Bin 0 -> 684881 bytes
doc/docbook/src/plplot-structs.txt | 12 +-
doc/docbook/src/plplot-symbols.txt | 128 +-
doc/docbook/src/plplot.3plplot | 21 +-
doc/docbook/src/plplotdoc.info | 664 +-
doc/docbook/src/plplotdoc.info-1 | 49 +-
doc/docbook/src/plplotdoc.info-2 | 752 +-
doc/docbook/src/plplotdoc.texi | 657 +-
doc/docbook/src/plplotdoc.txml | 682 +-
doc/docbook/src/plplotdoc.xml-info | 2 +-
doc/docbook/src/plpoin.3plplot | 4 +-
doc/docbook/src/plpoin.html | 4 +-
doc/docbook/src/plpoin3.3plplot | 2 +-
doc/docbook/src/plpoin3.html | 2 +-
doc/docbook/src/plpoly3.3plplot | 2 +-
doc/docbook/src/plpoly3.html | 2 +-
doc/docbook/src/plprec.3plplot | 2 +-
doc/docbook/src/plprec.html | 2 +-
doc/docbook/src/plpsty.3plplot | 2 +-
doc/docbook/src/plpsty.html | 2 +-
doc/docbook/src/plptex.3plplot | 2 +-
doc/docbook/src/plptex.html | 2 +-
doc/docbook/src/plptex3.3plplot | 2 +-
doc/docbook/src/plptex3.html | 2 +-
doc/docbook/src/plreplot.3plplot | 2 +-
doc/docbook/src/plreplot.html | 2 +-
doc/docbook/src/plrgb.html | 2 +-
doc/docbook/src/plrgb1.html | 2 +-
doc/docbook/src/plrgbhls.3plplot | 2 +-
doc/docbook/src/plrgbhls.html | 2 +-
doc/docbook/src/plsabort.html | 2 +-
doc/docbook/src/plschr.3plplot | 2 +-
doc/docbook/src/plschr.html | 8 +-
doc/docbook/src/plscmap0.3plplot | 5 +-
doc/docbook/src/plscmap0.html | 22 +-
.../src/{plscmap0.3plplot => plscmap0a.3plplot} | 18 +-
doc/docbook/src/{plscmap0.html => plscmap0a.html} | 65 +-
doc/docbook/src/plscmap0n.3plplot | 2 +-
doc/docbook/src/plscmap0n.html | 18 +-
doc/docbook/src/plscmap1.3plplot | 2 +-
doc/docbook/src/plscmap1.html | 18 +-
.../src/{plscmap1.3plplot => plscmap1a.3plplot} | 16 +-
doc/docbook/src/{plscmap1.html => plscmap1a.html} | 64 +-
doc/docbook/src/plscmap1l.3plplot | 2 +-
doc/docbook/src/plscmap1l.html | 34 +-
doc/docbook/src/plscmap1la.3plplot | 45 +
doc/docbook/src/{plscmap1.html => plscmap1la.html} | 162 +-
doc/docbook/src/plscmap1n.3plplot | 2 +-
doc/docbook/src/plscmap1n.html | 16 +-
doc/docbook/src/plscol0.3plplot | 2 +-
doc/docbook/src/plscol0.html | 18 +-
.../src/{plscol0.3plplot => plscol0a.3plplot} | 16 +-
doc/docbook/src/{plscol0.html => plscol0a.html} | 60 +-
doc/docbook/src/plscolbg.3plplot | 2 +-
doc/docbook/src/plscolbg.html | 30 +-
.../src/{plscolbg.3plplot => plscolbga.3plplot} | 16 +-
doc/docbook/src/{plscolbg.html => plscolbga.html} | 57 +-
doc/docbook/src/plscolor.3plplot | 2 +-
doc/docbook/src/plscolor.html | 16 +-
doc/docbook/src/plscompression.3plplot | 2 +-
doc/docbook/src/plscompression.html | 2 +-
doc/docbook/src/plsdev.3plplot | 2 +-
doc/docbook/src/plsdev.html | 2 +-
doc/docbook/src/plsdidev.3plplot | 2 +-
doc/docbook/src/plsdidev.html | 2 +-
doc/docbook/src/plsdimap.3plplot | 2 +-
doc/docbook/src/plsdimap.html | 2 +-
doc/docbook/src/plsdiori.3plplot | 2 +-
doc/docbook/src/plsdiori.html | 2 +-
doc/docbook/src/plsdiplt.3plplot | 2 +-
doc/docbook/src/plsdiplt.html | 2 +-
doc/docbook/src/plsdiplz.3plplot | 2 +-
doc/docbook/src/plsdiplz.html | 2 +-
doc/docbook/src/plsesc.3plplot | 2 +-
doc/docbook/src/plsesc.html | 2 +-
doc/docbook/src/plsescfortran77.html | 2 +-
doc/docbook/src/plsescfortran95.html | 2 +-
doc/docbook/src/plsetopt.3plplot | 2 +-
doc/docbook/src/plsetopt.html | 2 +-
doc/docbook/src/plsexit.html | 2 +-
doc/docbook/src/plsfam.3plplot | 2 +-
doc/docbook/src/plsfam.html | 2 +-
doc/docbook/src/plsfci.3plplot | 2 +-
doc/docbook/src/plsfci.html | 2 +-
doc/docbook/src/plsfile.html | 2 +-
doc/docbook/src/plsfnam.3plplot | 2 +-
doc/docbook/src/plsfnam.html | 2 +-
doc/docbook/src/plshade.3plplot | 2 +-
doc/docbook/src/plshade.html | 2 +-
doc/docbook/src/plshade1.3plplot | 2 +-
doc/docbook/src/plshade1.html | 2 +-
doc/docbook/src/plshades.3plplot | 2 +-
doc/docbook/src/plshades.html | 2 +-
doc/docbook/src/plsmaj.3plplot | 2 +-
doc/docbook/src/plsmaj.html | 2 +-
doc/docbook/src/plsmem.3plplot | 2 +-
doc/docbook/src/plsmem.html | 2 +-
doc/docbook/src/plsmin.3plplot | 2 +-
doc/docbook/src/plsmin.html | 2 +-
doc/docbook/src/plsori.3plplot | 2 +-
doc/docbook/src/plsori.html | 2 +-
doc/docbook/src/plspage.3plplot | 2 +-
doc/docbook/src/plspage.html | 2 +-
doc/docbook/src/plspause.3plplot | 2 +-
doc/docbook/src/plspause.html | 2 +-
doc/docbook/src/plsstrm.3plplot | 2 +-
doc/docbook/src/plsstrm.html | 2 +-
doc/docbook/src/plssub.3plplot | 2 +-
doc/docbook/src/plssub.html | 2 +-
doc/docbook/src/plssym.3plplot | 2 +-
doc/docbook/src/plssym.html | 2 +-
doc/docbook/src/plstar.3plplot | 2 +-
doc/docbook/src/plstar.html | 2 +-
doc/docbook/src/plstart.3plplot | 2 +-
doc/docbook/src/plstart.html | 2 +-
doc/docbook/src/plstripa.3plplot | 2 +-
doc/docbook/src/plstripa.html | 2 +-
doc/docbook/src/plstripc.3plplot | 2 +-
doc/docbook/src/plstripc.html | 2 +-
doc/docbook/src/plstripd.3plplot | 2 +-
doc/docbook/src/plstripd.html | 2 +-
doc/docbook/src/plstyl.3plplot | 2 +-
doc/docbook/src/plstyl.html | 2 +-
doc/docbook/src/plsurf3d.3plplot | 2 +-
doc/docbook/src/plsurf3d.html | 2 +-
doc/docbook/src/plsvect.3plplot | 2 +-
doc/docbook/src/plsvect.html | 2 +-
doc/docbook/src/plsvpa.3plplot | 2 +-
doc/docbook/src/plsvpa.html | 2 +-
doc/docbook/src/plsxax.3plplot | 2 +-
doc/docbook/src/plsxax.html | 2 +-
doc/docbook/src/plsyax.3plplot | 2 +-
doc/docbook/src/plsyax.html | 2 +-
doc/docbook/src/plsym.3plplot | 2 +-
doc/docbook/src/plsym.html | 2 +-
doc/docbook/src/plszax.3plplot | 2 +-
doc/docbook/src/plszax.html | 2 +-
doc/docbook/src/pltext.3plplot | 2 +-
doc/docbook/src/pltext.html | 14 +-
doc/docbook/src/pltimefmt.3plplot | 35 +
doc/docbook/src/{plszax.html => pltimefmt.html} | 192 +-
doc/docbook/src/pltr0.html | 2 +-
doc/docbook/src/pltr1.html | 2 +-
doc/docbook/src/pltr2.html | 2 +-
doc/docbook/src/plvasp.3plplot | 2 +-
doc/docbook/src/plvasp.html | 14 +-
doc/docbook/src/plvec0.html | 2 +-
doc/docbook/src/plvec1.html | 2 +-
doc/docbook/src/plvec2.html | 2 +-
doc/docbook/src/plvect.3plplot | 2 +-
doc/docbook/src/plvect.html | 2 +-
doc/docbook/src/plvectfortran77.html | 2 +-
doc/docbook/src/plvpas.3plplot | 2 +-
doc/docbook/src/plvpas.html | 2 +-
doc/docbook/src/plvpor.3plplot | 2 +-
doc/docbook/src/plvpor.html | 2 +-
doc/docbook/src/plvsta.3plplot | 4 +-
doc/docbook/src/plvsta.html | 4 +-
doc/docbook/src/plw3d.3plplot | 2 +-
doc/docbook/src/plw3d.html | 2 +-
doc/docbook/src/plwid.3plplot | 2 +-
doc/docbook/src/plwid.html | 2 +-
doc/docbook/src/plwind.3plplot | 4 +-
doc/docbook/src/plwind.html | 4 +-
doc/docbook/src/plxormod.3plplot | 2 +-
doc/docbook/src/plxormod.html | 2 +-
doc/docbook/src/static_built_files | 8 +-
doc/docbook/src/windows-notes.html | 2 +-
doc/docbook/src/{x12680.html => x13237.html} | 2 +-
drivers/CMakeLists.txt | 18 +-
drivers/Makefile.am | 461 -
drivers/Makefile.in | 1748 -
drivers/aqt.c | 248 +-
drivers/cairo.c | 24 +-
drivers/cgm.c | 4 +-
drivers/dg300.c | 4 +-
drivers/gcw.c | 2 +-
drivers/gd.c | 58 +-
drivers/gnome.c | 4 +-
drivers/hpgl.c | 4 +-
drivers/impress.c | 4 +-
drivers/linuxvga.c | 4 +-
drivers/ljii.c | 4 +-
drivers/ljiip.c | 4 +-
drivers/mem.c | 4 +-
drivers/ntk.c | 4 +-
drivers/null.c | 4 +-
drivers/pbm.c | 4 +-
drivers/pdf.c | 2 +-
drivers/plmeta.c | 4 +-
drivers/ps.c | 4 +-
drivers/pstex.c | 2 +-
drivers/psttf.cc | 6 +-
drivers/svg.c | 4 +-
drivers/tek.c | 4 +-
drivers/tk.c | 10 +-
drivers/tkwin.c | 4 +-
drivers/wingcc.c | 4 +-
drivers/wxwidgets.cpp | 322 +-
drivers/xfig.c | 4 +-
drivers/xwin.c | 4 +-
drivers/xwinttf.c | 2 +-
examples/CMakeLists.txt | 24 +
examples/Makefile.am | 29 -
examples/Makefile.examples | 2 +-
examples/Makefile.in | 806 -
examples/ada/CMakeLists.txt | 23 +-
examples/{f77 => ada}/Makefile.examples.in | 66 +-
examples/ada/x06a.adb.cmake | 92 +
examples/ada/x07a.adb.cmake | 94 +
examples/ada/xthick06a.adb.cmake | 92 +
examples/ada/xthick07a.adb.cmake | 94 +
examples/c++/CMakeLists.txt | 28 +-
examples/c++/Makefile.am | 141 -
examples/c++/Makefile.examples.in | 2 +
examples/c++/Makefile.in | 1118 -
examples/c++/plc++demos.h | 9 +-
examples/c++/wxPLplotDemo.cpp | 33 +-
examples/c++/x01.cc | 10 +-
examples/c++/x01cc.cc | 8 +-
examples/c++/x02.cc | 8 +-
examples/c++/x03.cc | 8 +-
examples/c++/x04.cc | 8 +-
examples/c++/x05.cc | 8 +-
examples/c++/x06.cc | 8 +-
examples/c++/x07.cc | 8 +-
examples/c++/x08.cc | 12 +-
examples/c++/x09.cc | 16 +-
examples/c++/x10.cc | 8 +-
examples/c++/x11.cc | 8 +-
examples/c++/x12.cc | 8 +-
examples/c++/x13.cc | 10 +-
examples/c++/x14.cc | 12 +-
examples/c++/x15.cc | 8 +-
examples/c++/x16.cc | 12 +-
examples/c++/x17.cc | 10 +-
examples/c++/x18.cc | 8 +-
examples/c++/x19.cc | 8 +-
examples/c++/x20.cc | 16 +-
examples/c++/x21.cc | 12 +-
examples/c++/x22.cc | 8 +-
examples/c++/x23.cc | 16 +-
examples/c++/x24.cc | 10 +-
examples/c++/x25.cc | 8 +-
examples/c++/x26.cc | 25 +-
examples/c++/x28.cc | 12 +-
examples/c++/x29.cc | 235 +
examples/c++/x30.cc | 195 +
examples/c/CMakeLists.txt | 26 +-
examples/c/Makefile.am | 106 -
examples/c/Makefile.examples.in | 2 +
examples/c/Makefile.in | 1035 -
examples/c/plplotcanvas_animation.c | 8 +-
examples/c/plplotcanvas_demo.c | 8 +-
examples/c/x01c.c | 6 +-
examples/c/x02c.c | 4 +-
examples/c/x03c.c | 4 +-
examples/c/x04c.c | 4 +-
examples/c/x05c.c | 4 +-
examples/c/x06c.c | 4 +-
examples/c/x07c.c | 4 +-
examples/c/x08c.c | 4 +-
examples/c/x09c.c | 4 +-
examples/c/x10c.c | 4 +-
examples/c/x11c.c | 4 +-
examples/c/x12c.c | 4 +-
examples/c/x13c.c | 4 +-
examples/c/x14c.c | 4 +-
examples/c/x15c.c | 4 +-
examples/c/x16c.c | 6 +-
examples/c/x17c.c | 6 +-
examples/c/x18c.c | 4 +-
examples/c/x19c.c | 4 +-
examples/c/x20c.c | 4 +-
examples/c/x21c.c | 4 +-
examples/c/x22c.c | 4 +-
examples/c/x23c.c | 2 +-
examples/c/x24c.c | 2 +-
examples/c/x25c.c | 4 +-
examples/c/x26c.c | 4 +-
examples/c/x27c.c | 4 +-
examples/c/x28c.c | 4 +-
examples/c/x29c.c | 215 +
examples/c/x30c.c | 161 +
examples/f77/CMakeLists.txt | 2 +
examples/f77/Makefile.am | 205 -
examples/f77/Makefile.examples.in | 4 +-
examples/f77/Makefile.in | 1070 -
examples/f77/x29f.fm4 | 225 +
examples/f77/x30f.fm4 | 164 +
examples/f95/CMakeLists.txt | 2 +
examples/f95/Makefile.am | 122 -
examples/f95/Makefile.examples.in | 4 +-
examples/f95/Makefile.in | 1019 -
examples/f95/x09f.f90 | 4 +-
examples/f95/x16af.f90 | 4 +-
examples/f95/x28f.f90 | 25 +-
examples/f95/x29f.f90 | 220 +
examples/f95/x30f.f90 | 163 +
examples/java/CMakeLists.txt | 41 +-
examples/java/Makefile.am | 130 -
examples/java/Makefile.examples.in | 4 +-
examples/java/Makefile.in | 772 -
examples/java/x29.java | 223 +
examples/java/x30.java | 189 +
examples/{c => }/lena.pgm | 0
examples/perl/Makefile.am | 64 -
examples/perl/Makefile.in | 703 -
examples/python/CMakeLists.txt | 2 +
examples/python/Makefile.am | 157 -
examples/python/Makefile.in | 820 -
examples/python/plplot_python_start.py.in | 16 -
data/Makefile.am => examples/python/x29 | 36 +-
bindings/gnome2/Makefile.am => examples/python/x30 | 30 +-
examples/python/xw29.py | 170 +
examples/python/xw30.py | 138 +
examples/tcl/CMakeLists.txt | 8 +
examples/tcl/Makefile.am | 106 -
examples/tcl/Makefile.in | 773 -
examples/tk/Makefile.am | 142 -
examples/tk/Makefile.in | 959 -
examples/tk/xtk01.c | 4 +-
examples/tk/xtk02.c | 6 +-
examples/tk/xtk04.c | 8 +-
fonts/Makefile.am | 38 -
fonts/Makefile.in | 627 -
include/Makefile.am | 65 -
include/Makefile.in | 862 -
include/disptab.h | 6 +-
include/pdf.h | 12 +-
include/plConfig.h.in | 90 -
include/plDevs.h.in | 78 -
include/plcore.h | 4 +-
include/plplot.h | 101 +-
include/plplotP.h | 30 +-
include/plstrm.h | 6 +-
lib/Makefile.am | 31 -
lib/Makefile.in | 770 -
lib/csa/Makefile.am | 40 -
lib/csa/Makefile.in | 767 -
lib/nn/Makefile.am | 48 -
lib/nn/Makefile.in | 782 -
libltdl/COPYING.LIB | 515 -
libltdl/Makefile.am | 32 -
libltdl/Makefile.in | 645 -
libltdl/README | 10 -
libltdl/acinclude.m4 | 6818 --
libltdl/aclocal.m4 | 863 -
libltdl/autom4te.cache/output.0 | 23173 ------
libltdl/autom4te.cache/output.1 | 23173 ------
libltdl/autom4te.cache/requests | 365 -
libltdl/autom4te.cache/traces.0 | 9784 ---
libltdl/autom4te.cache/traces.1 | 670 -
libltdl/config-h.in | 195 -
libltdl/config.guess | 1471 -
libltdl/config.sub | 1599 -
libltdl/configure | 23173 ------
libltdl/configure.ac | 79 -
libltdl/install-sh | 401 -
libltdl/ltdl.c | 4521 --
libltdl/ltdl.h | 366 -
libltdl/ltmain.sh | 6863 --
libltdl/missing | 353 -
pkgcfg/Makefile.am | 69 -
pkgcfg/Makefile.in | 674 -
pkgcfg/gen-pc-files.pl.in | 139 -
scripts/Makefile.am | 37 -
scripts/Makefile.in | 678 -
scripts/get-dependency-libs.sh | 53 -
scripts/htdocs-gen_plot-examples.sh | 6 +-
scripts/make_tarball.sh | 8 +-
scripts/plplot-config.in | 208 -
scripts/rm-cvs-tarball-tags.pl | 31 -
src/CMakeLists.txt | 2 +-
src/Makefile.am | 70 -
src/Makefile.in | 826 -
src/pdfutils.c | 4 +-
src/plargs.c | 220 +-
src/plbox.c | 99 +-
src/plcore.c | 53 +-
src/plctrl.c | 315 +-
src/pldeprecated.c | 4 +-
src/pldtik.c | 114 +-
src/plmap.c | 6 +-
src/plot3d.c | 6 +-
src/plstripc.c | 8 +-
src/plsym.c | 12 +-
src/plvpor.c | 50 +-
test/CMakeLists.txt | 12 +-
test/Makefile.am | 79 -
test/Makefile.in | 766 -
test/plplot-test.sh.in | 233 -
test/test_ada.sh.in | 2 +-
test/test_c.sh.in | 2 +-
test/test_cxx.sh.in | 2 +-
test/test_f77.sh.in | 4 +-
test/test_f95.sh.in | 4 +-
test/test_java.sh.in | 2 +-
test/test_octave.sh.in | 9 +-
test/test_python.sh.in | 2 +-
utils/Makefile.am | 50 -
utils/Makefile.in | 786 -
utils/plrender.c | 30 +-
utils/pltcl.c | 4 +-
www/index.html | 4 +-
774 files changed, 107760 insertions(+), 393348 deletions(-)
diff --cc debian/changelog
index 4b51ed9,49ad877..d96047a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,14 +1,40 @@@
-plplot (5.8.0-7) UNRELEASED; urgency=low
++plplot (5.9.0-1) unstable; urgency=low
+
- [ Rafael Laboissiere ]
- * debian/control: Fixed capitalization of GNOME (Lintian warning)
- * debian/patches/09_pdftex-EC-encoding.dpatch: Added patch for getting
- included the correct ec.enc file for the EC encoding, such that
- ligatures like "ff" and "fi" display correctly in the PDF form of the
- documentation (closes: #461343)
++ [ Andrew Ross ]
++ * New upstream release
++ * debian/patches/00list: Remove patches
++ 05_octave_documentation.dpatch
++ 06_build_dir_use_physical_path.dpatch
++ 08_fix_cxx_includes.dpatch
++ as they are now included upstream
++ * debian/rules, debian/control, debian/libplplot-ada.files,
++ debian/liplplot-dev.files:
++ Add new package libplplot-ada to contain the Ada bindings. Include
++ examples and source in with the libplplot-dev package (following
++ Ada policy).
++ * debian/libplplot9.README.Debian: Update to include new ada
++ bindings package.
+
- -- Rafael Laboissiere <rafael at debian.org> Fri, 18 Jan 2008 13:26:34 +0100
++ [ Rafael Laboissiere ]
++ * debian/control:
++ + Fixed capitalization of GNOME (Lintian warning)
++ + Force build-dependency on octave3.0 >= 3.0.0-2, ensuring the
++ transition from g77 to gfortran. Also, drop the unnecessary
++ build-dependencies on blas, atlas, and lapack, since they are pulled
++ in by octave3.0.
++ * Add dpatches:
++ + 09_pdftex-EC-encoding: Include the correct ec.enc file for the EC
++ encoding, such that ligatures like "ff" and "fi" display correctly
++ in the PDF form of the documentation (closes: #461343)
++ + 10_print-usage-octave-3.0: Use the appropriate call to print_usage
++ in wrap_octave.pl when building against octave3.0
++ * debian/patches/04_use-mkoctfile.dpatch: Adjust for installing
++ plplot_octave.oct with the appropriate execution permissions,
++ otherwise dpkg-shlibdeps does not work correctly for the octave-plplot
++ package
++
++ -- Rafael Laboissiere <rafael at debian.org> Sun, 24 Feb 2008 12:43:28 +0100
+
plplot (5.8.0-6) unstable; urgency=low
[ Andrew Ross ]
diff --cc debian/control
index aaa9a3b,ccf5e69..f5c460a
--- a/debian/control
+++ b/debian/control
@@@ -6,16 -6,16 +6,15 @@@ Uploaders: Rafael Laboissiere <rafael at d
Standards-Version: 3.7.3
Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev,
-- libxi-dev, gfortran, itk3-dev, octave3.0-headers,
++ libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2),
libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev,
libgnomeprintui2.2-dev, libgnomeui-dev,
m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl,
-- libltdl3-dev, pkg-config, dpatch, atlas3-base-dev
-- [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k],
++ libltdl3-dev, pkg-config, dpatch,
python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm],
-- fastjar, swig
++ fastjar, swig, gnat
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex
Build-Conflicts: libplplot5, octave2.1-headers
@@@ -202,6 -202,6 +201,14 @@@ Description: Octave support for PLplot
library. It provides an almost drop-in replacement for the traditional
Gnuplot graphical interface in Octave. Examples are also provided.
++Package: libplplot-ada
++Architecture: any
++Priority: extra
++Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}
++Description: Ada support for PLplot, a plotting library
++ This package contains the Ada bindings for PLplot, a scientific plotting
++ library.
++
Package: plplot-doc
Architecture: all
Section: doc
diff --cc debian/libplplot-ada.files
index 0000000,0000000..033d979
new file mode 100644
--- /dev/null
+++ b/debian/libplplot-ada.files
@@@ -1,0 -1,0 +1,3 @@@
++usr/lib/libplplotada*.so.*
++usr/lib/ada
++usr/share/doc/libplplot-ada
diff --cc debian/libplplot-dev.files
index d13c6ab,d13c6ab..45a60a1
--- a/debian/libplplot-dev.files
+++ b/debian/libplplot-dev.files
@@@ -6,3 -6,3 +6,4 @@@ usr/lib/pkgconfi
usr/share/doc/libplplot9/examples
usr/share/doc/libplplot9/README.pkg-config
usr/share/doc/libplplot-dev
++usr/share/ada
diff --cc debian/libplplot9.README.Debian
index 4034dcd,4034dcd..d29d91a
--- a/debian/libplplot9.README.Debian
+++ b/debian/libplplot9.README.Debian
@@@ -44,13 -44,13 +44,15 @@@ plplot for Debia
* libplplot-c++9c2: Contains the library for using the C++ PLplot
classes.
-- * libplplot-fortran9: Contains the F77 and F90 binding for
++ * libplplot-fortran9: Contains the F77 and F90 bindings for
the PLplot functions.
* libplplot9-java: Contains the bindings for using the PLplot
functions from java. This package is currently empty on arm due
to problems with java-gcj-compat-dev on this platform.
++ * libplplot9-ada: Contains the Ada bindings for the PLplot functions.
++
* plplot-tcl: Modules allowing binding of the PLplot functions
for Tcl/Tk. Contains also the Tk driver module and some interactive
programs
diff --cc debian/patches/00list
index c65fc37,f17e311..2e2a167
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,7 -1,8 +1,6 @@@
01_check-for-octave2.9
02_unset-python-path
04_use-mkoctfile
--05_octave_documentation
--06_build_dir_use_physical_path
07_octave_prune_examples
--08_fix_cxx_includes
+ 09_pdftex-EC-encoding
++10_print-usage-octave-3.0
diff --cc debian/patches/04_use-mkoctfile.dpatch
index ace4a49,ace4a49..04ff31c
--- a/debian/patches/04_use-mkoctfile.dpatch
+++ b/debian/patches/04_use-mkoctfile.dpatch
@@@ -7,7 -7,7 +7,7 @@@
--- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt
+++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt
--@@ -128,66 +128,24 @@
++@@ -133,64 +133,34 @@
${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
)
@@@ -54,15 -54,15 +54,17 @@@
- )
-endif(USE_RPATH)
-
---# Have to be specific about permissions for some reason (probably oct suffix).
---set(PERM_MODULES
---OWNER_READ
---OWNER_WRITE
---OWNER_EXECUTE
---GROUP_READ
---GROUP_EXECUTE
---WORLD_READ
---WORLD_EXECUTE
++ # Have to be specific about permissions for some reason (probably oct suffix).
++ set(PERM_MODULES
++ OWNER_READ
++ OWNER_WRITE
++ OWNER_EXECUTE
++ GROUP_READ
++ GROUP_EXECUTE
++ WORLD_READ
++ WORLD_EXECUTE
++ )
++
+add_custom_command(
+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
@@@ -75,8 -75,8 +77,8 @@@
+add_custom_target(
+plplot_octave_oct_file ALL
+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
-- )
--
+++)
+++
install(
-TARGETS
-plplot_octave
@@@ -84,11 -84,11 +86,9 @@@
+FILES
+${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
DESTINATION ${OCTAVE_OCT_DIR}
---PERMISSIONS ${PERM_MODULES}
++ PERMISSIONS ${PERM_MODULES}
)
--
-- # Build and install plplot_stub.m
--@@ -233,23 +191,4 @@
++@@ -238,23 +208,4 @@
DESTINATION ${PLPLOT_OCTAVE_DIR}
)
diff --cc debian/patches/10_print-usage-octave-3.0.dpatch
index 0000000,0000000..e4003dd
new file mode 100644
--- /dev/null
+++ b/debian/patches/10_print-usage-octave-3.0.dpatch
@@@ -1,0 -1,0 +1,38 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <rafael at debian.org>
++##
++## DP: Use correct call to print_usage in wrap_octave.pl when compiling
++## DP: against octave3.0
++
++ at DPATCH@
++
++--- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl
+++++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl
++@@ -10,7 +10,7 @@
++ # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the
++ # perl artistic license (http://language.perl.com/misc/Artistic.html).
++ #
++-# Modifications 2007 Andrew Ross
+++# Modifications 2007 Andrew Ross
++ # This version contains three local fixes for plplot
++ # 1) Change _dim function to allow a zero length array (required by plstyl)
++ # 2) Alter string to std::string for compatibility with gcc3.2 and later
++@@ -18,6 +18,9 @@
++ # from v2.1 to v2.9. This requires a file octave_version.pl which defines
++ # the variable octave_version.
++ #
+++# Modifications 2008 Rafael Laboissiere
+++# Change 3) above is adapted for Octave v3.0
+++
++
++ package octave; # Everything should be in this package.
++
++@@ -158,7 +161,7 @@
++ # Permissible not to specify output args
++ # if there is only one.
++ @ver = split(/\./,$octave_version);
++- if ($ver[0] >= 2 && $ver[1] >= 9) {
+++ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) {
++ $retstr .= (")\n" .
++ " {\n" .
++ " print_usage();\n" . # Give an error.
diff --cc debian/rules
index 08f8f49,08f8f49..eabe20d
--- a/debian/rules
+++ b/debian/rules
@@@ -34,7 -34,7 +34,8 @@@ ifeq ($(DEB_BUILD_ARCH),arm
CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
-DOCTAVE_OCT_DIR=$(OCTDIR) \
-- -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF
++ -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF \
++ -DENABLE_ada=ON
else
CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
@@@ -42,7 -42,7 +43,8 @@@
-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \
-DOCTAVE_OCT_DIR=$(OCTDIR) \
-- -DUSE_RPATH=OFF -DPLD_psttf=OFF
++ -DUSE_RPATH=OFF -DPLD_psttf=OFF \
++ -DENABLE_ada=ON
endif
BUILD_DIR = $(debbase)/build_tmp
@@@ -117,7 -117,7 +119,7 @@@ install-arch-stamp: build-arch-stam
python-plplot plplot-bin libplplot-c++9c2 \
plplot9-driver-gnome2 plplot9-driver-wxwidgets \
plplot9-driver-cairo libplplot-fortran9 \
-- libplplot9-java; do \
++ libplplot9-java libplplot-ada; do \
ln -s $(libpkg) $(debdoc)/$$i ; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git
More information about the debian-science-commits
mailing list