[plplot] 48/68: Import Debian changes 5.9.5-2
Ole Streicher
olebole at moszumanska.debian.org
Mon Jul 10 07:38:35 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 56b1073be8d19fc801a65dcb66222036a63868b6
Merge: e315ec7 4790cf7
Author: Andrew Ross <andrewross at users.sourceforge.net>
Date: Mon Feb 22 12:50:40 2010 +0000
Import Debian changes 5.9.5-2
plplot (5.9.5-2) unstable; urgency=low
* debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be
dropped.
* debian/rules: explicitly enable jpeg, png and gif drivers as they are
now disabled by default. Eventually these will be replaced by cairo
and qt drivers, but keep them in for now until these packages have
settled down.
plplot (5.9.5-1) UNRELEASED; urgency=low
* New upstream release.
* debian/patches/series: Remove the following patches which are no longer
required as they are now included upstream
13_fix-kfreeBSD-build.diff
14_octave-3.0-fixes.diff
15_octave-toggle-plplot-use.diff
and clean up directory by deleting unused patches.
* debian/patches/02_unset-python-path.diff,
debian/patches/04_use-mkoctfile.diff,
debian/patches/07_octave_prune_examples.diff,
debian/patches/16_wxwidget-with-cmake-2.8.diff:
+ Update patches to work with plplot 5.9.5
* debian/control.in, debian/rules:
+ Properly enable support for ada on all architectures (except armel)
- build dependencies were not updated.
+ Add sh4 to the list of architectures where gnat is not available and
so ada support is disabled. (closes: #562238)
+ Drop the plplot9-driver-gnome2 package which is unmaintained
upstream and depends on libgnomeprintui-2.2 which is to be dropped
from Debian. (closes: #542577)
+ Ensure ghostscript is installed in Build-Depends-Indep: since this
is needed to generate fonts for pdfjadetex, but is not automatically
pulled in.
* debian/rules: Remove setting of ITCL_LIBRARY which is not required
with latest version of itcl.
* debian/libplplot9.files: Ensures .pal palette files are correctly installed
* Rebuild package to use latest versions of gfortran (closes: #564065)
and python (closes: #562411)
plplot (5.9.2-4) UNRELEASED; urgency=low
* debian/patches/02_unset-python-path.diff: Fix offset in patch
to remove quilt warning. (closes: #538533)
* debian/control.in:
+ Remove arm build dependency on g++-4.1. (closes: #533806)
+ Update build dependency on tcl / tk to 8.5 (compatible with
latest itcl). (closes: #545302)
+ Add dpkg (>=1.15.4) | install-info dependency for plplot-doc to correctly
handle info install triggers. Fixes lintian warning.
+ Bump debian standards version to 3.8.3.
+ Fix typo in java bindings package description. (closes: #557677)
+ Add ${misc:Depends} to all binary package dependencies. Fixes lintian
warning.
* debian/control.in, debian/rules:
+ Update java to build-dep on default-jdk and runtime depend on default-jre
which should work for all architectures.
+ Update ada packages so built on all architectures except armel where gnat
seems to be unavailable. (closes: #544187)
* debian/patches/16_wxwidget-with-cmake-2.8.diff: New patch ported from
upstream to fix wxwidget build with cmake 2.8.0.
* debian/control.in: Bump wxgtk version to 2.8. Require cmake 2.8.0 to build.
.gitignore | 4 +
CMakeLists.txt | 52 +-
INSTALL | 14 +-
OLD-README.release | 1613 +
README.Release_Manager_Cookbook | 190 +-
README.release | 411 +-
bindings/CMakeLists.txt | 4 +-
bindings/ada/CMakeLists.txt | 101 +-
bindings/ada/plplot.adb.cmake | 82 +-
bindings/ada/plplot.ads.cmake | 26 +-
bindings/ada/plplot_auxiliary.ads.cmake | 5 +-
bindings/ada/plplot_thin.ads.cmake | 28 +-
bindings/ada/plplot_traditional.adb.cmake | 78 +-
bindings/ada/plplot_traditional.ads.cmake | 21 +-
bindings/c++/CMakeLists.txt | 174 +-
bindings/c++/plstream.cc | 80 +-
bindings/c++/plstream.h | 38 +-
bindings/d/CMakeLists.txt | 148 +-
bindings/d/README.txt | 84 +-
bindings/d/plplot.d | 3577 +-
bindings/f77/CMakeLists.txt | 394 +-
bindings/f77/plplotf77_mingw.def | 45 +
bindings/f77/plstubs.h | 9 +-
bindings/f77/scstubs.c | 101 +-
bindings/f77/sfstubs.fm4 | 201 +-
bindings/f95/CMakeLists.txt | 420 +-
bindings/f95/plflt.c | 0
bindings/f95/plplotf95.def | 0
bindings/f95/plplotf95_mingw.def | 78 +
bindings/f95/plstubs.h | 11 +-
bindings/f95/readme_f95.txt | 0
bindings/f95/sc3d.c | 2 +-
bindings/f95/sccont.c | 2 +-
bindings/f95/scstubs.c | 102 +-
bindings/f95/sfstubs.f90 | 35 +-
bindings/f95/sfstubs.h | 2 +-
bindings/gnome2/lib/CMakeLists.txt | 4 +-
bindings/gnome2/python/CMakeLists.txt | 1 +
bindings/java/CMakeLists.txt | 13 +-
bindings/java/PLCallback.java | 7 -
bindings/java/PLCallbackLabel.java | 7 +
bindings/java/PLCallbackMapform.java | 7 +
bindings/java/PLStream.java | 48 +-
bindings/java/plplotjavac.i | 138 +-
bindings/lua/CMakeLists.txt | 80 +
bindings/lua/plplotluac.i | 1167 +
bindings/ocaml/myocamlbuild.ml.cmake | 1 +
bindings/ocaml/plcairo/META | 9 +
bindings/ocaml/plcairo/Makefile | 40 +
bindings/ocaml/plcairo/README.plcairo | 35 +
bindings/ocaml/plcairo/_tags | 2 +
bindings/ocaml/plcairo/libplcairo_stubs.clib | 1 +
bindings/ocaml/plcairo/myocamlbuild.ml | 125 +
bindings/ocaml/plcairo/plcairo.ml | 283 +
bindings/ocaml/plcairo/plcairo_impl.c | 46 +
bindings/ocaml/plcairo/tests/cairo_raster.ml | 49 +
bindings/ocaml/plcairo/tests/gtk_interface.ml | 95 +
bindings/ocaml/plcairo/tests/multiple_pages.ml | 45 +
bindings/ocaml/plplot.idl | 19 +
bindings/ocaml/plplot_h | 72 +-
bindings/ocaml/plplot_h.inc | 15 +-
bindings/ocaml/plplot_impl.c | 47 +-
bindings/ocaml/touchup.ml | 11 +
bindings/octave/CMakeLists.txt | 428 +-
bindings/octave/PLplot/autostyle.m | 5 +-
bindings/octave/PLplot/axis.m | 5 +-
bindings/octave/PLplot/closefig.m | 2 +-
bindings/octave/PLplot/colormap.m | 5 +-
bindings/octave/PLplot/figure.m | 22 +-
bindings/octave/PLplot/grid.m | 5 +-
bindings/octave/PLplot/legend.m | 5 +-
bindings/octave/PLplot/plot_margin.m | 5 +-
bindings/octave/PLplot/plplot_octave_path.m.in | 2 +-
bindings/octave/PLplot/shade.m | 16 +-
bindings/octave/PLplot/shading.m | 5 +-
bindings/octave/PLplot/support/__pl_contour.m | 15 +-
bindings/octave/PLplot/support/__pl_matstr.m | 15 +-
bindings/octave/PLplot/support/__pl_plotit.m | 15 +-
bindings/octave/PLplot/title.m | 5 +-
bindings/octave/PLplot/toggle_plplot_use.m | 47 +-
bindings/octave/PLplot/xlabel.m | 5 +-
bindings/octave/PLplot/xticks.m | 5 +-
bindings/octave/PLplot/ylabel.m | 5 +-
bindings/octave/PLplot/yticks.m | 7 +-
bindings/octave/PLplot/zlabel.m | 5 +-
bindings/octave/USAGE | 15 +-
bindings/octave/demos/CMakeLists.txt | 84 -
bindings/octave/demos/p1.m | 49 -
bindings/octave/demos/p10.m | 34 -
bindings/octave/demos/p11.m | 57 -
bindings/octave/demos/p12.m | 39 -
bindings/octave/demos/p13.m | 43 -
bindings/octave/demos/p14.m | 73 -
bindings/octave/demos/p15.m | 43 -
bindings/octave/demos/p16.m | 38 -
bindings/octave/demos/p17.m | 39 -
bindings/octave/demos/p18.m | 40 -
bindings/octave/demos/p19.m | 107 -
bindings/octave/demos/p2.m | 38 -
bindings/octave/demos/p21.m | 67 -
bindings/octave/demos/p3.m | 46 -
bindings/octave/demos/p4.m | 34 -
bindings/octave/demos/p5.m | 34 -
bindings/octave/demos/p6.m | 35 -
bindings/octave/demos/p7.m | 42 -
bindings/octave/demos/p8.m | 35 -
bindings/octave/demos/p9.m | 47 -
bindings/octave/demos/x03c.m | 100 -
bindings/octave/demos/x16c.m | 258 -
bindings/octave/demos/x24c.m | 149 -
bindings/octave/demos/x27c.m | 141 -
bindings/octave/demos/x28c.m | 363 -
bindings/octave/demos/x29c.m | 204 -
bindings/octave/demos/x30c.m | 153 -
bindings/octave/demos/x31c.m | 249 -
bindings/octave/massage.c | 29 +-
bindings/octave/octaverc.in | 11 +-
bindings/octave/plplot_octave.h.in | 58 +-
bindings/octave/plplot_octave_txt/plaxes.txt | 3 +
bindings/octave/plplot_octave_txt/plbox.txt | 3 +
bindings/octave/plplot_octave_txt/plbox3.txt | 6 +
bindings/octave/plplot_octave_txt/plenv.txt | 4 +
bindings/octave/plplot_octave_txt/plenv0.txt | 4 +
bindings/octave/plplot_octave_txt/plscmap0a.txt | 2 +-
bindings/octave/plplot_octave_txt/plscmap1a.txt | 2 +-
bindings/octave/plplot_octave_txt/plscmap1la.txt | 2 +-
bindings/octave/plplot_octave_txt/plscol0a.txt | 2 +-
bindings/octave/plplot_octave_txt/plslabelfunc.txt | 29 +
bindings/octave/plplot_octave_txt/plsori.txt | 3 +-
bindings/python/1.4b3/Setup | 341 -
bindings/python/1.4b3/_tkinter.c | 1485 -
bindings/python/CMakeLists.txt | 227 +-
bindings/python/Plframe.py | 38 +-
bindings/python/README.pythonbuild | 242 +-
bindings/python/TclSup.py | 5 +-
bindings/python/plplot_widgetmodule.c | 90 +-
bindings/python/plplotcmodule.i | 131 +-
bindings/qt_gui/CMakeLists.txt | 145 +
bindings/qt_gui/plqt.cpp | 1230 +
bindings/qt_gui/pyqt4/CMakeLists.txt | 104 +
bindings/qt_gui/pyqt4/plplot_pyqt4.sip | 83 +
bindings/swig-support/plplotcapi.i | 42 +-
bindings/tcl/CMakeLists.txt | 3 +
bindings/tcl/plapi.tpl | 62 +-
bindings/tcl/pltcl.h | 12 +-
bindings/tcl/pltclgen.tcl | 4 +-
bindings/tcl/tclAPI.c | 4 +-
bindings/tcl/tclMatrix.c | 11 +-
bindings/tcl/tclcmd.tpl | 2 +-
bindings/tk-x-plat/plplotter.c | 4 +-
bindings/tk/CMakeLists.txt | 1 +
bindings/tk/PLWin.itk | 14 +-
bindings/tk/plframe.c | 4 +-
bindings/tk/plserver.h | 6 +-
bindings/tk/tcpip.c | 4 +-
bindings/tk/tcpip.h | 6 +-
bindings/tk/tkMain.c | 6 +-
bindings/wxwidgets/CMakeLists.txt | 2 +
bindings/wxwidgets/wxPLplotstream.cpp | 83 +-
bindings/wxwidgets/wxPLplotstream.h.in | 21 +-
bindings/wxwidgets/wxPLplotwindow.cpp | 13 +-
bindings/wxwidgets/wxPLplotwindow.h | 9 +-
cmake/external/libcd/CMakeLists.txt | 39 -
cmake/modules/CMakeAdaInformation.cmake | 10 +-
cmake/modules/CMakeDCompiler.cmake.in | 46 +
cmake/modules/CMakeDInformation.cmake | 297 +
cmake/modules/CMakeD_Copyright.txt | 30 +
cmake/modules/CMakeDetermineDCompiler.cmake | 108 +
cmake/modules/CMakeFortranInformation.cmake | 9 +-
cmake/modules/CMakeTestDCompiler.cmake | 175 +
cmake/modules/CheckITCL_Available.tcl | 1 +
cmake/modules/CheckPrototypeExists.cmake | 5 +-
cmake/modules/FindAGG.cmake | 124 +-
cmake/modules/FindCD.cmake | 38 -
cmake/modules/Findhpdf.cmake | 7 +-
cmake/modules/GetITCL_Version.tcl | 2 +
cmake/modules/Platform/Cygwin-GNU-Fortran.cmake | 25 +
cmake/modules/Platform/Darwin-dmd.cmake | 35 +
cmake/modules/Platform/Linux-dmd.cmake | 35 +
cmake/modules/Platform/Linux-gdc.cmake | 36 +
cmake/modules/Platform/Windows-GNU-Fortran.cmake | 35 +
cmake/modules/Platform/Windows-df.cmake | 0
cmake/modules/Platform/Windows-dmd.cmake | 36 +
cmake/modules/Platform/Windows-f90.cmake | 0
cmake/modules/Platform/Windows-gdc.cmake | 36 +
cmake/modules/TestBrokenIsnanCXX.cmake | 6 +-
cmake/modules/TestBrokenIsnanCXX.cxx | 2 +-
cmake/modules/TestF77CmdLine.cmake | 25 +-
cmake/modules/TestF77CmdLine.f | 4 +-
cmake/modules/TestForNamespace.cmake | 4 +-
cmake/modules/TestForStdintCXX.cmake | 4 +-
cmake/modules/TestNaNAware.c | 8 +
cmake/modules/ada.cmake | 23 +-
cmake/modules/agg.cmake | 11 -
cmake/modules/aqt.cmake | 26 +-
cmake/modules/c++.cmake | 42 +-
cmake/modules/cairo.cmake | 26 +-
cmake/modules/cgm.cmake | 25 +-
cmake/modules/csiro.cmake | 4 +-
cmake/modules/d.cmake | 48 +
cmake/modules/docbook.cmake | 6 +
cmake/modules/drivers-finish.cmake | 49 +
cmake/modules/drivers-init.cmake | 235 +-
cmake/modules/drivers.cmake | 17 +-
cmake/modules/fortran.cmake | 34 +-
cmake/modules/gcw.cmake | 12 +-
cmake/modules/java.cmake | 28 +-
cmake/modules/language_support.cmake | 108 +
cmake/modules/lua.cmake | 128 +
cmake/modules/ocaml.cmake | 4 +-
cmake/modules/octave.cmake | 122 +-
cmake/modules/pango.cmake | 4 +-
cmake/modules/pdf.cmake | 2 +-
cmake/modules/pdl.cmake | 55 +-
cmake/modules/pkg-config.cmake | 21 +-
cmake/modules/plplot.cmake | 185 +-
cmake/modules/plplot_version.cmake | 20 +-
cmake/modules/psttf.cmake | 11 +-
cmake/modules/python.cmake | 65 +-
cmake/modules/qt.cmake | 202 +
cmake/modules/summary.cmake | 7 +-
cmake/modules/tcl-related.cmake | 69 +-
cmake/modules/wingcc.cmake | 13 +-
cmake/modules/wxwidgets.cmake | 114 +-
cmake/modules/xwin.cmake | 4 +
config.h.cmake | 178 +-
data/CMakeLists.txt | 9 +
data/cmap0_alternate.pal | 17 +
data/cmap0_black_on_white.pal | 17 +
data/cmap0_default.pal | 17 +
data/cmap0_white_bg.pal | 17 +
data/cmap1_blue_red.pal | 4 +
data/cmap1_blue_yellow.pal | 10 +
data/cmap1_default.pal | 7 +
data/cmap1_gray.pal | 4 +
data/cmap1_radar.pal | 18 +
debian/changelog | 69 +
debian/control | 83 +-
debian/control.in | 87 +-
debian/libplplot9.README.Debian | 2 -
debian/libplplot9.files | 1 +
debian/patches/02_unset-python-path.diff | 10 +-
debian/patches/04_use-mkoctfile.diff | 173 +-
debian/patches/07_octave_prune_examples.diff | 22 +-
debian/patches/16_wxwidget-with-cmake-2.8.diff | 1095 +
debian/patches/series | 4 +-
debian/plplot-doc.postinst | 12 -
debian/plplot-doc.prerm | 22 -
debian/rules | 43 +-
doc/docbook/src/CMakeLists.txt | 1 +
doc/docbook/src/HTML-MANIFEST | 5 +
doc/docbook/src/MAN-MANIFEST | 1 +
doc/docbook/src/advanced.html | 2 +
doc/docbook/src/advanced.xml | 2 +
doc/docbook/src/api-c.html | 2 +-
doc/docbook/src/api-compat.html | 146 +-
doc/docbook/src/api-fortran-77.html | 2 +-
doc/docbook/src/api-internal.html | 2 +-
doc/docbook/src/api-obsolete.html | 2 +-
doc/docbook/src/api.html | 10 +-
doc/docbook/src/api.xml | 224 +-
doc/docbook/src/bibliography.html | 10 +-
doc/docbook/src/contour-plots.html | 10 +-
doc/docbook/src/core-library.html | 170 +
doc/docbook/src/deploying.html | 8 +-
doc/docbook/src/device-driver-libraries.html | 161 +
doc/docbook/src/djgpp-notes.html | 19 +-
doc/docbook/src/drawing.html | 12 +-
doc/docbook/src/enhancement-libraries.html | 248 +
doc/docbook/src/fortran77.html | 2 +-
doc/docbook/src/fortran95.html | 18 +-
doc/docbook/src/freetype-notes.html | 10 +-
doc/docbook/src/gcw-driver.html | 4 +-
doc/docbook/src/gui.html | 16 +-
doc/docbook/src/index.html | 57 +-
doc/docbook/src/intro.html | 2 +-
doc/docbook/src/labelling.html | 2 +-
doc/docbook/src/libraries.html | 302 +
doc/docbook/src/libraries.xml | 266 +
doc/docbook/src/ocaml.html | 12 +-
doc/docbook/src/ocaml.xml | 154 +-
doc/docbook/src/ocaml_bindings.html | 53 +-
doc/docbook/src/ocaml_examples.html | 10 +-
doc/docbook/src/ocaml_howto.html | 22 +-
doc/docbook/src/ocaml_obtaining.html | 44 +-
doc/docbook/src/os-notes.html | 4 +-
doc/docbook/src/part_reference.html | 5 +
doc/docbook/src/pl_setcontlabelformat.3plplot | 2 +-
doc/docbook/src/pl_setcontlabelparam.3plplot | 2 +-
doc/docbook/src/pl_setcontlabelparam.html | 2 +-
doc/docbook/src/pladv.3plplot | 2 +-
doc/docbook/src/pladv.html | 2 +-
doc/docbook/src/plalloc2dgrid.html | 2 +-
doc/docbook/src/plaxes.3plplot | 3 +-
doc/docbook/src/plaxes.html | 12 +-
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 | 3 +-
doc/docbook/src/plbox.html | 12 +-
doc/docbook/src/plbox3.3plplot | 4 +-
doc/docbook/src/plbox3.html | 22 +-
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/plclearopts.html | 2 +-
doc/docbook/src/plcol.html | 2 +-
doc/docbook/src/plcol0.3plplot | 2 +-
doc/docbook/src/plcol0.html | 2 +-
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 | 6 +-
doc/docbook/src/plenv.html | 62 +-
doc/docbook/src/plenv0.3plplot | 6 +-
doc/docbook/src/plenv0.html | 62 +-
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/plfree2dgrid.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 | 2 +-
doc/docbook/src/plgcol0a.3plplot | 2 +-
doc/docbook/src/plgcol0a.html | 2 +-
doc/docbook/src/plgcolbg.3plplot | 2 +-
doc/docbook/src/plgcolbg.html | 2 +-
doc/docbook/src/plgcolbga.3plplot | 2 +-
doc/docbook/src/plgcolbga.html | 2 +-
doc/docbook/src/plgcompression.3plplot | 2 +-
doc/docbook/src/plgcompression.html | 2 +-
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/plgetcursor.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/plgfont.3plplot | 2 +-
doc/docbook/src/plgfont.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 | 2 +-
doc/docbook/src/plgriddata.html | 2 +-
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/plimage.3plplot | 2 +-
doc/docbook/src/plimage.html | 2 +-
doc/docbook/src/plimagefr.3plplot | 2 +-
doc/docbook/src/plimagefr.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 | 2 +-
doc/docbook/src/pllab.html | 2 +-
doc/docbook/src/pllightsource.3plplot | 2 +-
doc/docbook/src/pllightsource.html | 2 +-
doc/docbook/src/plline.3plplot | 2 +-
doc/docbook/src/plline.html | 2 +-
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/plmergeopts.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/plminmax2dgrid.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/ploptusage.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.9.2.dvi | Bin 3650084 -> 0 bytes
doc/docbook/src/plplot-5.9.2.jadetex | 153526 -----------------
doc/docbook/src/plplot-5.9.2.pdf | 88268 ----------
doc/docbook/src/plplot-5.9.2.ps.gz | Bin 759480 -> 0 bytes
doc/docbook/src/plplot-5.9.5.dvi | Bin 0 -> 3719780 bytes
doc/docbook/src/plplot-5.9.5.jadetex | 156155 ++++++++++++++++++
doc/docbook/src/plplot-5.9.5.pdf | 89669 ++++++++++
doc/docbook/src/plplot-5.9.5.ps.gz | Bin 0 -> 768831 bytes
doc/docbook/src/plplot-structs.txt | 6 +
doc/docbook/src/plplot-symbols.txt | 136 +-
doc/docbook/src/plplot.3plplot | 4 +-
doc/docbook/src/plplotdoc.info | 820 +-
doc/docbook/src/plplotdoc.info-1 | 103 +-
doc/docbook/src/plplotdoc.info-2 | 336 +-
doc/docbook/src/plplotdoc.info-3 | 444 +-
doc/docbook/src/plplotdoc.texi | 629 +-
doc/docbook/src/plplotdoc.txml | 616 +-
doc/docbook/src/plplotdoc.xml-info | 22 +-
doc/docbook/src/plplotdoc.xml.in | 18 +-
doc/docbook/src/plpoin.3plplot | 2 +-
doc/docbook/src/plpoin.html | 2 +-
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/plrandd.3plplot | 2 +-
doc/docbook/src/plrandd.html | 2 +-
doc/docbook/src/plreplot.3plplot | 2 +-
doc/docbook/src/plreplot.html | 2 +-
doc/docbook/src/plresetopts.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 | 2 +-
doc/docbook/src/plscmap0.3plplot | 2 +-
doc/docbook/src/plscmap0.html | 2 +-
doc/docbook/src/plscmap0a.3plplot | 4 +-
doc/docbook/src/plscmap0a.html | 4 +-
doc/docbook/src/plscmap0n.3plplot | 2 +-
doc/docbook/src/plscmap0n.html | 2 +-
doc/docbook/src/plscmap1.3plplot | 2 +-
doc/docbook/src/plscmap1.html | 2 +-
doc/docbook/src/plscmap1a.3plplot | 4 +-
doc/docbook/src/plscmap1a.html | 4 +-
doc/docbook/src/plscmap1l.3plplot | 2 +-
doc/docbook/src/plscmap1l.html | 4 +-
doc/docbook/src/plscmap1la.3plplot | 4 +-
doc/docbook/src/plscmap1la.html | 4 +-
doc/docbook/src/plscmap1n.3plplot | 2 +-
doc/docbook/src/plscmap1n.html | 2 +-
doc/docbook/src/plscol0.3plplot | 2 +-
doc/docbook/src/plscol0.html | 2 +-
doc/docbook/src/plscol0a.3plplot | 4 +-
doc/docbook/src/plscol0a.html | 4 +-
doc/docbook/src/plscolbg.3plplot | 2 +-
doc/docbook/src/plscolbg.html | 2 +-
doc/docbook/src/plscolbga.3plplot | 2 +-
doc/docbook/src/plscolbga.html | 2 +-
doc/docbook/src/plscolor.3plplot | 2 +-
doc/docbook/src/plscolor.html | 2 +-
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 | 6 +-
doc/docbook/src/plsdiori.html | 73 +-
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/plseed.3plplot | 2 +-
doc/docbook/src/plseed.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/plsetusage.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/plsfont.3plplot | 2 +-
doc/docbook/src/plsfont.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 | 14 +-
doc/docbook/src/plshades.3plplot | 2 +-
doc/docbook/src/plshades.html | 2 +-
doc/docbook/src/plslabelfunc.3plplot | 39 +
doc/docbook/src/plslabelfunc.html | 329 +
doc/docbook/src/plsmaj.3plplot | 2 +-
doc/docbook/src/plsmaj.html | 14 +-
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 | 6 +-
doc/docbook/src/plsori.html | 35 +-
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 | 2 +-
doc/docbook/src/pltimefmt.3plplot | 2 +-
doc/docbook/src/pltimefmt.html | 2 +-
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 | 2 +-
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 | 2 +-
doc/docbook/src/plvsta.html | 2 +-
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 | 2 +-
doc/docbook/src/plwind.html | 2 +-
doc/docbook/src/plxormod.3plplot | 2 +-
doc/docbook/src/plxormod.html | 2 +-
doc/docbook/src/scales.html | 2 +-
doc/docbook/src/schemas.xml | 1 +
doc/docbook/src/static_built_files | 8 +-
doc/docbook/src/windows-notes.html | 2 +-
drivers/CMakeLists.txt | 226 +-
drivers/aqt.c | 2 +-
drivers/aqt.rc.in | 1 +
drivers/cairo.c | 673 +-
drivers/cairo.rc.in | 7 +
drivers/cgm.c | 9 +-
drivers/cgm.rc.in | 1 +
drivers/dg300.c | 4 +-
drivers/dg300.rc.in | 1 +
drivers/gcw.c | 124 +-
drivers/gcw.rc.in | 1 +
drivers/gd.c | 34 +-
drivers/gd.rc.in | 3 +
drivers/get-drv-info.c | 77 -
drivers/gnome.c | 20 +-
drivers/hpgl.c | 4 +-
drivers/hpgl.rc.in | 3 +
drivers/impress.c | 4 +-
drivers/impress.rc.in | 1 +
drivers/linuxvga.c | 4 +-
drivers/linuxvga.rc.in | 1 +
drivers/ljii.c | 4 +-
drivers/ljii.rc.in | 1 +
drivers/ljiip.c | 4 +-
drivers/ljiip.rc.in | 1 +
drivers/mem.c | 8 +-
drivers/mem.rc.in | 1 +
drivers/ntk.c | 6 +-
drivers/ntk.rc.in | 1 +
drivers/null.c | 4 +-
drivers/null.rc.in | 1 +
drivers/pbm.c | 14 +-
drivers/pbm.rc.in | 1 +
drivers/pdf.c | 24 +-
drivers/pdf.rc.in | 1 +
drivers/plmeta.c | 19 +-
drivers/plmeta.rc.in | 1 +
drivers/ps.c | 31 +-
drivers/ps.rc.in | 2 +
drivers/pstex.c | 2 +-
drivers/pstex.rc.in | 1 +
drivers/psttf.cc | 26 +-
drivers/psttf.rc.in | 2 +
drivers/qt.cpp | 1384 +
drivers/qt.rc.in | 10 +
drivers/svg.c | 143 +-
drivers/svg.rc.in | 1 +
drivers/tek.c | 4 +-
drivers/tek.rc.in | 6 +
drivers/test-drv-info.c | 80 +
drivers/tk.c | 48 +-
drivers/tk.rc.in | 1 +
drivers/tkwin.c | 10 +-
drivers/tkwin.rc.in | 1 +
drivers/wingcc.c | 37 +-
drivers/wingcc.rc.in | 1 +
drivers/wxwidgets.cpp | 123 +-
drivers/wxwidgets.h | 12 +-
drivers/wxwidgets.rc.in | 2 +
drivers/wxwidgets_agg.cpp | 18 +-
drivers/wxwidgets_app.cpp | 7 +-
drivers/wxwidgets_dc.cpp | 11 +-
drivers/wxwidgets_gc.cpp | 108 +-
drivers/xfig.c | 10 +-
drivers/xfig.rc.in | 1 +
drivers/xwin.c | 23 +-
drivers/xwin.rc.in | 1 +
drivers/xwinttf.c | 2 +-
examples/CMakeLists.txt | 799 +-
examples/Makefile.examples.in | 296 +-
examples/ada/CMakeLists.txt | 261 +-
examples/ada/x01a.adb.cmake | 5 +-
examples/ada/x02a.adb.cmake | 5 +-
examples/ada/x03a.adb.cmake | 13 +-
examples/ada/x04a.adb.cmake | 5 +-
examples/ada/x05a.adb.cmake | 5 +-
examples/ada/x06a.adb.cmake | 3 -
examples/ada/x07a.adb.cmake | 3 -
examples/ada/x08a.adb.cmake | 5 +-
examples/ada/x09a.adb.cmake | 5 +-
examples/ada/x10a.adb.cmake | 5 +-
examples/ada/x11a.adb.cmake | 5 +-
examples/ada/x12a.adb.cmake | 5 +-
examples/ada/x13a.adb.cmake | 5 +-
examples/ada/x14a.adb.cmake | 133 +-
examples/ada/x15a.adb.cmake | 5 +-
examples/ada/x16a.adb.cmake | 51 +-
examples/ada/x17a.adb.cmake | 5 +-
examples/ada/x18a.adb.cmake | 5 +-
examples/ada/x19a.adb.cmake | 5 +-
examples/ada/x20a.adb.cmake | 5 +-
examples/ada/x21a.adb.cmake | 5 +-
examples/ada/x22a.adb.cmake | 5 +-
examples/ada/x23a.adb.cmake | 5 +-
examples/ada/x24a.adb.cmake | 5 +-
examples/ada/x25a.adb.cmake | 5 +-
examples/ada/x26a.adb.cmake | 5 +-
examples/ada/x27a.adb.cmake | 5 +-
examples/ada/x28a.adb.cmake | 5 +-
examples/ada/x29a.adb.cmake | 5 +-
examples/ada/x30a.adb.cmake | 5 +-
examples/ada/x31a.adb.cmake | 116 +-
examples/ada/xthick01a.adb.cmake | 5 +-
examples/ada/xthick02a.adb.cmake | 5 +-
examples/ada/xthick03a.adb.cmake | 17 +-
examples/ada/xthick04a.adb.cmake | 5 +-
examples/ada/xthick05a.adb.cmake | 5 +-
examples/ada/xthick06a.adb.cmake | 3 -
examples/ada/xthick07a.adb.cmake | 3 -
examples/ada/xthick08a.adb.cmake | 5 +-
examples/ada/xthick09a.adb.cmake | 5 +-
examples/ada/xthick10a.adb.cmake | 5 +-
examples/ada/xthick11a.adb.cmake | 5 +-
examples/ada/xthick12a.adb.cmake | 5 +-
examples/ada/xthick13a.adb.cmake | 5 +-
examples/ada/xthick14a.adb.cmake | 25 +-
examples/ada/xthick15a.adb.cmake | 5 +-
examples/ada/xthick16a.adb.cmake | 49 +-
examples/ada/xthick17a.adb.cmake | 5 +-
examples/ada/xthick18a.adb.cmake | 5 +-
examples/ada/xthick19a.adb.cmake | 5 +-
examples/ada/xthick20a.adb.cmake | 5 +-
examples/ada/xthick21a.adb.cmake | 5 +-
examples/ada/xthick22a.adb.cmake | 5 +-
examples/ada/xthick23a.adb.cmake | 5 +-
examples/ada/xthick24a.adb.cmake | 5 +-
examples/ada/xthick25a.adb.cmake | 5 +-
examples/ada/xthick26a.adb.cmake | 5 +-
examples/ada/xthick27a.adb.cmake | 5 +-
examples/ada/xthick28a.adb.cmake | 5 +-
examples/ada/xthick29a.adb.cmake | 5 +-
examples/ada/xthick30a.adb.cmake | 5 +-
examples/ada/xthick31a.adb.cmake | 116 +-
examples/c++/CMakeLists.txt | 236 +-
examples/c++/Makefile.examples.in | 15 +-
examples/c++/README.qt_example | 14 +
examples/c++/plc++demos.h | 20 +-
examples/c++/qt_PlotWindow.cpp | 219 +
examples/c++/qt_PlotWindow.h | 77 +
examples/c++/qt_example.cpp | 66 +
examples/c++/wxPLplotDemo.cpp | 69 +-
examples/c++/x01.cc | 6 +-
examples/c++/x01cc.cc | 4 +-
examples/c++/x02.cc | 4 +-
examples/c++/x03.cc | 16 +-
examples/c++/x04.cc | 4 +-
examples/c++/x05.cc | 4 +-
examples/c++/x06.cc | 4 +-
examples/c++/x07.cc | 4 +-
examples/c++/x08.cc | 4 +-
examples/c++/x09.cc | 11 +-
examples/c++/x10.cc | 4 +-
examples/c++/x11.cc | 4 +-
examples/c++/x12.cc | 4 +-
examples/c++/x13.cc | 4 +-
examples/c++/x14.cc | 25 +-
examples/c++/x15.cc | 4 +-
examples/c++/x16.cc | 37 +-
examples/c++/x17.cc | 10 +-
examples/c++/x18.cc | 4 +-
examples/c++/x19.cc | 74 +-
examples/c++/x20.cc | 12 +-
examples/c++/x21.cc | 15 +-
examples/c++/x22.cc | 4 +-
examples/c++/x23.cc | 4 +-
examples/c++/x24.cc | 5 +-
examples/c++/x26.cc | 4 +-
examples/c++/x27.cc | 4 +-
examples/c++/x28.cc | 4 +-
examples/c++/x29.cc | 172 +-
examples/c++/x30.cc | 4 +-
examples/c++/x31.cc | 78 +-
examples/c/CMakeLists.txt | 197 +-
examples/c/Makefile.examples.in | 19 +-
examples/c/README.cairo | 24 +
examples/c/cairo/README.cairo | 24 -
examples/c/cairo/ext-cairo-test.c | 26 -
examples/c/cairo/extXdrawable_demo.c | 188 -
examples/c/ext-cairo-test.c | 27 +
examples/c/extXdrawable_demo.c | 200 +
examples/c/plcdemos.h | 19 +-
examples/c/test_plend.c | 31 +
examples/c/x01c.c | 4 +-
examples/c/x02c.c | 8 +-
examples/c/x03c.c | 14 +-
examples/c/x12c.c | 2 +-
examples/c/x13c.c | 4 +-
examples/c/x14c.c | 23 +-
examples/c/x16c.c | 38 +-
examples/c/x17c.c | 8 +-
examples/c/x19c.c | 69 +-
examples/c/x20c.c | 31 +-
examples/c/x21c.c | 11 +-
examples/c/x24c.c | 6 +-
examples/c/x29c.c | 189 +-
examples/c/x31c.c | 71 +-
examples/c/x32c.c | 185 +
examples/d/CMakeLists.txt | 155 +-
examples/d/Makefile.examples.in | 65 +
examples/d/x01d.d | 292 +
examples/d/x02d.d | 136 +
examples/d/x03d.d | 91 +-
examples/d/x04d.d | 11 +-
examples/d/x05d.d | 82 +-
examples/d/x06d.d | 48 +-
examples/d/x07d.d | 135 +-
examples/d/x08d.d | 440 +-
examples/d/x09d.d | 368 +
examples/d/x10d.d | 71 +-
examples/d/x11d.d | 166 +
examples/d/x12d.d | 130 +-
examples/d/x13d.d | 170 +-
examples/d/x14d.d | 358 +
examples/d/x15d.d | 238 +
examples/d/x16d.d | 371 +
examples/d/x17d.d | 127 +
examples/d/x18d.d | 130 +
examples/d/x19d.d | 135 +
examples/d/x20d.d | 285 +
examples/d/x21d.d | 245 +
examples/d/x22d.d | 312 +
examples/d/x23d.d | 349 +
examples/d/x24d.d | 154 +
examples/d/x25d.d | 93 +
examples/d/x26d.d | 182 +
examples/d/x27d.d | 141 +
examples/d/x28d.d | 364 +
examples/d/x29d.d | 353 +
examples/d/x30d.d | 158 +
examples/d/x31d.d | 251 +
examples/f77/CMakeLists.txt | 215 +-
examples/f77/x01f.fm4 | 114 +-
examples/f77/x02f.fm4 | 98 +-
examples/f77/x03f.fm4 | 77 +-
examples/f77/x04f.fm4 | 54 +-
examples/f77/x05f.fm4 | 46 +-
examples/f77/x06f.fm4 | 54 +-
examples/f77/x07f.fm4 | 54 +-
examples/f77/x08f.fm4 | 112 +-
examples/f77/x09f.fm4 | 127 +-
examples/f77/x10f.fm4 | 44 +-
examples/f77/x11f.fm4 | 108 +-
examples/f77/x12f.fm4 | 48 +-
examples/f77/x13f.fm4 | 58 +-
examples/f77/x14f.fm4 | 214 +-
examples/f77/x15f.fm4 | 148 +-
examples/f77/x16af.fm4 | 102 +-
examples/f77/x16f.fm4 | 108 +-
examples/f77/x17f.fm4 | 138 +-
examples/f77/x18f.fm4 | 70 +-
examples/f77/x19f.fm4 | 162 +-
examples/f77/x20f.fm4 | 443 +-
examples/f77/x21f.fm4 | 50 +-
examples/f77/x22f.fm4 | 68 +-
examples/f77/x23f.fm4 | 221 +-
examples/f77/x24f.fm4 | 110 +-
examples/f77/x25f.fm4 | 34 +-
examples/f77/x26f.fm4 | 166 +-
examples/f77/x27f.fm4 | 88 +-
examples/f77/x28f.fm4 | 108 +-
examples/f77/x29f.fm4 | 197 +-
examples/f77/x30f.fm4 | 46 +-
examples/f77/x31f.fm4 | 168 +-
examples/f95/CMakeLists.txt | 201 +-
examples/f95/x03f.f90 | 12 +-
examples/f95/x14f.f90 | 33 +-
examples/f95/x16f.f90 | 28 +-
examples/f95/x19f.f90 | 80 +-
examples/f95/x20f.f90 | 119 +-
examples/f95/x23f.f90 | 69 +-
examples/f95/x24f.f90 | 8 +-
examples/f95/x25f.f90 | 2 +-
examples/f95/x26f.f90 | 2 +-
examples/f95/x27f.f90 | 2 +-
examples/f95/x29f.f90 | 144 +-
examples/f95/x31f.f90 | 79 +-
examples/java/CMakeLists.txt | 159 +-
examples/java/x03.java | 11 +-
examples/java/x14.java | 22 +-
examples/java/x15.java | 3 +-
examples/java/x16.java | 33 +-
examples/java/x19.java | 81 +-
examples/java/x24.java | 7 +-
examples/java/x27.java | 2 +-
examples/java/x29.java | 143 +-
examples/java/x31.java | 96 +-
examples/lua/CMakeLists.txt | 118 +
examples/lua/plplot_examples.lua.in | 12 +
examples/lua/x01.lua | 210 +
examples/lua/x02.lua | 152 +
examples/lua/x03.lua | 105 +
examples/lua/x04.lua | 106 +
examples/lua/x05.lua | 54 +
examples/lua/x06.lua | 74 +
examples/lua/x07.lua | 82 +
examples/lua/x08.lua | 189 +
examples/lua/x09.lua | 350 +
examples/lua/x10.lua | 49 +
examples/lua/x11.lua | 160 +
examples/lua/x12.lua | 78 +
examples/lua/x13.lua | 96 +
examples/lua/x14.lua | 362 +
examples/lua/x15.lua | 234 +
examples/lua/x16.lua | 324 +
examples/lua/x17.lua | 118 +
examples/lua/x18.lua | 145 +
examples/lua/x19.lua | 153 +
examples/lua/x20.lua | 294 +
examples/lua/x21.lua | 256 +
examples/lua/x22.lua | 273 +
examples/lua/x23.lua | 331 +
examples/lua/x24.lua | 142 +
examples/lua/x25.lua | 90 +
examples/lua/x26.lua | 151 +
examples/lua/x27.lua | 129 +
examples/lua/x28.lua | 360 +
examples/lua/x29.lua | 327 +
examples/lua/x30.lua | 142 +
examples/lua/x31.lua | 225 +
examples/ocaml/CMakeLists.txt | 90 +-
examples/ocaml/Makefile.examples.in | 4 +-
examples/ocaml/x03.ml | 9 +-
examples/ocaml/x14.ml | 17 +-
examples/ocaml/x16.ml | 26 +-
examples/ocaml/x19.ml | 53 +-
examples/ocaml/x24.ml | 7 +-
examples/ocaml/x29.ml | 147 +-
examples/ocaml/x31.ml | 63 +-
examples/octave/CMakeLists.txt | 90 +
.../octave/demos => examples/octave}/lena.img | Bin
examples/octave/p1.m | 46 +
examples/octave/p10.m | 31 +
examples/octave/p11.m | 54 +
examples/octave/p12.m | 36 +
examples/octave/p13.m | 40 +
examples/octave/p14.m | 70 +
examples/octave/p15.m | 40 +
examples/octave/p16.m | 35 +
examples/octave/p17.m | 36 +
examples/octave/p18.m | 37 +
examples/octave/p19.m | 104 +
examples/octave/p2.m | 35 +
{bindings/octave/demos => examples/octave}/p20.m | 0
examples/octave/p21.m | 65 +
examples/octave/p3.m | 43 +
examples/octave/p4.m | 31 +
examples/octave/p5.m | 31 +
examples/octave/p6.m | 32 +
examples/octave/p7.m | 39 +
examples/octave/p8.m | 32 +
examples/octave/p9.m | 44 +
.../demos => examples/octave}/plplot_octave_demo.m | 0
{bindings/octave/demos => examples/octave}/x01c.m | 0
{bindings/octave/demos => examples/octave}/x02c.m | 0
examples/octave/x03c.m | 98 +
{bindings/octave/demos => examples/octave}/x04c.m | 0
{bindings/octave/demos => examples/octave}/x05c.m | 0
{bindings/octave/demos => examples/octave}/x06c.m | 0
{bindings/octave/demos => examples/octave}/x07c.m | 0
{bindings/octave/demos => examples/octave}/x08c.m | 0
{bindings/octave/demos => examples/octave}/x09c.m | 0
{bindings/octave/demos => examples/octave}/x10c.m | 0
{bindings/octave/demos => examples/octave}/x11c.m | 0
{bindings/octave/demos => examples/octave}/x12c.m | 0
{bindings/octave/demos => examples/octave}/x13c.m | 0
{bindings/octave/demos => examples/octave}/x14c.m | 0
{bindings/octave/demos => examples/octave}/x15c.m | 0
examples/octave/x16c.m | 291 +
{bindings/octave/demos => examples/octave}/x17c.m | 0
{bindings/octave/demos => examples/octave}/x18c.m | 0
{bindings/octave/demos => examples/octave}/x19c.m | 0
{bindings/octave/demos => examples/octave}/x20c.m | 0
{bindings/octave/demos => examples/octave}/x21c.m | 0
{bindings/octave/demos => examples/octave}/x22c.m | 0
{bindings/octave/demos => examples/octave}/x23c.m | 0
examples/octave/x24c.m | 153 +
{bindings/octave/demos => examples/octave}/x25c.m | 0
{bindings/octave/demos => examples/octave}/x26c.m | 0
examples/octave/x27c.m | 141 +
examples/octave/x28c.m | 363 +
examples/octave/x29c.m | 318 +
examples/octave/x30c.m | 153 +
examples/octave/x31c.m | 270 +
examples/perl/x14.pl | 24 +-
examples/perl/x24.pl | 7 +-
examples/perl/x31.pl | 67 +-
.../plplot_configure.cmake_installed_examples.in | 397 +
examples/python/CMakeLists.txt | 248 +-
examples/python/README.pythondemos | 48 +-
examples/python/README.rendering_tests | 68 +
examples/python/plplot_python_start.py.cmake | 1 +
examples/python/prova.py | 104 -
examples/python/pyqt4_example.py | 179 +
examples/python/pytkdemo | 8 +-
examples/python/qplplot.py | 166 -
examples/python/test_circle.py | 48 +
examples/python/test_superscript_subscript.py | 30 +
examples/python/testh.py | 32 +
examples/python/x01.py | 6 +-
examples/python/x02.py | 1 +
examples/python/x03.py | 2 +-
examples/python/x04.py | 2 +-
examples/python/x05.py | 2 +-
examples/python/x07.py | 2 +-
examples/python/x08.py | 3 +-
examples/python/x09.py | 2 +-
examples/python/x10.py | 1 -
examples/python/x11.py | 2 +-
examples/python/x12.py | 1 -
examples/python/x13.py | 1 -
examples/python/x16 | 5 +
examples/python/x16.py | 2 +-
examples/python/xw03.py | 11 +-
examples/python/xw08.py | 1 +
examples/python/xw16.py | 19 +-
examples/python/xw17.py | 1 +
examples/python/xw19.py | 60 +-
examples/python/xw24.py | 7 +-
examples/python/xw26.py | 1 +
examples/python/xw29.py | 113 +-
examples/python/xw31.py | 52 +-
examples/tcl/CMakeLists.txt | 8 +-
examples/tcl/x02.tcl | 8 +-
examples/tcl/x03.tcl | 10 +-
examples/tcl/x16 | 8 +-
examples/tcl/x16.tcl | 17 +-
examples/tcl/x17.tcl | 4 +-
examples/tcl/x20.tcl | 10 +-
examples/tcl/x21.tcl | 22 +-
examples/tcl/x23 | 2 +-
examples/tcl/x24 | 2 +-
examples/tcl/x24.tcl | 12 +-
examples/tcl/x28 | 2 +-
examples/tcl/x29 | 2 +-
examples/tcl/x29.tcl | 129 +-
examples/tcl/x31.tcl | 55 +-
examples/tk/CMakeLists.txt | 159 +-
examples/tk/CMakeLists.txt_installed_examples_tk | 141 +
examples/tk/Makefile.examples.in | 11 +-
examples/tk/README.tkdemos | 2 +-
examples/tk/tkdemos.tcl | 8 +-
fonts/CMakeLists.txt | 86 +-
fonts/README | 24 +-
fonts/stndfont.c | 4 +-
fonts/xtndfont.c | 4 +-
git/README | 9 +
git/case-1/README | 136 +
git/case-1/pl-make-svn-gateway | 5 +
git/case-1/svn-authors | 22 +
include/CMakeLists.txt | 146 +-
include/drivers.h | 12 +-
include/pdf.h | 16 +-
include/plConfig.h.cmake | 40 +-
include/plDevs.h.cmake | 13 +-
include/plcore.h | 33 +-
include/pldll.h | 142 -
include/pldll.h.in | 158 +
include/plplot.h | 100 +-
include/plplotP.h | 103 +-
include/plstrm.h | 23 +-
include/qt.h | 404 +
lib/CMakeLists.txt | 2 +
lib/csa/CMakeLists.txt | 63 +-
lib/csa/csa.c | 28 +-
lib/csa/csa.h | 4 +
lib/nistcd/CMakeLists.txt | 155 +
lib/nistcd/README_plplot_nistcd | 10 +
lib/nistcd/cd.announce | 56 +
lib/nistcd/cd.c | 2911 +
lib/nistcd/cd.h | 249 +
lib/nistcd/cd.html | 1555 +
lib/nistcd/cd1.3.lsm | 13 +
lib/nistcd/cddll.h | 44 +
lib/nistcd/cdexp1.cgm | Bin 0 -> 462 bytes
lib/nistcd/cdexpert.c | 143 +
lib/nistcd/cdmulti.c | 97 +
lib/nistcd/cdmulti.cgm | Bin 0 -> 514 bytes
lib/nistcd/cdout.cgm | Bin 0 -> 998 bytes
lib/nistcd/cdsimple.c | 111 +
lib/nistcd/cdsimple.cgm | Bin 0 -> 442 bytes
lib/nistcd/cdtest.c | 490 +
lib/nistcd/cdtext.c | 142 +
lib/nistcd/cdtext.cgm | Bin 0 -> 812 bytes
lib/nistcd/color16.c | 188 +
lib/nistcd/color16.cgm | Bin 0 -> 1164 bytes
lib/nistcd/defines.h | 61 +
lib/nistcd/readme | 56 +
lib/nn/CMakeLists.txt | 69 +-
lib/nn/lpi.c | 0
lib/qsastime/CMakeLists.txt | 183 +
lib/qsastime/README.deltaT.dat | 15 +
lib/qsastime/README.qsastime_API | 161 +
lib/qsastime/README.qsastime_tests | 165 +
lib/qsastime/README.tai-utc | 71 +
lib/qsastime/README.ttbipm.dat | 17 +
lib/qsastime/bhunt_search_test.c | 101 +
lib/qsastime/deltaT-gen.c | 166 +
lib/qsastime/deltaT.dat | 58 +
lib/qsastime/deltaT.out_standard | 3001 +
lib/qsastime/deltaT_test.c | 18 +
lib/qsastime/dspline.c | 141 +
lib/qsastime/dsplint.c | 109 +
lib/qsastime/qsastime.c | 1221 +
lib/qsastime/qsastime.h | 63 +
lib/qsastime/qsastime.html | 1560 +
lib/qsastime/qsastime.txt | 313 +
lib/qsastime/qsastime.xml | 318 +
lib/qsastime/qsastimeP.h.in | 87 +
lib/qsastime/qsastime_extra.c | 279 +
lib/qsastime/qsastime_extra.h | 63 +
lib/qsastime/qsastime_test.c | 145 +
lib/qsastime/qsastime_test.out_standard | 49 +
lib/qsastime/qsastime_testlib.c | 550 +
lib/qsastime/qsastime_testlib.out_standard | 2347 +
lib/qsastime/qsastimedll.h | 44 +
lib/qsastime/tai-utc-gen.c | 181 +
lib/qsastime/tai-utc.dat | 38 +
lib/qsastime/ttbipm.dat | 1255 +
plplot-c-style.el | 110 +
plplot_test/CMakeLists.txt | 185 +-
plplot_test/plplot-test-interactive.sh.in | 216 +-
plplot_test/plplot-test.sh.cmake | 44 +-
plplot_test/test_ada.sh.in | 6 +-
plplot_test/test_c.sh.in | 9 +-
plplot_test/test_cxx.sh.in | 13 +-
plplot_test/test_d.sh.in | 60 +
plplot_test/test_diff.sh.in | 43 +-
plplot_test/test_f77.sh.in | 6 +-
plplot_test/test_f95.sh.in | 6 +-
plplot_test/test_java.sh.in | 6 +-
plplot_test/test_lua.sh.in | 59 +
plplot_test/test_ocaml.sh.in | 9 +-
plplot_test/test_octave.sh.in | 10 +-
plplot_test/test_pdl.sh.in | 70 +
plplot_test/test_perl.sh.in | 70 -
plplot_test/test_python.sh.in | 6 +-
plplot_test/test_tcl.sh.in | 6 +-
scripts/htdocs-gen_plot-examples.sh | 37 +-
src/CMakeLists.txt | 318 +-
src/ltdl_win32.c | 19 +-
src/pdfutils.c | 22 +-
src/plarc.c | 137 +
src/plargs.c | 91 +-
src/plbox.c | 269 +-
src/plbuf.c | 136 +-
src/plcont.c | 54 +-
src/plcore.c | 357 +-
src/plctrl.c | 645 +-
src/plcvt.c | 4 +-
src/pldeprecated.c | 10 +-
src/pldtik.c | 74 +-
src/plfill.c | 18 +-
src/plfreetype.c | 35 +-
src/plgridd.c | 10 +-
src/plhist.c | 6 +-
src/plimage.c | 14 +-
src/plline.c | 17 +-
src/plmap.c | 7 +-
src/plstdio.c | 3 +-
src/plstripc.c | 6 +-
src/plsym.c | 47 +-
src/pltick.c | 6 +-
src/pltime.c | 70 +
src/plvect.c | 6 +-
src/plvpor.c | 18 +-
uncrustify.cfg | 72 +
utils/CMakeLists.txt | 1 +
utils/pltek.c | 17 +-
www/corefunctions.php | 1 -
www/examples.php | 127 +-
www/index.php | 11 +-
1219 files changed, 313974 insertions(+), 259022 deletions(-)
diff --cc debian/changelog
index 0a7c24e,f724e21..224f961
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,10 +1,72 @@@
-plplot (5.9.2-4) unstable; urgency=low
++plplot (5.9.5-2) unstable; urgency=low
++
++ * debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be
++ dropped.
++ * debian/rules: explicitly enable jpeg, png and gif drivers as they are
++ now disabled by default. Eventually these will be replaced by cairo
++ and qt drivers, but keep them in for now until these packages have
++ settled down.
++
++ -- Andrew Ross <andrewross at users.sourceforge.net> Mon, 22 Feb 2010 12:50:40 +0000
++
++plplot (5.9.5-1) UNRELEASED; urgency=low
++
++ * New upstream release.
++ * debian/patches/series: Remove the following patches which are no longer
++ required as they are now included upstream
++ 13_fix-kfreeBSD-build.diff
++ 14_octave-3.0-fixes.diff
++ 15_octave-toggle-plplot-use.diff
++ and clean up directory by deleting unused patches.
++ * debian/patches/02_unset-python-path.diff,
++ debian/patches/04_use-mkoctfile.diff,
++ debian/patches/07_octave_prune_examples.diff,
++ debian/patches/16_wxwidget-with-cmake-2.8.diff:
++ + Update patches to work with plplot 5.9.5
++ * debian/control.in, debian/rules:
++ + Properly enable support for ada on all architectures (except armel)
++ - build dependencies were not updated.
++ + Add sh4 to the list of architectures where gnat is not available and
++ so ada support is disabled. (closes: #562238)
++ + Drop the plplot9-driver-gnome2 package which is unmaintained
++ upstream and depends on libgnomeprintui-2.2 which is to be dropped
++ from Debian. (closes: #542577)
++ + Ensure ghostscript is installed in Build-Depends-Indep: since this
++ is needed to generate fonts for pdfjadetex, but is not automatically
++ pulled in.
++ * debian/rules: Remove setting of ITCL_LIBRARY which is not required
++ with latest version of itcl.
++ * debian/libplplot9.files: Ensures .pal palette files are correctly installed
++ * Rebuild package to use latest versions of gfortran (closes: #564065)
++ and python (closes: #562411)
++
++ -- Andrew Ross <andrewross at users.sourceforge.net> Mon, 25 Jan 2010 21:19:07 +0000
++
++plplot (5.9.2-4) UNRELEASED; urgency=low
+
+ * debian/patches/02_unset-python-path.diff: Fix offset in patch
+ to remove quilt warning. (closes: #538533)
++ * debian/control.in:
++ + Remove arm build dependency on g++-4.1. (closes: #533806)
++ + Update build dependency on tcl / tk to 8.5 (compatible with
++ latest itcl). (closes: #545302)
++ + Add dpkg (>=1.15.4) | install-info dependency for plplot-doc to correctly
++ handle info install triggers. Fixes lintian warning.
++ + Bump debian standards version to 3.8.3.
++ + Fix typo in java bindings package description. (closes: #557677)
++ + Add ${misc:Depends} to all binary package dependencies. Fixes lintian
++ warning.
++ * debian/control.in, debian/rules:
++ + Update java to build-dep on default-jdk and runtime depend on default-jre
++ which should work for all architectures.
++ + Update ada packages so built on all architectures except armel where gnat
++ seems to be unavailable. (closes: #544187)
++ * debian/patches/16_wxwidget-with-cmake-2.8.diff: New patch ported from
++ upstream to fix wxwidget build with cmake 2.8.0.
++ * debian/control.in: Bump wxgtk version to 2.8. Require cmake 2.8.0 to build.
+
- -- Andrew Ross <andrewross at users.sourceforge.net> Thu, 20 Aug 2009 13:40:07 +0100
++ -- Andrew Ross <andrewross at users.sourceforge.net> Wed, 23 Aug 2009 12:05:07 +0100
+
plplot (5.9.2-3) unstable; urgency=low
* debian/control.in: Ensure libplplot-dev only depends on
diff --cc debian/control
index 694a9b0,3cd15c1..8067778
--- a/debian/control
+++ b/debian/control
@@@ -3,21 -3,21 +3,19 @@@ Section: mat
Priority: optional
Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
Uploaders: Rafael Laboissiere <rafael at debian.org>
--Standards-Version: 3.8.1
--Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm],
-- tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev,
-- 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, quilt, slice,
-- python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
++Standards-Version: 3.8.3
++Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
++ tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
++ libxi-dev, gfortran, itk3-dev, octave3.2-headers,
++ libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8),
++ libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config,
++ quilt, slice, python-gtk2-dev, libwxgtk2.8-dev,
python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
-- python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
-- fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64]
++ python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
++ fastjar, swig, gnat [!armel !sh4]
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
-- docbook2x, opensp, jadetex
--Build-Conflicts: libplplot5, octave2.1-headers, tcl8.5, tcl8.5-dev
++ docbook2x, opensp, jadetex, ghostscript
++Build-Conflicts: libplplot5, octave3.0-headers
XS-Python-Version: all
Homepage: http://www.plplot.org
Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian
@@@ -27,8 -27,8 +25,8 @@@ Package: libplplot
Architecture: any
Section: libs
Conflicts: libplplot5, plplot (<< 5)
--Depends: ${shlibs:Depends}
--Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd,
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Suggests: plplot9-driver-xwin, plplot9-driver-gd,
plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl
Description: Scientific plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -47,8 -47,8 +45,9 @@@ Architecture: an
Section: libdevel
Recommends: pkg-config
Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
-- libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2,
- libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version})
- libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):]
++ libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}),
++ libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version}),
++ ${misc:Depends}
Description: Scientific plotting library (development files)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -68,7 -68,7 +67,7 @@@ Architecture: an
Section: libs
Conflicts: libplplot5, libplplot-c++9
Replaces: libplplot-c++9
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (C++ binding)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -83,7 -83,7 +82,7 @@@
Package: libplplot-fortran9
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends} , ${misc:Depends}
Description: Scientific plotting library (fortran bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -96,10 -96,10 +95,10 @@@
This package contains the Fortran 77 and Fortran 95 bindings for
PLplot.
-[JAVA:Package: libplplot9-java
+Package: libplplot9-java
Architecture: any
Section: java
--Depends: java-gcj-compat, ${shlibs:Depends}
++Depends: default-jre, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (Java bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -109,13 -109,13 +108,13 @@@
handful of function calls is typically required. For more advanced use,
virtually all aspects of plotting are configurable.
.
-- This packages contains the Java bindings for PLplot.
-:]
++ This package contains the Java bindings for PLplot.
+
Package: libcsiro0
Architecture: any
Section: libs
Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303)
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (CSIRO libraries)
This package contains two libraries developed by Pavel Sakov, from the
CSIRO Marine Research, used in geometry applications:
@@@ -129,7 -129,7 +128,7 @@@
Package: plplot-bin
Architecture: any
Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5)
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (utilities)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -148,7 -148,7 +147,7 @@@
Package: plplot9-driver-xwin
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot-lib, plplot (<< 5)
Description: Scientific plotting library (X11 driver)
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -161,28 -161,28 +160,10 @@@
.
This package provides the X11 driver module for PLplot.
--Package: plplot9-driver-gnome2
--Architecture: any
--Section: libs
--Depends: libplplot9, ${shlibs:Depends}
--Conflicts: plplot9-driver-gnome
--Replaces: plplot9-driver-gnome
--Description: Scientific plotting library (GNOME Canvas Widget driver)
-- PLplot is relatively small, portable, freely distributable, and is rich
-- enough to satisfy most users. It has a wide range of plot types including
-- line (linear, log), contour, 3D, fill, and almost 1000 characters
-- (including Greek and mathematical) in its extended font set. The package
-- is designed to make it easy to quickly get graphical output; only a
-- handful of function calls is typically required. For more advanced use,
-- virtually all aspects of plotting are configurable.
-- .
-- This package provides the GNOME Canvas Widget driver module for PLplot.
-- This package replaces the (now deprecated) plplot9-driver-gnome package.
--
Package: plplot9-driver-wxwidgets
Architecture: any
Section: libs
--Depends: libplplot9, ${shlibs:Depends}
++Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (wxWidgets driver)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -197,7 -197,7 +178,7 @@@
Package: plplot-tcl
Architecture: any
Priority: extra
--Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}
++Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
Description: Tcl/Tk support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -215,7 -215,7 +196,7 @@@
Package: plplot-tcl-dev
Architecture: any
Priority: extra
--Depends: libplplot9 (= ${binary:Version}), plplot-tcl
++Depends: libplplot9 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1)
Description: Tcl/Tk development support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -232,7 -232,7 +213,7 @@@
Package: plplot9-driver-gd
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ttf-freefont
Description: Scientific plotting library (GD driver)
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -249,7 -249,7 +230,7 @@@
Package: plplot9-driver-cairo
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot9-driver-psttf
Replaces: plplot9-driver-psttf
Description: Scientific plotting library (Cairo driver)
@@@ -269,7 -269,7 +250,7 @@@ Package: python-plplo
Architecture: any
Section: python
Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends},
-- ${python:Depends}, python-numpy
++ ${python:Depends}, python-numpy, ${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python support for PLplot, a plotting library
@@@ -288,7 -288,7 +269,8 @@@
Package: octave-plplot
Architecture: any
Priority: extra
--Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}
++Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends},
++ ${misc:Depends}
Description: Octave support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -302,10 -302,10 +284,10 @@@
almost drop-in replacement for the traditional Gnuplot graphical
interface in Octave. Examples are also provided.
-[ADA:Package: libplplot-ada
+Package: libplplot-ada
Architecture: any
Priority: extra
--Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}
++Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Ada support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -322,6 -322,6 +304,7 @@@ Package: plplot-do
Architecture: all
Section: doc
Suggests: libplplot-dev
++Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Description: Documentation for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
diff --cc debian/control.in
index 3cd15c1,3cd15c1..1fa2ccd
--- a/debian/control.in
+++ b/debian/control.in
@@@ -3,21 -3,21 +3,19 @@@ Section: mat
Priority: optional
Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
Uploaders: Rafael Laboissiere <rafael at debian.org>
--Standards-Version: 3.8.1
--Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm],
-- tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev,
-- 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, quilt, slice,
-- python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
++Standards-Version: 3.8.3
++Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
++ tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
++ libxi-dev, gfortran, itk3-dev, octave3.2-headers,
++ libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8),
++ libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config,
++ quilt, slice, python-gtk2-dev, libwxgtk2.8-dev,
python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
-- python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
-- fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64]
++ python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
++ fastjar, swig, gnat [!armel !sh4]
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
-- docbook2x, opensp, jadetex
--Build-Conflicts: libplplot5, octave2.1-headers, tcl8.5, tcl8.5-dev
++ docbook2x, opensp, jadetex, ghostscript
++Build-Conflicts: libplplot5, octave3.0-headers
XS-Python-Version: all
Homepage: http://www.plplot.org
Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian
@@@ -27,8 -27,8 +25,8 @@@ Package: libplplot
Architecture: any
Section: libs
Conflicts: libplplot5, plplot (<< 5)
--Depends: ${shlibs:Depends}
--Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd,
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Suggests: plplot9-driver-xwin, plplot9-driver-gd,
plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl
Description: Scientific plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -47,8 -47,8 +45,9 @@@ Architecture: an
Section: libdevel
Recommends: pkg-config
Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
-- libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2,
-- libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):]
++ libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}),
++ libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):],
++ ${misc:Depends}
Description: Scientific plotting library (development files)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -68,7 -68,7 +67,7 @@@ Architecture: an
Section: libs
Conflicts: libplplot5, libplplot-c++9
Replaces: libplplot-c++9
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (C++ binding)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -83,7 -83,7 +82,7 @@@
Package: libplplot-fortran9
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends} , ${misc:Depends}
Description: Scientific plotting library (fortran bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -96,10 -96,10 +95,10 @@@
This package contains the Fortran 77 and Fortran 95 bindings for
PLplot.
--[JAVA:Package: libplplot9-java
++Package: libplplot9-java
Architecture: any
Section: java
--Depends: java-gcj-compat, ${shlibs:Depends}
++Depends: default-jre, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (Java bindings)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -109,13 -109,13 +108,13 @@@
handful of function calls is typically required. For more advanced use,
virtually all aspects of plotting are configurable.
.
-- This packages contains the Java bindings for PLplot.
--:]
++ This package contains the Java bindings for PLplot.
++
Package: libcsiro0
Architecture: any
Section: libs
Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303)
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (CSIRO libraries)
This package contains two libraries developed by Pavel Sakov, from the
CSIRO Marine Research, used in geometry applications:
@@@ -129,7 -129,7 +128,7 @@@
Package: plplot-bin
Architecture: any
Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5)
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (utilities)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -148,7 -148,7 +147,7 @@@
Package: plplot9-driver-xwin
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot-lib, plplot (<< 5)
Description: Scientific plotting library (X11 driver)
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -161,28 -161,28 +160,10 @@@
.
This package provides the X11 driver module for PLplot.
--Package: plplot9-driver-gnome2
--Architecture: any
--Section: libs
--Depends: libplplot9, ${shlibs:Depends}
--Conflicts: plplot9-driver-gnome
--Replaces: plplot9-driver-gnome
--Description: Scientific plotting library (GNOME Canvas Widget driver)
-- PLplot is relatively small, portable, freely distributable, and is rich
-- enough to satisfy most users. It has a wide range of plot types including
-- line (linear, log), contour, 3D, fill, and almost 1000 characters
-- (including Greek and mathematical) in its extended font set. The package
-- is designed to make it easy to quickly get graphical output; only a
-- handful of function calls is typically required. For more advanced use,
-- virtually all aspects of plotting are configurable.
-- .
-- This package provides the GNOME Canvas Widget driver module for PLplot.
-- This package replaces the (now deprecated) plplot9-driver-gnome package.
--
Package: plplot9-driver-wxwidgets
Architecture: any
Section: libs
--Depends: libplplot9, ${shlibs:Depends}
++Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends}
Description: Scientific plotting library (wxWidgets driver)
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -197,7 -197,7 +178,7 @@@
Package: plplot-tcl
Architecture: any
Priority: extra
--Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}
++Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
Description: Tcl/Tk support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -215,7 -215,7 +196,7 @@@
Package: plplot-tcl-dev
Architecture: any
Priority: extra
--Depends: libplplot9 (= ${binary:Version}), plplot-tcl
++Depends: libplplot9 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1)
Description: Tcl/Tk development support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -232,7 -232,7 +213,7 @@@
Package: plplot9-driver-gd
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ttf-freefont
Description: Scientific plotting library (GD driver)
PLplot is relatively small, portable, freely distributable, and is rich
@@@ -249,7 -249,7 +230,7 @@@
Package: plplot9-driver-cairo
Architecture: any
Section: libs
--Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: plplot9-driver-psttf
Replaces: plplot9-driver-psttf
Description: Scientific plotting library (Cairo driver)
@@@ -269,7 -269,7 +250,7 @@@ Package: python-plplo
Architecture: any
Section: python
Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends},
-- ${python:Depends}, python-numpy
++ ${python:Depends}, python-numpy, ${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python support for PLplot, a plotting library
@@@ -288,7 -288,7 +269,8 @@@
Package: octave-plplot
Architecture: any
Priority: extra
--Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}
++Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends},
++ ${misc:Depends}
Description: Octave support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -305,7 -305,7 +287,7 @@@
[ADA:Package: libplplot-ada
Architecture: any
Priority: extra
--Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}
++Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Ada support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
@@@ -322,6 -322,6 +304,7 @@@ Package: plplot-do
Architecture: all
Section: doc
Suggests: libplplot-dev
++Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Description: Documentation for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
enough to satisfy most users. It has a wide range of plot types including
diff --cc debian/libplplot9.README.Debian
index d29d91a,d29d91a..0dd0017
--- a/debian/libplplot9.README.Debian
+++ b/debian/libplplot9.README.Debian
@@@ -30,8 -30,8 +30,6 @@@ plplot for Debia
* plplot9-driver-gd: Provides the GD driver module, which allows
direct generation of PNG and JPEG files.
-- * plplot9-driver-gnome2: Provides the Gnome canvas driver module.
--
* plplot9-driver-cairo: Provides the cairo driver module. This uses
the cairo library to produce higher quality text using truetype
fonts. It produces postscript, pdf, svg, png, mem and X output.
diff --cc debian/libplplot9.files
index 656fc2d,656fc2d..7703766
--- a/debian/libplplot9.files
+++ b/debian/libplplot9.files
@@@ -1,6 -1,6 +1,7 @@@
usr/lib
usr/share/plplot*/*.map
usr/share/plplot*/*.fnt
++usr/share/plplot*/*.pal
usr/share/doc/libplplot9
diff --cc debian/patches/02_unset-python-path.diff
index cc7ce73,0ab3ca2..53232f7
--- a/debian/patches/02_unset-python-path.diff
+++ b/debian/patches/02_unset-python-path.diff
@@@ -9,12 -9,12 +9,12 @@@
--- plplot/examples/python/CMakeLists.txt.old
+++ plplot/examples/python/CMakeLists.txt
- @@ -147,7 +147,7 @@
-@@ -161,7 +161,7 @@
-- @ONLY
-- )
--
++@@ -195,7 +195,7 @@
++ @ONLY
++ )
++
-set(python_location1 ${PYTHON_INSTDIR})
+set(python_location1)
set(python_location2)
++ set(python_location3)
configure_file(
-- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake
diff --cc debian/patches/04_use-mkoctfile.diff
index 04ff31c,04ff31c..8fc6dbe
--- a/debian/patches/04_use-mkoctfile.diff
+++ b/debian/patches/04_use-mkoctfile.diff
@@@ -5,110 -5,110 +5,81 @@@
@DPATCH@
----- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt
--+++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt
--@@ -133,64 +133,34 @@
-- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
-- )
++--- plplot-5.9.5.orig/bindings/octave/CMakeLists.txt
+++++ plplot-5.9.5/bindings/octave/CMakeLists.txt
++@@ -134,49 +134,6 @@
++ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
++ )
---# Build octave interface.
---set(octave_interface_INCLUDE_PATHS
---${CMAKE_SOURCE_DIR}/include
---${CMAKE_BINARY_DIR}
---${CMAKE_BINARY_DIR}/include
---${CMAKE_CURRENT_SOURCE_DIR}
---${CMAKE_CURRENT_BINARY_DIR}
---${OCTAVE_INCLUDE_PATH}
---)
---include_directories(${octave_interface_INCLUDE_PATHS})
++- # Build octave interface.
++- set(octave_interface_INCLUDE_PATHS
++- ${CMAKE_SOURCE_DIR}/include
++- ${CMAKE_BINARY_DIR}
++- ${CMAKE_BINARY_DIR}/include
++- ${CMAKE_CURRENT_SOURCE_DIR}
++- ${CMAKE_CURRENT_BINARY_DIR}
++- ${OCTAVE_INCLUDE_PATH}
++- )
++- include_directories(${octave_interface_INCLUDE_PATHS})
-
---add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc)
---target_link_libraries(
---plplot_octave
---plplot${LIB_TAG}
---"${OCTAVE_LIBRARIES}"
---"${OCTINTERP_LIBRARIES}"
---)
++- add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc)
++- target_link_libraries(
++- plplot_octave
++- plplot${LIB_TAG}
++- "${OCTAVE_LIBRARIES}"
++- "${OCTINTERP_LIBRARIES}"
++- )
-
---if(USE_RPATH)
--- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
--- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and
--- # OCTINTERP_LIBRARIES have the same path.
--- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH)
--- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH})
--- set_target_properties(
--- plplot_octave
--- PROPERTIES
--- PREFIX ""
--- SUFFIX ".oct"
--- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
--- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
--- )
---else(USE_RPATH)
--- set_target_properties(
--- plplot_octave
--- PROPERTIES
--- PREFIX ""
--- SUFFIX ".oct"
--- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
--- )
---endif(USE_RPATH)
++- if(USE_RPATH)
++- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
++- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and
++- # OCTINTERP_LIBRARIES have the same path.
++- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH)
++- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH})
++- set_target_properties(
++- plplot_octave
++- PROPERTIES
++- PREFIX ""
++- SUFFIX ".oct"
++- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
++- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
++- )
++- else(USE_RPATH)
++- set_target_properties(
++- plplot_octave
++- PROPERTIES
++- PREFIX ""
++- SUFFIX ".oct"
++- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
++- )
++- 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
++@@ -188,9 +145,22 @@
++ WORLD_EXECUTE
++ )
--+add_custom_command(
--+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
--+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
--+COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
--+-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave
--+-I${CMAKE_SOURCE_DIR}/include --strip
--+-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG}
--+)
+++ add_custom_command(
+++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
+++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+++ COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+++ -I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave
+++ -I${CMAKE_SOURCE_DIR}/include --strip
+++ -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG}
+++ )
+
--+add_custom_target(
--+plplot_octave_oct_file ALL
--+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
--+)
--+
-- install(
---TARGETS
---plplot_octave
---LIBRARY
--+FILES
--+${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
-- DESTINATION ${OCTAVE_OCT_DIR}
-- PERMISSIONS ${PERM_MODULES}
-- )
--@@ -238,23 +208,4 @@
-- DESTINATION ${PLPLOT_OCTAVE_DIR}
-- )
--
---if(never)
---add_custom_command(
---OUTPUT
---${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
---${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
---COMMAND
---touch
---${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
---${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
---DEPENDS
---${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
---)
---
---# Link octave interface.
---add_custom_target(
---plplot_octave-libdir.oct ALL
---DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
---)
---endif(never)
-- endif(ENABLE_octave)
+++ add_custom_target(
+++ plplot_octave_oct_file ALL
+++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
+++ )
+++
+++ install(
+++ FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
++- install(TARGETS plplot_octave
++- EXPORT export_plplot
++- LIBRARY
++ DESTINATION ${OCTAVE_OCT_DIR}
++ PERMISSIONS ${PERM_MODULES}
++ )
diff --cc debian/patches/07_octave_prune_examples.diff
index 96fe6eb,96fe6eb..2dcc1b2
--- a/debian/patches/07_octave_prune_examples.diff
+++ b/debian/patches/07_octave_prune_examples.diff
@@@ -6,14 -6,14 +6,14 @@@
@DPATCH@
----- plplot-5.8.0.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100
--+++ plplot-5.8.0/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000
--@@ -62,7 +62,7 @@
-- # These require octave-2.1.50 so comment out since not everybody has
-- # this.
--
--- for i=[1:7 8 9 13 15 16] ;
--+ for i=[1:6 8 9 13 15 16] ;
-- if (verbose_test)
-- printf("p%d\n",i);
-- endif
++--- plplot-5.9.5.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100
+++++ plplot-5.9.5/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000
++@@ -54,7 +54,7 @@
++
++ # p7 works OK with plmeta, e.g., but not ps or psc. pleop/plbop issue?
++
++- for i=[1:7 8 9 13 15 16 21] ;
+++ for i=[1:6 8 9 13 15 16 21] ;
++ if (verbose_test)
++ printf("p%d\n",i);
++ endif
diff --cc debian/patches/16_wxwidget-with-cmake-2.8.diff
index 0000000,0000000..5d36fdf
new file mode 100644
--- /dev/null
+++ b/debian/patches/16_wxwidget-with-cmake-2.8.diff
@@@ -1,0 -1,0 +1,1095 @@@
++# Patch from upstream to ensure wxwidgets support works with cmake 2.8.0
++
++diff -ur plplot-5.9.2-orig/cmake/modules/wxwidgets.cmake plplot-5.9.2/cmake/modules/wxwidgets.cmake
++--- plplot-5.9.2.orig/cmake/modules/wxwidgets.cmake 2009-01-18 20:24:12.000000000 +0000
+++++ plplot-5.9.2/cmake/modules/wxwidgets.cmake 2010-01-18 23:52:40.000000000 +0000
++@@ -60,12 +60,21 @@
++ wxwidgets_COMPILE_FLAGS
++ "-I${wxWidgets_INCLUDE_DIRS}"
++ )
++- # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8)
++- # when wxWidgets_DEFINITIONS is a list.
+++ string(REGEX REPLACE ";" " -D"
+++ wxWidgets_DEFINITIONS_wD
+++ "-D${wxWidgets_DEFINITIONS}"
+++ )
+++ set(wxWidgets_DEFINITIONS_DEBUG_wD "")
+++ if(wxWidgets_DEFINITIONS_DEBUG)
+++ string(REGEX REPLACE ";" " -D"
+++ wxWidgets_DEFINITIONS_DEBUG_wD
+++ "-D${wxWidgets_DEFINITIONS_DEBUG}"
+++ )
+++ endif(wxWidgets_DEFINITIONS_DEBUG)
++ string(REGEX REPLACE ";" " "
++ wxwidgets_COMPILE_FLAGS
++ ${wxwidgets_COMPILE_FLAGS}
++- " ${wxWidgets_DEFINITIONS}"
+++ " ${wxWidgets_DEFINITIONS_wD} ${wxWidgets_DEFINITIONS_DEBUG_wD}"
++ )
++ # Convert wxWidgets_LIBRARIES to full pathname form.
++ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}")
++diff -ur plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt
++--- plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt 2009-01-18 20:24:12.000000000 +0000
+++++ plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt 2010-01-18 23:55:55.000000000 +0000
++@@ -55,9 +55,18 @@
++ endif(BUILD_SHARED_LIBS)
++
++ INCLUDE_DIRECTORIES( ${wxWidgets_INCLUDE_DIRS} )
++- ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} )
++
++- target_link_libraries(
+++ IF(wxWidgets_DEFINITIONS)
+++ SET_PROPERTY(DIRECTORY APPEND
+++ PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS})
+++ ENDIF(wxWidgets_DEFINITIONS)
+++
+++ IF(wxWidgets_DEFINITIONS_DEBUG)
+++ SET_PROPERTY(DIRECTORY APPEND
+++ PROPERTY COMPILE_DEFINITIONS_DEBUG ${wxWidgets_DEFINITIONS_DEBUG})
+++ ENDIF(wxWidgets_DEFINITIONS_DEBUG)
+++
+++target_link_libraries(
++ plplotwxwidgets${LIB_TAG}
++ plplotcxx${LIB_TAG}
++ ${wxwidgets_LINK_FLAGS}
++@@ -103,9 +112,14 @@
++ endif(LIB_TAG)
++
++ # Determine libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS
++- STRING(REGEX REPLACE ";" " "
+++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS}")
+++ if(wxWidgets_DEFINITIONS_DEBUG)
+++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS};${wxWidgets_DEFINITIONS_DEBUG}")
+++ endif(wxWidgets_DEFINITIONS_DEBUG)
+++
+++ STRING(REGEX REPLACE ";" " -D"
++ libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS
++- "${wxWidgets_DEFINITIONS}"
+++ "-D${wxWidgets_DEFINITIONS_all}"
++ )
++ STRING(REGEX REPLACE ";" " -I"
++ wxWidgets_IFLAGS
++diff -urN plplot-5.9.2.orig/cmake/modules/FindwxWidgets.cmake plplot-5.9.2/cmake/modules/FindwxWidgets.cmake
++--- plplot-5.9.2.orig/cmake/modules/FindwxWidgets.cmake 1970-01-01 01:00:00.000000000 +0100
+++++ plplot-5.9.2/cmake/modules/FindwxWidgets.cmake 2009-11-11 12:29:53.000000000 +0000
++@@ -0,0 +1,1020 @@
+++# - Find a wxWidgets (a.k.a., wxWindows) installation.
+++# This module finds if wxWidgets is installed and selects a default
+++# configuration to use. wxWidgets is a modular library. To specify the
+++# modules that you will use, you need to name them as components to
+++# the package:
+++#
+++# FIND_PACKAGE(wxWidgets COMPONENTS base core ...)
+++#
+++# There are two search branches: a windows style and a unix style. For
+++# windows, the following variables are searched for and set to
+++# defaults in case of multiple choices. Change them if the defaults
+++# are not desired (i.e., these are the only variables you should
+++# change to select a configuration):
+++#
+++# wxWidgets_ROOT_DIR - Base wxWidgets directory
+++# (e.g., C:/wxWidgets-2.6.3).
+++# wxWidgets_LIB_DIR - Path to wxWidgets libraries
+++# (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
+++# wxWidgets_CONFIGURATION - Configuration to use
+++# (e.g., msw, mswd, mswu, mswunivud, etc.)
+++#
+++# For unix style it uses the wx-config utility. You can select between
+++# debug/release, unicode/ansi, universal/non-universal, and
+++# static/shared in the QtDialog or ccmake interfaces by turning ON/OFF
+++# the following variables:
+++#
+++# wxWidgets_USE_DEBUG
+++# wxWidgets_USE_UNICODE
+++# wxWidgets_USE_UNIVERSAL
+++# wxWidgets_USE_STATIC
+++#
+++# The following are set after the configuration is done for both
+++# windows and unix style:
+++#
+++# wxWidgets_FOUND - Set to TRUE if wxWidgets was found.
+++# wxWidgets_INCLUDE_DIRS - Include directories for WIN32
+++# i.e., where to find "wx/wx.h" and
+++# "wx/setup.h"; possibly empty for unices.
+++# wxWidgets_LIBRARIES - Path to the wxWidgets libraries.
+++# wxWidgets_LIBRARY_DIRS - compile time link dirs, useful for
+++# rpath on UNIX. Typically an empty string
+++# in WIN32 environment.
+++# wxWidgets_DEFINITIONS - Contains defines required to compile/link
+++# against WX, e.g. WXUSINGDLL
+++# wxWidgets_DEFINITIONS_DEBUG- Contains defines required to compile/link
+++# against WX debug builds, e.g. __WXDEBUG__
+++# wxWidgets_CXX_FLAGS - Include dirs and compiler flags for
+++# unices, empty on WIN32. Essentially
+++# "`wx-config --cxxflags`".
+++# wxWidgets_USE_FILE - Convenience include file.
+++#
+++# Sample usage:
+++# FIND_PACKAGE(wxWidgets COMPONENTS base core gl net)
+++# IF(wxWidgets_FOUND)
+++# INCLUDE(${wxWidgets_USE_FILE})
+++# # and for each of your dependant executable/library targets:
+++# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
+++# ENDIF(wxWidgets_FOUND)
+++#
+++# If wxWidgets is required (i.e., not an optional part):
+++# FIND_PACKAGE(wxWidgets REQUIRED base core gl net)
+++# INCLUDE(${wxWidgets_USE_FILE})
+++# # and for each of your dependant executable/library targets:
+++# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
+++
+++#=============================================================================
+++# Copyright 2004-2009 Kitware, Inc.
+++# Copyright 2007-2009 Miguel A. Figueroa-Villanueva <miguelf at ieee dot org>
+++#
+++# Distributed under the OSI-approved BSD License (the "License");
+++# see accompanying file Copyright.txt for details.
+++#
+++# This software is distributed WITHOUT ANY WARRANTY; without even the
+++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+++# See the License for more information.
+++#=============================================================================
+++# (To distributed this file outside of CMake, substitute the full
+++# License text for the above reference.)
+++
+++#
+++# FIXME: check this and provide a correct sample usage...
+++# Remember to connect back to the upper text.
+++# Sample usage with monolithic wx build:
+++#
+++# FIND_PACKAGE(wxWidgets COMPONENTS mono)
+++# ...
+++
+++# NOTES
+++#
+++# This module has been tested on the WIN32 platform with wxWidgets
+++# 2.6.2, 2.6.3, and 2.5.3. However, it has been designed to
+++# easily extend support to all possible builds, e.g., static/shared,
+++# debug/release, unicode, universal, multilib/monolithic, etc..
+++#
+++# If you want to use the module and your build type is not supported
+++# out-of-the-box, please contact me to exchange information on how
+++# your system is setup and I'll try to add support for it.
+++#
+++# AUTHOR
+++#
+++# Miguel A. Figueroa-Villanueva (miguelf at ieee dot org).
+++# Jan Woetzel (jw at mip.informatik.uni-kiel.de).
+++#
+++# Based on previous works of:
+++# Jan Woetzel (FindwxWindows.cmake),
+++# Jorgen Bodde and Jerry Fath (FindwxWin.cmake).
+++
+++# TODO/ideas
+++#
+++# (1) Option/Setting to use all available wx libs
+++# In contrast to expert developer who lists the
+++# minimal set of required libs in wxWidgets_USE_LIBS
+++# there is the newbie user:
+++# - who just wants to link against WX with more 'magic'
+++# - doesn't know the internal structure of WX or how it was built,
+++# in particular if it is monolithic or not
+++# - want to link against all available WX libs
+++# Basically, the intent here is to mimic what wx-config would do by
+++# default (i.e., `wx-config --libs`).
+++#
+++# Possible solution:
+++# Add a reserved keyword "std" that initializes to what wx-config
+++# would default to. If the user has not set the wxWidgets_USE_LIBS,
+++# default to "std" instead of "base core" as it is now. To implement
+++# "std" will basically boil down to a FOR_EACH lib-FOUND, but maybe
+++# checking whether a minimal set was found.
+++
+++
+++# FIXME: This and all the DBG_MSG calls should be removed after the
+++# module stabilizes.
+++#
+++# Helper macro to control the debugging output globally. There are
+++# two versions for controlling how verbose your output should be.
+++MACRO(DBG_MSG _MSG)
+++# MESSAGE(STATUS
+++# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+++ENDMACRO(DBG_MSG)
+++MACRO(DBG_MSG_V _MSG)
+++# MESSAGE(STATUS
+++# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+++ENDMACRO(DBG_MSG_V)
+++
+++# Clear return values in case the module is loaded more than once.
+++SET(wxWidgets_FOUND FALSE)
+++SET(wxWidgets_INCLUDE_DIRS "")
+++SET(wxWidgets_LIBRARIES "")
+++SET(wxWidgets_LIBRARY_DIRS "")
+++SET(wxWidgets_CXX_FLAGS "")
+++
+++# Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on
+++# the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM
+++# to prevent UsewxWidgets.cmake from using SYSTEM.
+++#
+++# See cmake mailing list discussions for more info:
+++# http://www.cmake.org/pipermail/cmake/2008-April/021115.html
+++# http://www.cmake.org/pipermail/cmake/2008-April/021146.html
+++#
+++IF(APPLE)
+++ SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
+++ENDIF(APPLE)
+++
+++# DEPRECATED: This is a patch to support the DEPRECATED use of
+++# wxWidgets_USE_LIBS.
+++#
+++# If wxWidgets_USE_LIBS is set:
+++# - if using <components>, then override wxWidgets_USE_LIBS
+++# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS
+++IF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+++ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
+++ENDIF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+++DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
+++
+++# Add the convenience use file if available.
+++#
+++# Get dir of this file which may reside in:
+++# - CMAKE_MAKE_ROOT/Modules on CMake installation
+++# - CMAKE_MODULE_PATH if user prefers his own specialized version
+++SET(wxWidgets_USE_FILE "")
+++GET_FILENAME_COMPONENT(
+++ wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+++# Prefer an existing customized version, but the user might override
+++# the FindwxWidgets module and not the UsewxWidgets one.
+++IF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+++ SET(wxWidgets_USE_FILE
+++ "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+++ELSE(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+++ SET(wxWidgets_USE_FILE UsewxWidgets.cmake)
+++ENDIF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+++
+++#=====================================================================
+++#=====================================================================
+++IF(WIN32 AND NOT CYGWIN AND NOT MSYS)
+++ SET(wxWidgets_FIND_STYLE "win32")
+++ELSE(WIN32 AND NOT CYGWIN AND NOT MSYS)
+++ IF(UNIX OR MSYS)
+++ SET(wxWidgets_FIND_STYLE "unix")
+++ ENDIF(UNIX OR MSYS)
+++ENDIF(WIN32 AND NOT CYGWIN AND NOT MSYS)
+++
+++#=====================================================================
+++# WIN32_FIND_STYLE
+++#=====================================================================
+++IF(wxWidgets_FIND_STYLE STREQUAL "win32")
+++ # Useful common wx libs needed by almost all components.
+++ SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
+++
+++ # DEPRECATED: Use FIND_PACKAGE(wxWidgets COMPONENTS mono) instead.
+++ IF(NOT wxWidgets_FIND_COMPONENTS)
+++ IF(wxWidgets_USE_MONOLITHIC)
+++ SET(wxWidgets_FIND_COMPONENTS mono)
+++ ELSE(wxWidgets_USE_MONOLITHIC)
+++ SET(wxWidgets_FIND_COMPONENTS base core) # this is default
+++ ENDIF(wxWidgets_USE_MONOLITHIC)
+++ ENDIF(NOT wxWidgets_FIND_COMPONENTS)
+++
+++ # Always add the common required libs.
+++ LIST(APPEND wxWidgets_FIND_COMPONENTS ${wxWidgets_COMMON_LIBRARIES})
+++
+++ #-------------------------------------------------------------------
+++ # WIN32: Helper MACROS
+++ #-------------------------------------------------------------------
+++ #
+++ # Get filename components for a configuration. For example,
+++ # if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
+++ # if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG=""
+++ #
+++ MACRO(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
+++ STRING(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
+++ STRING(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
+++ IF(${_UCD} STREQUAL ${_CONFIGURATION})
+++ SET(${_UCD} "")
+++ ENDIF(${_UCD} STREQUAL ${_CONFIGURATION})
+++ STRING(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
+++ ENDMACRO(WX_GET_NAME_COMPONENTS)
+++
+++ #
+++ # Find libraries associated to a configuration.
+++ #
+++ MACRO(WX_FIND_LIBS _UNV _UCD _DBG)
+++ DBG_MSG_V("m_unv = ${_UNV}")
+++ DBG_MSG_V("m_ucd = ${_UCD}")
+++ DBG_MSG_V("m_dbg = ${_DBG}")
+++
+++ # FIXME: What if both regex libs are available. regex should be
+++ # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
+++ # Find wxWidgets common libraries.
+++ FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
+++ FIND_LIBRARY(WX_${LIB}${_DBG}
+++ NAMES
+++ wx${LIB}${_UCD}${_DBG} # for regex
+++ wx${LIB}${_DBG}
+++ PATHS ${WX_LIB_DIR}
+++ NO_DEFAULT_PATH
+++ )
+++ MARK_AS_ADVANCED(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++
+++ # Find wxWidgets multilib base libraries.
+++ FIND_LIBRARY(WX_base${_DBG}
+++ NAMES
+++ wxbase29${_UCD}${_DBG}
+++ wxbase28${_UCD}${_DBG}
+++ wxbase27${_UCD}${_DBG}
+++ wxbase26${_UCD}${_DBG}
+++ wxbase25${_UCD}${_DBG}
+++ PATHS ${WX_LIB_DIR}
+++ NO_DEFAULT_PATH
+++ )
+++ MARK_AS_ADVANCED(WX_base${_DBG})
+++ FOREACH(LIB net odbc xml)
+++ FIND_LIBRARY(WX_${LIB}${_DBG}
+++ NAMES
+++ wxbase29${_UCD}${_DBG}_${LIB}
+++ wxbase28${_UCD}${_DBG}_${LIB}
+++ wxbase27${_UCD}${_DBG}_${LIB}
+++ wxbase26${_UCD}${_DBG}_${LIB}
+++ wxbase25${_UCD}${_DBG}_${LIB}
+++ PATHS ${WX_LIB_DIR}
+++ NO_DEFAULT_PATH
+++ )
+++ MARK_AS_ADVANCED(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++
+++ # Find wxWidgets monolithic library.
+++ FIND_LIBRARY(WX_mono${_DBG}
+++ NAMES
+++ wxmsw${_UNV}29${_UCD}${_DBG}
+++ wxmsw${_UNV}28${_UCD}${_DBG}
+++ wxmsw${_UNV}27${_UCD}${_DBG}
+++ wxmsw${_UNV}26${_UCD}${_DBG}
+++ wxmsw${_UNV}25${_UCD}${_DBG}
+++ PATHS ${WX_LIB_DIR}
+++ NO_DEFAULT_PATH
+++ )
+++ MARK_AS_ADVANCED(WX_mono${_DBG})
+++
+++ # Find wxWidgets multilib libraries.
+++ FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
+++ FIND_LIBRARY(WX_${LIB}${_DBG}
+++ NAMES
+++ wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
+++ wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
+++ wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
+++ wxmsw${_UNV}26${_UCD}${_DBG}_${LIB}
+++ wxmsw${_UNV}25${_UCD}${_DBG}_${LIB}
+++ PATHS ${WX_LIB_DIR}
+++ NO_DEFAULT_PATH
+++ )
+++ MARK_AS_ADVANCED(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++ ENDMACRO(WX_FIND_LIBS)
+++
+++ #
+++ # Clear all library paths, so that FIND_LIBRARY refinds them.
+++ #
+++ # Clear a lib, reset its found flag, and mark as advanced.
+++ MACRO(WX_CLEAR_LIB _LIB)
+++ SET(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
+++ SET(${_LIB}_FOUND FALSE)
+++ MARK_AS_ADVANCED(${_LIB})
+++ ENDMACRO(WX_CLEAR_LIB)
+++ # Clear all debug or release library paths (arguments are "d" or "").
+++ MACRO(WX_CLEAR_ALL_LIBS _DBG)
+++ # Clear wxWidgets common libraries.
+++ FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
+++ WX_CLEAR_LIB(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++
+++ # Clear wxWidgets multilib base libraries.
+++ WX_CLEAR_LIB(WX_base${_DBG})
+++ FOREACH(LIB net odbc xml)
+++ WX_CLEAR_LIB(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++
+++ # Clear wxWidgets monolithic library.
+++ WX_CLEAR_LIB(WX_mono${_DBG})
+++
+++ # Clear wxWidgets multilib libraries.
+++ FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
+++ WX_CLEAR_LIB(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++ ENDMACRO(WX_CLEAR_ALL_LIBS)
+++ # Clear all wxWidgets debug libraries.
+++ MACRO(WX_CLEAR_ALL_DBG_LIBS)
+++ WX_CLEAR_ALL_LIBS("d")
+++ ENDMACRO(WX_CLEAR_ALL_DBG_LIBS)
+++ # Clear all wxWidgets release libraries.
+++ MACRO(WX_CLEAR_ALL_REL_LIBS)
+++ WX_CLEAR_ALL_LIBS("")
+++ ENDMACRO(WX_CLEAR_ALL_REL_LIBS)
+++
+++ #
+++ # Set the wxWidgets_LIBRARIES variable.
+++ # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails.
+++ #
+++ MACRO(WX_SET_LIBRARIES _LIBS _DBG)
+++ DBG_MSG_V("Looking for ${${_LIBS}}")
+++ IF(WX_USE_REL_AND_DBG)
+++ FOREACH(LIB ${${_LIBS}})
+++ DBG_MSG_V("Searching for ${LIB} and ${LIB}d")
+++ DBG_MSG_V("WX_${LIB} : ${WX_${LIB}}")
+++ DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}")
+++ IF(WX_${LIB} AND WX_${LIB}d)
+++ DBG_MSG_V("Found ${LIB} and ${LIB}d")
+++ LIST(APPEND wxWidgets_LIBRARIES
+++ debug ${WX_${LIB}d} optimized ${WX_${LIB}}
+++ )
+++ ELSE(WX_${LIB} AND WX_${LIB}d)
+++ DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}")
+++ SET(wxWidgets_FOUND FALSE)
+++ ENDIF(WX_${LIB} AND WX_${LIB}d)
+++ ENDFOREACH(LIB)
+++ ELSE(WX_USE_REL_AND_DBG)
+++ FOREACH(LIB ${${_LIBS}})
+++ DBG_MSG_V("Searching for ${LIB}${_DBG}")
+++ DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}")
+++ IF(WX_${LIB}${_DBG})
+++ DBG_MSG_V("Found ${LIB}${_DBG}")
+++ LIST(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
+++ ELSE(WX_${LIB}${_DBG})
+++ DBG_MSG_V(
+++ "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}")
+++ SET(wxWidgets_FOUND FALSE)
+++ ENDIF(WX_${LIB}${_DBG})
+++ ENDFOREACH(LIB)
+++ ENDIF(WX_USE_REL_AND_DBG)
+++
+++ DBG_MSG_V("OpenGL")
+++ LIST(FIND ${_LIBS} gl WX_USE_GL)
+++ IF(NOT WX_USE_GL EQUAL -1)
+++ DBG_MSG_V("- is required.")
+++ LIST(APPEND wxWidgets_LIBRARIES opengl32 glu32)
+++ ENDIF(NOT WX_USE_GL EQUAL -1)
+++
+++ LIST(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
+++ ENDMACRO(WX_SET_LIBRARIES)
+++
+++ #-------------------------------------------------------------------
+++ # WIN32: Start actual work.
+++ #-------------------------------------------------------------------
+++
+++ # Look for an installation tree.
+++ FIND_PATH(wxWidgets_ROOT_DIR
+++ NAMES include/wx/wx.h
+++ PATHS
+++ $ENV{wxWidgets_ROOT_DIR}
+++ $ENV{WXWIN}
+++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x
+++ C:/
+++ D:/
+++ $ENV{ProgramFiles}
+++ PATH_SUFFIXES
+++ wxWidgets-2.9.4
+++ wxWidgets-2.9.3
+++ wxWidgets-2.9.2
+++ wxWidgets-2.9.1
+++ wxWidgets-2.9.0
+++ wxWidgets-2.8.9
+++ wxWidgets-2.8.8
+++ wxWidgets-2.8.7
+++ wxWidgets-2.8.6
+++ wxWidgets-2.8.5
+++ wxWidgets-2.8.4
+++ wxWidgets-2.8.3
+++ wxWidgets-2.8.2
+++ wxWidgets-2.8.1
+++ wxWidgets-2.8.0
+++ wxWidgets-2.7.4
+++ wxWidgets-2.7.3
+++ wxWidgets-2.7.2
+++ wxWidgets-2.7.1
+++ wxWidgets-2.7.0
+++ wxWidgets-2.7.0-1
+++ wxWidgets-2.6.4
+++ wxWidgets-2.6.3
+++ wxWidgets-2.6.2
+++ wxWidgets-2.6.1
+++ wxWidgets-2.5.4
+++ wxWidgets-2.5.3
+++ wxWidgets-2.5.2
+++ wxWidgets-2.5.1
+++ wxWidgets
+++ DOC "wxWidgets base/installation directory?"
+++ )
+++
+++ # If wxWidgets_ROOT_DIR changed, clear lib dir.
+++ IF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+++ SET(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
+++ CACHE INTERNAL "wxWidgets_ROOT_DIR")
+++ SET(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
+++ CACHE PATH "Cleared." FORCE)
+++ ENDIF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+++
+++ IF(WX_ROOT_DIR)
+++ # Select one default tree inside the already determined wx tree.
+++ # Prefer static/shared order usually consistent with build
+++ # settings.
+++ IF(MINGW)
+++ SET(WX_LIB_DIR_PREFIX gcc)
+++ ELSE(MINGW)
+++ SET(WX_LIB_DIR_PREFIX vc)
+++ ENDIF(MINGW)
+++ IF(BUILD_SHARED_LIBS)
+++ FIND_PATH(wxWidgets_LIB_DIR
+++ NAMES
+++ msw/wx/setup.h
+++ mswd/wx/setup.h
+++ mswu/wx/setup.h
+++ mswud/wx/setup.h
+++ mswuniv/wx/setup.h
+++ mswunivd/wx/setup.h
+++ mswunivu/wx/setup.h
+++ mswunivud/wx/setup.h
+++ PATHS
+++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
+++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
+++ DOC "Path to wxWidgets libraries?"
+++ NO_DEFAULT_PATH
+++ )
+++ ELSE(BUILD_SHARED_LIBS)
+++ FIND_PATH(wxWidgets_LIB_DIR
+++ NAMES
+++ msw/wx/setup.h
+++ mswd/wx/setup.h
+++ mswu/wx/setup.h
+++ mswud/wx/setup.h
+++ mswuniv/wx/setup.h
+++ mswunivd/wx/setup.h
+++ mswunivu/wx/setup.h
+++ mswunivud/wx/setup.h
+++ PATHS
+++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
+++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll
+++ DOC "Path to wxWidgets libraries?"
+++ NO_DEFAULT_PATH
+++ )
+++ ENDIF(BUILD_SHARED_LIBS)
+++
+++ # If wxWidgets_LIB_DIR changed, clear all libraries.
+++ IF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+++ SET(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
+++ WX_CLEAR_ALL_DBG_LIBS()
+++ WX_CLEAR_ALL_REL_LIBS()
+++ ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+++
+++ IF(WX_LIB_DIR)
+++ # If building shared libs, define WXUSINGDLL to use dllimport.
+++ IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+++ SET(wxWidgets_DEFINITIONS WXUSINGDLL)
+++ DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
+++ ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+++
+++ # Search for available configuration types.
+++ FOREACH(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
+++ SET(WX_${CFG}_FOUND FALSE)
+++ IF(EXISTS ${WX_LIB_DIR}/${CFG})
+++ LIST(APPEND WX_CONFIGURATION_LIST ${CFG})
+++ SET(WX_${CFG}_FOUND TRUE)
+++ SET(WX_CONFIGURATION ${CFG})
+++ ENDIF(EXISTS ${WX_LIB_DIR}/${CFG})
+++ ENDFOREACH(CFG)
+++ DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
+++
+++ IF(WX_CONFIGURATION)
+++ SET(wxWidgets_FOUND TRUE)
+++
+++ # If the selected configuration wasn't found force the default
+++ # one. Otherwise, use it but still force a refresh for
+++ # updating the doc string with the current list of available
+++ # configurations.
+++ IF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+++ SET(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
+++ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
+++ ELSE(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+++ SET(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
+++ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
+++ ENDIF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+++
+++ # If release config selected, and both release/debug exist.
+++ IF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+++ OPTION(wxWidgets_USE_REL_AND_DBG
+++ "Use release and debug configurations?" TRUE)
+++ SET(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
+++ ELSE(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+++ # If the option exists (already in cache), force it false.
+++ IF(wxWidgets_USE_REL_AND_DBG)
+++ SET(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
+++ "No ${wxWidgets_CONFIGURATION}d found." FORCE)
+++ ENDIF(wxWidgets_USE_REL_AND_DBG)
+++ SET(WX_USE_REL_AND_DBG FALSE)
+++ ENDIF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+++
+++ # Get configuration parameters from the name.
+++ WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
+++
+++ # Set wxWidgets main include directory.
+++ IF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+++ SET(wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
+++ ELSE(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+++ DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h")
+++ SET(wxWidgets_FOUND FALSE)
+++ ENDIF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+++
+++ # Set wxWidgets lib setup include directory.
+++ IF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+++ LIST(APPEND wxWidgets_INCLUDE_DIRS
+++ ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
+++ ELSE(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+++ DBG_MSG("WXWIDGET_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
+++ SET(wxWidgets_FOUND FALSE)
+++ ENDIF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+++
+++ # Find wxWidgets libraries.
+++ WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
+++ IF(WX_USE_REL_AND_DBG)
+++ WX_FIND_LIBS("${UNV}" "${UCD}" "d")
+++ ENDIF(WX_USE_REL_AND_DBG)
+++
+++ # Settings for requested libs (i.e., include dir, libraries, etc.).
+++ WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
+++
+++ # Add necessary definitions for unicode builds
+++ IF("${UCD}" STREQUAL "u")
+++ LIST(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
+++ ENDIF("${UCD}" STREQUAL "u")
+++
+++ # Add necessary definitions for debug builds
+++ SET(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
+++
+++ ENDIF(WX_CONFIGURATION)
+++ ENDIF(WX_LIB_DIR)
+++ ENDIF(WX_ROOT_DIR)
+++
+++#=====================================================================
+++# UNIX_FIND_STYLE
+++#=====================================================================
+++ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
+++ IF(wxWidgets_FIND_STYLE STREQUAL "unix")
+++ #-----------------------------------------------------------------
+++ # UNIX: Helper MACROS
+++ #-----------------------------------------------------------------
+++ #
+++ # Set the default values based on "wx-config --selected-config".
+++ #
+++ MACRO(WX_CONFIG_SELECT_GET_DEFAULT)
+++ EXECUTE_PROCESS(
+++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --selected-config
+++ OUTPUT_VARIABLE _wx_selected_config
+++ RESULT_VARIABLE _wx_result
+++ ERROR_QUIET
+++ )
+++ IF(_wx_result EQUAL 0)
+++ FOREACH(_opt_name debug static unicode universal)
+++ STRING(TOUPPER ${_opt_name} _upper_opt_name)
+++ IF(_wx_selected_config MATCHES ".*${_opt_name}.*")
+++ SET(wxWidgets_DEFAULT_${_upper_opt_name} ON)
+++ ELSE(_wx_selected_config MATCHES ".*${_opt_name}.*")
+++ SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+++ ENDIF(_wx_selected_config MATCHES ".*${_opt_name}.*")
+++ ENDFOREACH(_opt_name)
+++ ELSE(_wx_result EQUAL 0)
+++ FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
+++ SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+++ ENDFOREACH(_upper_opt_name)
+++ ENDIF(_wx_result EQUAL 0)
+++ ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT)
+++
+++ #
+++ # Query a boolean configuration option to determine if the system
+++ # has both builds available. If so, provide the selection option
+++ # to the user.
+++ #
+++ MACRO(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
+++ EXECUTE_PROCESS(
+++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --${_OPT_NAME}=yes
+++ RESULT_VARIABLE _wx_result_yes
+++ OUTPUT_QUIET
+++ ERROR_QUIET
+++ )
+++ EXECUTE_PROCESS(
+++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --${_OPT_NAME}=no
+++ RESULT_VARIABLE _wx_result_no
+++ OUTPUT_QUIET
+++ ERROR_QUIET
+++ )
+++ STRING(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
+++ IF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+++ OPTION(wxWidgets_USE_${_UPPER_OPT_NAME}
+++ ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}})
+++ ELSE(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+++ # If option exists (already in cache), force to available one.
+++ IF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+++ IF(_wx_result_yes EQUAL 0)
+++ SET(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE)
+++ ELSE(_wx_result_yes EQUAL 0)
+++ SET(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
+++ ENDIF(_wx_result_yes EQUAL 0)
+++ ENDIF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+++ ENDIF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+++ ENDMACRO(WX_CONFIG_SELECT_QUERY_BOOL)
+++
+++ #
+++ # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting
+++ # among multiple builds.
+++ #
+++ MACRO(WX_CONFIG_SELECT_SET_OPTIONS)
+++ SET(wxWidgets_SELECT_OPTIONS "")
+++ FOREACH(_opt_name debug static unicode universal)
+++ STRING(TOUPPER ${_opt_name} _upper_opt_name)
+++ IF(DEFINED wxWidgets_USE_${_upper_opt_name})
+++ IF(wxWidgets_USE_${_upper_opt_name})
+++ LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
+++ ELSE(wxWidgets_USE_${_upper_opt_name})
+++ LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
+++ ENDIF(wxWidgets_USE_${_upper_opt_name})
+++ ENDIF(DEFINED wxWidgets_USE_${_upper_opt_name})
+++ ENDFOREACH(_opt_name)
+++ ENDMACRO(WX_CONFIG_SELECT_SET_OPTIONS)
+++
+++ #-----------------------------------------------------------------
+++ # UNIX: Start actual work.
+++ #-----------------------------------------------------------------
+++ # Support cross-compiling, only search in the target platform.
+++ FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config
+++ ONLY_CMAKE_FIND_ROOT_PATH
+++ )
+++
+++ IF(wxWidgets_CONFIG_EXECUTABLE)
+++ SET(wxWidgets_FOUND TRUE)
+++
+++ # get defaults based on "wx-config --selected-config"
+++ WX_CONFIG_SELECT_GET_DEFAULT()
+++
+++ # for each option: if both builds are available, provide option
+++ WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?")
+++ WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?")
+++ WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?")
+++ WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?")
+++
+++ # process selection to set wxWidgets_SELECT_OPTIONS
+++ WX_CONFIG_SELECT_SET_OPTIONS()
+++ DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
+++
+++ # run the wx-config program to get cxxflags
+++ EXECUTE_PROCESS(
+++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+++ ${wxWidgets_SELECT_OPTIONS} --cxxflags
+++ OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
+++ RESULT_VARIABLE RET
+++ ERROR_QUIET
+++ )
+++ IF(RET EQUAL 0)
+++ STRING(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
+++ SEPARATE_ARGUMENTS(wxWidgets_CXX_FLAGS)
+++
+++ DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
+++
+++ # parse definitions from cxxflags; drop -D* from CXXFLAGS and the -D prefix
+++ STRING(REGEX MATCHALL "-D[^;]+"
+++ wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}")
+++ STRING(REGEX REPLACE "-D[^;]+;" ""
+++ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+++ STRING(REPLACE "-D" ""
+++ wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
+++
+++ # parse include dirs from cxxflags; drop -I prefix
+++ STRING(REGEX MATCHALL "-I[^;]+"
+++ wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}")
+++ STRING(REGEX REPLACE "-I[^;]+;" ""
+++ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+++ STRING(REPLACE "-I" ""
+++ wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
+++
+++ DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
+++ DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
+++ DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
+++
+++ ELSE(RET EQUAL 0)
+++ SET(wxWidgets_FOUND FALSE)
+++ DBG_MSG_V(
+++ "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
+++ ENDIF(RET EQUAL 0)
+++
+++ # run the wx-config program to get the libs
+++ # - NOTE: wx-config doesn't verify that the libs requested exist
+++ # it just produces the names. Maybe a TRY_COMPILE would
+++ # be useful here...
+++ STRING(REPLACE ";" ","
+++ wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}")
+++ EXECUTE_PROCESS(
+++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+++ ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS}
+++ OUTPUT_VARIABLE wxWidgets_LIBRARIES
+++ RESULT_VARIABLE RET
+++ ERROR_QUIET
+++ )
+++ IF(RET EQUAL 0)
+++ STRING(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
+++ SEPARATE_ARGUMENTS(wxWidgets_LIBRARIES)
+++ STRING(REPLACE "-framework;" "-framework "
+++ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+++ STRING(REPLACE "-arch;" "-arch "
+++ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+++ STRING(REPLACE "-isysroot;" "-isysroot "
+++ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+++
+++ # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
+++ STRING(REGEX MATCHALL "-L[^;]+"
+++ wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}")
+++ STRING(REPLACE "-L" ""
+++ wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
+++
+++ DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
+++ DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
+++
+++ ELSE(RET EQUAL 0)
+++ SET(wxWidgets_FOUND FALSE)
+++ DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}")
+++ ENDIF(RET EQUAL 0)
+++ ENDIF(wxWidgets_CONFIG_EXECUTABLE)
+++
+++#=====================================================================
+++# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
+++#=====================================================================
+++ ELSE(wxWidgets_FIND_STYLE STREQUAL "unix")
+++ IF(NOT wxWidgets_FIND_QUIETLY)
+++ MESSAGE(STATUS
+++ "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
+++ " Platform unknown/unsupported. It's neither WIN32 nor UNIX "
+++ "find style."
+++ )
+++ ENDIF(NOT wxWidgets_FIND_QUIETLY)
+++ ENDIF(wxWidgets_FIND_STYLE STREQUAL "unix")
+++ENDIF(wxWidgets_FIND_STYLE STREQUAL "win32")
+++
+++# Debug output:
+++DBG_MSG("wxWidgets_FOUND : ${wxWidgets_FOUND}")
+++DBG_MSG("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}")
+++DBG_MSG("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}")
+++DBG_MSG("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}")
+++DBG_MSG("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}")
+++DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}")
+++
+++#=====================================================================
+++#=====================================================================
+++INCLUDE(FindPackageHandleStandardArgs)
+++FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND)
+++# Maintain consistency with all other variables.
+++SET(wxWidgets_FOUND ${WXWIDGETS_FOUND})
+++
+++#=====================================================================
+++# Macros for use in wxWidgets apps.
+++# - This module will not fail to find wxWidgets based on the code
+++# below. Hence, it's required to check for validity of:
+++#
+++# wxWidgets_wxrc_EXECUTABLE
+++#=====================================================================
+++
+++# Resource file compiler.
+++FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc
+++ ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
+++ )
+++
+++#
+++# WX_SPLIT_ARGUMENTS_ON(<keyword> <left> <right> <arg1> <arg2> ...)
+++#
+++# Sets <left> and <right> to contain arguments to the left and right,
+++# respectively, of <keyword>.
+++#
+++# Example usage:
+++# FUNCTION(WXWIDGETS_ADD_RESOURCES outfiles)
+++# WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN})
+++# ...
+++# ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
+++#
+++# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C)
+++#
+++# NOTE: This is a generic piece of code that should be renamed to
+++# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as
+++# FindPackageStandardArgs.cmake. At the time of this writing
+++# FindQt4.cmake has a QT4_EXTRACT_OPTIONS, which I basically copied
+++# here a bit more generalized. So, there are already two find modules
+++# using this approach.
+++#
+++FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
+++ # FIXME: Document that the input variables will be cleared.
+++ #LIST(APPEND ${_leftvar} "")
+++ #LIST(APPEND ${_rightvar} "")
+++ SET(${_leftvar} "")
+++ SET(${_rightvar} "")
+++
+++ SET(_doing_right FALSE)
+++ FOREACH(element ${ARGN})
+++ IF("${element}" STREQUAL "${_keyword}")
+++ SET(_doing_right TRUE)
+++ ELSE("${element}" STREQUAL "${_keyword}")
+++ IF(_doing_right)
+++ LIST(APPEND ${_rightvar} "${element}")
+++ ELSE(_doing_right)
+++ LIST(APPEND ${_leftvar} "${element}")
+++ ENDIF(_doing_right)
+++ ENDIF("${element}" STREQUAL "${_keyword}")
+++ ENDFOREACH(element)
+++
+++ SET(${_leftvar} ${${_leftvar}} PARENT_SCOPE)
+++ SET(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
+++ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
+++
+++#
+++# WX_GET_DEPENDENCIES_FROM_XML(
+++# <depends>
+++# <match_pattern>
+++# <clean_pattern>
+++# <xml_contents>
+++# <depends_path>
+++# )
+++#
+++# FIXME: Add documentation here...
+++#
+++FUNCTION(WX_GET_DEPENDENCIES_FROM_XML
+++ _depends
+++ _match_patt
+++ _clean_patt
+++ _xml_contents
+++ _depends_path
+++ )
+++
+++ STRING(REGEX MATCHALL
+++ ${_match_patt}
+++ dep_file_list
+++ "${${_xml_contents}}"
+++ )
+++ FOREACH(dep_file ${dep_file_list})
+++ STRING(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
+++
+++ # make the file have an absolute path
+++ IF(NOT IS_ABSOLUTE "${dep_file}")
+++ SET(dep_file "${${_depends_path}}/${dep_file}")
+++ ENDIF(NOT IS_ABSOLUTE "${dep_file}")
+++
+++ # append file to dependency list
+++ LIST(APPEND ${_depends} "${dep_file}")
+++ ENDFOREACH(dep_file)
+++
+++ SET(${_depends} ${${_depends}} PARENT_SCOPE)
+++ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML)
+++
+++#
+++# WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files>
+++# OPTIONS <options> [NO_CPP_CODE])
+++#
+++# Adds a custom command for resource file compilation of the
+++# <xrc_files> and appends the output files to <sources>.
+++#
+++# Example usages:
+++# WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc)
+++# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx)
+++#
+++FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles)
+++ WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN})
+++
+++ # Parse files for dependencies.
+++ SET(rc_file_list_abs "")
+++ SET(rc_depends "")
+++ FOREACH(rc_file ${rc_file_list})
+++ GET_FILENAME_COMPONENT(depends_path ${rc_file} PATH)
+++
+++ GET_FILENAME_COMPONENT(rc_file_abs ${rc_file} ABSOLUTE)
+++ LIST(APPEND rc_file_list_abs "${rc_file_abs}")
+++
+++ # All files have absolute paths or paths relative to the location
+++ # of the rc file.
+++ FILE(READ "${rc_file_abs}" rc_file_contents)
+++
+++ # get bitmap/bitmap2 files
+++ WX_GET_DEPENDENCIES_FROM_XML(
+++ rc_depends
+++ "<bitmap[^<]+"
+++ "^<bitmap[^>]*>"
+++ rc_file_contents
+++ depends_path
+++ )
+++
+++ # get url files
+++ WX_GET_DEPENDENCIES_FROM_XML(
+++ rc_depends
+++ "<url[^<]+"
+++ "^<url[^>]*>"
+++ rc_file_contents
+++ depends_path
+++ )
+++
+++ # get wxIcon files
+++ WX_GET_DEPENDENCIES_FROM_XML(
+++ rc_depends
+++ "<object[^>]*class=\"wxIcon\"[^<]+"
+++ "^<object[^>]*>"
+++ rc_file_contents
+++ depends_path
+++ )
+++ ENDFOREACH(rc_file)
+++
+++ #
+++ # Parse options.
+++ #
+++ # If NO_CPP_CODE option specified, then produce .xrs file rather
+++ # than a .cpp file (i.e., don't add the default --cpp-code option).
+++ LIST(FIND rc_options NO_CPP_CODE index)
+++ IF(index EQUAL -1)
+++ LIST(APPEND rc_options --cpp-code)
+++ # wxrc's default output filename for cpp code.
+++ SET(outfile resource.cpp)
+++ ELSE(index EQUAL -1)
+++ LIST(REMOVE_AT rc_options ${index})
+++ # wxrc's default output filename for xrs file.
+++ SET(outfile resource.xrs)
+++ ENDIF(index EQUAL -1)
+++
+++ # Get output name for use in ADD_CUSTOM_COMMAND.
+++ # - short option scanning
+++ LIST(FIND rc_options -o index)
+++ IF(NOT index EQUAL -1)
+++ MATH(EXPR filename_index "${index} + 1")
+++ LIST(GET rc_options ${filename_index} outfile)
+++ #LIST(REMOVE_AT rc_options ${index} ${filename_index})
+++ ENDIF(NOT index EQUAL -1)
+++ # - long option scanning
+++ STRING(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
+++ IF(outfile_opt)
+++ STRING(REPLACE "--output=" "" outfile "${outfile_opt}")
+++ ENDIF(outfile_opt)
+++ #STRING(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
+++ #STRING(REGEX REPLACE ";$" "" rc_options "${rc_options}")
+++
+++ IF(NOT IS_ABSOLUTE "${outfile}")
+++ SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+++ ENDIF(NOT IS_ABSOLUTE "${outfile}")
+++ ADD_CUSTOM_COMMAND(
+++ OUTPUT "${outfile}"
+++ COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs}
+++ DEPENDS ${rc_file_list_abs} ${rc_depends}
+++ )
+++
+++ # Add generated header to output file list.
+++ LIST(FIND rc_options -e short_index)
+++ LIST(FIND rc_options --extra-cpp-code long_index)
+++ IF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+++ GET_FILENAME_COMPONENT(outfile_ext ${outfile} EXT)
+++ STRING(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
+++ LIST(APPEND ${_outfiles} "${outfile_header}")
+++ SET_SOURCE_FILES_PROPERTIES(
+++ "${outfile_header}" PROPERTIES GENERATED TRUE
+++ )
+++ ENDIF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+++
+++ # Add generated file to output file list.
+++ LIST(APPEND ${_outfiles} "${outfile}")
+++
+++ SET(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
+++ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
diff --cc debian/patches/series
index 2ec240e,2ec240e..d8057e6
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,6 -2,6 +2,4 @@@
04_use-mkoctfile.diff
07_octave_prune_examples.diff
11_minus-sign-manpage.diff
--13_fix-kfreeBSD-build.diff
--14_octave-3.0-fixes.diff
--15_octave-toggle-plplot-use.diff
++16_wxwidget-with-cmake-2.8.diff
diff --cc debian/rules
index b883d62,b883d62..fa6f0ce
--- a/debian/rules
+++ b/debian/rules
@@@ -26,27 -26,27 +26,20 @@@ debdoc := $(debshr)/do
debinfo := $(debshr)/info
debex := $(debshr)/plplot$(version)/examples
--JAVA_HOME = /usr/lib/jvm/java-gcj
++JAVA_HOME = /usr/lib/jvm/default-java
PYVERS = $(shell pyversions -vr)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
--# Disable java and ada build on arm - problems with java-gcj-compat-dev
--# at the moment. Also gnat not available on arm, mips, and mipsel.
++# Disable Ada build on armel - gnat not available on armel at the moment.
--ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:kfreebsd-amd64:))
++ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:armel:))
BUILD_ADA = no
else
BUILD_ADA = yes
endif
--ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:hppa:hurd-i386:))
--BUILD_JAVA = no
--else
--BUILD_JAVA = yes
--endif
--
# Configure options
ifeq ($(BUILD_ADA),yes)
@@@ -55,19 -55,19 +48,17 @@@ els
ADA_OPTIONS = -DENABLE_ada=OFF
endif
--ifeq ($(BUILD_JAVA),yes)
JAVA_OPTIONS = \
-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
--else
--JAVA_OPTIONS = -DENABLE_java=OFF
--endif
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_tk=ON -DENABLE_ocaml=OFF\
++ -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=OFF \
++ -DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \
++ -DDEFAULT_NO_QT_DEVICES=ON \
$(ADA_OPTIONS) $(JAVA_OPTIONS)
BUILD_DIR = $(debbase)/build_tmp
@@@ -76,17 -76,17 +67,9 @@@ SRC_DIR = $(shell pwd
control:
ifeq ($(BUILD_ADA),no)
--ifeq ($(BUILD_JAVA),no)
-- slice -o UNDEF:debian/control debian/control.in
--else
-- slice -o UNDEF+JAVA:debian/control debian/control.in
--endif
--else
--ifeq ($(BUILD_JAVA),no)
slice -o UNDEF+ADA:debian/control debian/control.in
else
-- slice -o UNDEF+JAVA+ADA:debian/control debian/control.in
--endif
++ slice -o UNDEF+ADA:debian/control debian/control.in
endif
config: config-stamp
@@@ -108,7 -108,7 +91,7 @@@ build-arch-stamp: patch config-stam
#( cd bindings/octave ; \
# $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct )
( cd $(BUILD_DIR) ; $(MAKE) )
-- -( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest -VV)
++ -( cd $(BUILD_DIR) ; ctest -VV )
touch build-arch-stamp
build-indep: build-indep-stamp
@@@ -133,9 -133,9 +116,7 @@@ install-arch: install-arch-stamp instal
--no-package=libplplot9-java --no-package=libplplot-ada
dh_movefiles --package=python-plplot
dh_movefiles --package=plplot-bin
--ifeq ($(BUILD_JAVA),yes)
dh_movefiles --package=libplplot9-java
--endif
ifeq ($(BUILD_ADA),yes)
dh_movefiles --package=libplplot-ada
dh_movefiles --package=libplplot-dev usr/share/ada
@@@ -165,16 -165,16 +146,14 @@@ install-arch-stamp: build-arch-stam
for i in libplplot-dev plplot-tcl plplot-tcl-dev \
plplot9-driver-gd plplot9-driver-xwin octave-plplot \
python-plplot plplot-bin libplplot-c++9c2 \
-- plplot9-driver-gnome2 plplot9-driver-wxwidgets \
++ plplot9-driver-wxwidgets \
plplot9-driver-cairo libplplot-fortran9 ; do \
ln -s $(libpkg) $(debdoc)/$$i ; \
done
--ifeq ($(BUILD_JAVA),yes)
ln -s $(libpkg) $(debdoc)/libplplot9-java
mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar
( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
--endif
ifeq ($(BUILD_ADA),yes)
ln -s $(libpkg) $(debdoc)/libplplot-ada
@@@ -200,8 -200,8 +179,8 @@@ install-python: $(PYVERS:%=install-pyth
install-python%: build-arch-stamp
( cd $(BUILD_DIR) ; \
-- cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DENABLE_pygcw=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
-- for d in gnome2/python python ; do \
++ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
++ for d in python ; do \
( cd bindings/$$d; \
$(MAKE) clean ; \
$(MAKE) ; \
--
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