--- plplot-5.9.0.orig/debian/changelog +++ plplot-5.9.0/debian/changelog @@ -1,13 +1,125 @@ -plplot (5.8.0-7) UNRELEASED; urgency=low +plplot (5.9.0-8) unstable; urgency=low + + [ Andrew Ross ] + * debian/rules: + + Fix use of findstring in debian/rules which prevented java + building on i386 (closes: #483826) + * Add dpatches + 12_cmake-2.6-fixes: Fixes build with cmake 2.6 now in sid. This + patch is taken from svn upstream. (closes: #482236) + + [ Rafael Laboissiere ] + * debian/control.in: Bump Standards-Version to 3.8.0 (no changes needed) + + -- Rafael Laboissiere Thu, 17 Jul 2008 12:08:51 +0200 + +plplot (5.9.0-7) unstable; urgency=low + + * debian/control.in, debian/rules: + + Build-depend on default-jdk-builddep instead of java-gcj-compat-dev + and prevents building of the libplplot9-java package on alpha, hppa, + and hurd-i386 (closes: #477902) + + Prevent libplplot-ada of building on armeb and armel (closes: #478891) + + -- Rafael Laboissiere Fri, 02 May 2008 15:45:20 +0200 + +plplot (5.9.0-6) unstable; urgency=low + + * debian/control.in, debian/rules: Disable building of the Ada binding + on alpha + + -- Rafael Laboissiere Thu, 03 Apr 2008 11:59:36 +0200 + +plplot (5.9.0-5) unstable; urgency=low + + [ Andrew Ross ] + * debian/control.in: Make it clear that the ada bindings are still + experimental + + [ Rafael Laboissiere ] + * debian/control.in, debian/rules: Do not build the Ada binding on mips + and mipsel + + -- Rafael Laboissiere Fri, 28 Mar 2008 11:32:20 +0100 + +plplot (5.9.0-4) unstable; urgency=low + + * debian/control.in: + + Renamed from debian/control. + + Build-depend on slice + + Build-depend on gnat-4.1 on alpha, mips, and mipsel, since gnat-4.3, + the default Ada compiler in Debian unstable, has issues on those + architectures + * debian/rules: + + Do not issue commands related to the libplplot9-java and + libplplot-ada packages on arm + + Process debian/control.in through the slice command to produce a + debian/control file with some packages excluded for some + architectures (currently, libplplot9-java and libplplot-ada are + excluded for arm) + + -- Rafael Laboissiere Mon, 24 Mar 2008 10:57:11 +0100 + +plplot (5.9.0-3) unstable; urgency=low + + * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile + fails on this architecture + * debian/rules: Set variable DEB_BUID_ARCH using dpkg-architecture + + -- Rafael Laboissiere Sun, 23 Mar 2008 22:18:14 +0100 + +plplot (5.9.0-2) unstable; urgency=low + + [ Andrew Ross ] + * debian/control, debian/rules: Disable ada support for arm. The + gnat compiler is not available on the arm architecture. The + libplplot-ada package will be empty on this architecture. [ Rafael Laboissiere ] - * debian/control: Fixed capitalization of GNOME (Lintian warning) - * debian/patches/09_pdftex-EC-encoding.dpatch: Added patch for getting - included the correct ec.enc file for the EC encoding, such that - ligatures like "ff" and "fi" display correctly in the PDF form of the - documentation (closes: #461343) + * Rebuilt against new libffi-dev, such that the python-plplot package + will depend on the new libffi5 (closes: #472166) + * debian/patches/11_minus-sign-manpage.dpatch: Escape "-" signs that + mean the "minus" character in plserver man page + * debian/plplot-doc.doc-base: Set section to Science/Mathematics + + -- Rafael Laboissiere Sun, 16 Mar 2008 23:37:46 +0100 + +plplot (5.9.0-1) unstable; urgency=low + + [ Andrew Ross ] + * New upstream release + * debian/patches/00list: Remove patches + 05_octave_documentation.dpatch + 06_build_dir_use_physical_path.dpatch + 08_fix_cxx_includes.dpatch + as they are now included upstream + * debian/rules, debian/control, debian/libplplot-ada.files, + debian/liplplot-dev.files: + Add new package libplplot-ada to contain the Ada bindings. Include + examples and source in with the libplplot-dev package (following + Ada policy). + * debian/libplplot9.README.Debian: Update to include new ada + bindings package. + + [ Rafael Laboissiere ] + * debian/control: + + Fixed capitalization of GNOME (Lintian warning) + + Force build-dependency on octave3.0 >= 3.0.0-2, ensuring the + transition from g77 to gfortran. Also, drop the unnecessary + build-dependencies on blas, atlas, and lapack, since they are pulled + in by octave3.0. + * Add dpatches: + + 09_pdftex-EC-encoding: Include the correct ec.enc file for the EC + encoding, such that ligatures like "ff" and "fi" display correctly + in the PDF form of the documentation (closes: #461343) + + 10_print-usage-octave-3.0: Use the appropriate call to print_usage + in wrap_octave.pl when building against octave3.0 + * debian/patches/04_use-mkoctfile.dpatch: Adjust for installing + plplot_octave.oct with the appropriate execution permissions, + otherwise dpkg-shlibdeps does not work correctly for the octave-plplot + package - -- Rafael Laboissiere Fri, 18 Jan 2008 13:26:34 +0100 + -- Rafael Laboissiere Sun, 24 Feb 2008 12:43:28 +0100 plplot (5.8.0-6) unstable; urgency=low @@ -201,7 +313,7 @@ plplot (5.6.1-8) unstable; urgency=low - * debian/control, debian/rules: Do not build the libplplot9-java pacakge + * debian/control, debian/rules: Do not build the libplplot9-java package anymore, at least until the problems in building the PLplot Java buildings in the autobuilders is fixed (closes: #384329) @@ -1249,7 +1361,7 @@ plplot (5.2.0.cvs.20030218-2) unstable; urgency=low * Something was strangely broken with the inclusion of files in the - plplot-doc pacakge, probably related to an extraneous config.cache + plplot-doc package, probably related to an extraneous config.cache file. Fixed now. -- Rafael Laboissiere Tue, 18 Feb 2003 21:37:44 +0100 --- plplot-5.9.0.orig/debian/libplplot-ada.files +++ plplot-5.9.0/debian/libplplot-ada.files @@ -0,0 +1,3 @@ +usr/lib/libplplotada*.so.* +usr/lib/ada +usr/share/doc/libplplot-ada --- plplot-5.9.0.orig/debian/rules +++ plplot-5.9.0/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# -*- Makefile -*- +# -*- gmake -*- # Made with the aid of dh_make, by Craig Small # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # This version is for a hypothetical package that builds an @@ -29,27 +29,68 @@ JAVA_HOME = /usr/lib/jvm/java-gcj PYVERS = $(shell pyversions -vr) -# Disable java build on arm - problems with java-gcj-compat-dev at the moment -ifeq ($(DEB_BUILD_ARCH),arm) -CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ - -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ - -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF + +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. + +ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:)) +BUILD_ADA = no else -CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ - -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ +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) +ADA_OPTIONS = -DENABLE_ada=ON +else +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 \ - -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF + -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 \ + $(ADA_OPTIONS) $(JAVA_OPTIONS) + BUILD_DIR = $(debbase)/build_tmp 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 +endif + config: config-stamp -config-stamp: +config-stamp: control mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ @@ -71,7 +112,7 @@ touch build-arch-stamp build-indep: build-indep-stamp -build-indep-stamp: patch +build-indep-stamp: patch dh_testdir ( cd $(BUILD_DIR) ; cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \ cd doc ; $(MAKE) ) @@ -88,10 +129,19 @@ install-arch: install-arch-stamp install-python dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \ - --no-package=plplot-bin --no-package=python-plplot + --no-package=plplot-bin --no-package=python-plplot \ + --no-package=libplplot9-java --no-package=libplplot-ada dh_movefiles --package=python-plplot - dh_movefiles --package=libplplot-dev 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 +else + dh_movefiles --package=libplplot-dev +endif dh_movefiles --package=$(libpkg) install-arch-stamp: build-arch-stamp @@ -116,16 +166,20 @@ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ python-plplot plplot-bin libplplot-c++9c2 \ plplot9-driver-gnome2 plplot9-driver-wxwidgets \ - plplot9-driver-cairo libplplot-fortran9 \ - libplplot9-java; do \ + plplot9-driver-cairo libplplot-fortran9 ; do \ ln -s $(libpkg) $(debdoc)/$$i ; \ done -ifneq ($(DEB_BUILD_ARCH),arm) +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 +endif + touch install-arch-stamp install-indep: install-indep-stamp @@ -195,4 +249,4 @@ binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary config \ - patch unpatch + patch unpatch control --- plplot-5.9.0.orig/debian/control.in +++ plplot-5.9.0/debian/control.in @@ -0,0 +1,221 @@ +Source: plplot +Section: math +Priority: optional +Maintainer: Andrew Ross +Uploaders: Rafael Laboissiere +Standards-Version: 3.8.0 +Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), 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, dpatch, slice, + python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, + python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), + python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], + fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel] +Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, + docbook2x, opensp, jadetex +Build-Conflicts: libplplot5, octave2.1-headers +XS-Python-Version: all +Homepage: http://www.plplot.org +Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian +Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ + +Package: libplplot9 +Architecture: any +Section: libs +Conflicts: libplplot5, plplot (<< 5) +Depends: ${shlibs:Depends} +Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, 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 + 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 contains the PLplot libraries for C and Fortran77, as + well as the necessary data files. + +Package: libplplot-dev +Architecture: any +Section: libdevel +Recommends: pkg-config +Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, + libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2 +Description: Scientific plotting library (development files) + This package contains all that is needed for doing development in C, C++, + and Fortran with PLplot, a scientific plotting library. Examples of + programs for these languages are also included. For development in + Tcl/Tk, Python, and Octave, install the plplot-tcl, python-plplot, + and octave-plplot packages, respectively. + +Package: libplplot-c++9c2 +Architecture: any +Section: libs +Conflicts: libplplot5, libplplot-c++9 +Replaces: libplplot-c++9 +Depends: ${shlibs:Depends} +Description: Scientific plotting library + This package contains the C++ binding for PLplot, a scientific plotting + library. + +Package: libplplot-fortran9 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: Scientific plotting library + This package contains the Fortran 77 and Fortran 95 bindings for + PLplot, a scientific plotting library. + +[JAVA:Package: libplplot9-java +Architecture: any +Section: libs +Depends: java-gcj-compat, ${shlibs:Depends} +Description: Scientific plotting library + This packages contains the Java bindings for PLplot, a scientific + plotting library. +:] +Package: libcsiro0 +Architecture: any +Section: libs +Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) +Depends: ${shlibs:Depends} +Description: Scientific plotting library + This package contains two libraries developed by Pavel Sakov, from the + CSIRO Marine Research, used in geometry applications: + . + * libcsirocsa: bivariate Cubic Spline Approximation library + * libcsironn: Natural Neighbours interpolation library + . + The source code for these libraries are part of the plplot source + package. + +Package: plplot-bin +Architecture: any +Section: math +Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) +Depends: ${shlibs:Depends} +Description: Scientific plotting library (utilities) + This package contains the following utilities associated with PLplot, + a scientific plotting library: + . + * pltek - review a Tektronix vector file + * plm2gif - converts PLplot metafiles to GIF files + * plpr - converts PLplot metafile to something the printer will understand + +Package: plplot9-driver-xwin +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Conflicts: plplot-lib, plplot (<< 5) +Description: Scientific plotting library (X11 driver) + This package provides the X11 driver module for PLplot, a scientific + plotting library. + +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) + This package provides the GNOME Canvas Widget driver module for PLplot, a + scientific plotting library. This package replaces the (now deprecated) + plplot9-driver-gnome package. + +Package: plplot9-driver-wxwidgets +Architecture: any +Section: libs +Depends: libplplot9, ${shlibs:Depends} +Description: Scientific plotting library (wxWidgets driver) + This package provides the wxWidgets driver module for PLplot, a + scientific plotting library. + +Package: plplot-tcl +Architecture: any +Priority: extra +Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends} +Description: Tcl/Tk support for PLplot, a plotting library + This package contains the Tcl/Tk support for PLplot, a scientific + plotting library: shared libraries, Tcl modules, the Tk driver, and + some programs for interactive use of PLplot (plserver and pltcl). + Also included is the utility program plrender to render PLplot + metafiles. + +Package: plplot-tcl-dev +Architecture: any +Priority: extra +Depends: libplplot9 (= ${binary:Version}), plplot-tcl +Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) +Description: Tcl/Tk development support for PLplot, a plotting library + This package contains the necessary files to do development in Tcl/Tk + with PLplot, a scientific plotting library: header files, shared + libraries links, and examples. + +Package: plplot9-driver-gd +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Recommends: ttf-freefont +Description: Scientific plotting library (GD driver) + This package provides the GD driver module for PLplot, a scientific plotting + library. It allows the generation of PNG and JPEG files directly from + PLplot programs. + +Package: plplot9-driver-cairo +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Conflicts: plplot9-driver-psttf +Replaces: plplot9-driver-psttf +Description: Scientific plotting library (Cairo driver) + This package provides the Cairo driver module for PLplot, a + scientific plotting library. It is based on the Cairo 2D + graphics library with supportting multiple output devices (X-Window, + PDF, PostScript, and PNG). + +Package: python-plplot +Architecture: any +Section: python +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, + ${python:Depends}, python-numpy +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python support for PLplot, a plotting library + This package contains the library plmodule.so for gluing the PLplot + scientific plotting library into Python applications. Examples are also + provided. + +Package: octave-plplot +Architecture: any +Priority: extra +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends} +Description: Octave support for PLplot, a plotting library + This package contains the Octave bindings for PLplot, a scientific plotting + library. It provides an almost drop-in replacement for the traditional + Gnuplot graphical interface in Octave. Examples are also provided. + +[ADA:Package: libplplot-ada +Architecture: any +Priority: extra +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} +Description: Ada support for PLplot, a plotting library + This package contains the Ada bindings for PLplot, a scientific plotting + library. The ada bindings are currently under development and should be + considered experimental. +:] +Package: plplot-doc +Architecture: all +Section: doc +Suggests: libplplot-dev +Description: Documentation for PLplot, a plotting library + This package contains the HTML, PDF, PostScript and info forms of the + PLplot documentation. It also contains the man pages for the API + functions. + --- plplot-5.9.0.orig/debian/plplot-doc.doc-base +++ plplot-5.9.0/debian/plplot-doc.doc-base @@ -7,7 +7,7 @@ almost all aspects of the plot are configurable. This manual contains an extensive presentation of the PLplot concepts and the documentation of the API functions. -Section: Apps/Math +Section: Science/Mathematics Format: HTML Index: /usr/share/doc/plplot-doc/html/index.html --- plplot-5.9.0.orig/debian/control +++ plplot-5.9.0/debian/control @@ -3,19 +3,18 @@ Priority: optional Maintainer: Andrew Ross Uploaders: Rafael Laboissiere -Standards-Version: 3.7.3 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), +Standards-Version: 3.8.0 +Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm], tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave3.0-headers, + libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, - libltdl3-dev, pkg-config, dpatch, atlas3-base-dev - [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k], + libltdl3-dev, pkg-config, dpatch, slice, python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm], - fastjar, swig + 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] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -77,7 +76,7 @@ Package: libplplot9-java Architecture: any Section: libs -Depends: java-gcj-compat [!arm] , ${shlibs:Depends} +Depends: java-gcj-compat, ${shlibs:Depends} Description: Scientific plotting library This packages contains the Java bindings for PLplot, a scientific plotting library. @@ -202,6 +201,15 @@ library. It provides an almost drop-in replacement for the traditional Gnuplot graphical interface in Octave. Examples are also provided. +Package: libplplot-ada +Architecture: any +Priority: extra +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} +Description: Ada support for PLplot, a plotting library + This package contains the Ada bindings for PLplot, a scientific plotting + library. The ada bindings are currently under development and should be + considered experimental. + Package: plplot-doc Architecture: all Section: doc --- plplot-5.9.0.orig/debian/libplplot9.README.Debian +++ plplot-5.9.0/debian/libplplot9.README.Debian @@ -44,13 +44,15 @@ * libplplot-c++9c2: Contains the library for using the C++ PLplot classes. - * libplplot-fortran9: Contains the F77 and F90 binding for + * libplplot-fortran9: Contains the F77 and F90 bindings for the PLplot functions. * libplplot9-java: Contains the bindings for using the PLplot functions from java. This package is currently empty on arm due to problems with java-gcj-compat-dev on this platform. + * libplplot9-ada: Contains the Ada bindings for the PLplot functions. + * plplot-tcl: Modules allowing binding of the PLplot functions for Tcl/Tk. Contains also the Tk driver module and some interactive programs --- plplot-5.9.0.orig/debian/patches/10_print-usage-octave-3.0.dpatch +++ plplot-5.9.0/debian/patches/10_print-usage-octave-3.0.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere +## +## DP: Use correct call to print_usage in wrap_octave.pl when compiling +## DP: against octave3.0 + +@DPATCH@ + +--- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl ++++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl +@@ -10,7 +10,7 @@ + # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the + # perl artistic license (http://language.perl.com/misc/Artistic.html). + # +-# Modifications 2007 Andrew Ross ++# Modifications 2007 Andrew Ross + # This version contains three local fixes for plplot + # 1) Change _dim function to allow a zero length array (required by plstyl) + # 2) Alter string to std::string for compatibility with gcc3.2 and later +@@ -18,6 +18,9 @@ + # from v2.1 to v2.9. This requires a file octave_version.pl which defines + # the variable octave_version. + # ++# Modifications 2008 Rafael Laboissiere ++# Change 3) above is adapted for Octave v3.0 ++ + + package octave; # Everything should be in this package. + +@@ -158,7 +161,7 @@ + # Permissible not to specify output args + # if there is only one. + @ver = split(/\./,$octave_version); +- if ($ver[0] >= 2 && $ver[1] >= 9) { ++ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { + $retstr .= (")\n" . + " {\n" . + " print_usage();\n" . # Give an error. --- plplot-5.9.0.orig/debian/patches/12_cmake-2.6-fixes.dpatch +++ plplot-5.9.0/debian/patches/12_cmake-2.6-fixes.dpatch @@ -0,0 +1,364 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_cmake-2.6-fixes.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the build system to work with cmake 2.6. +## DP: This patch is extracted from the upstream SVN version of plplot. + +@DPATCH@ + +diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt +--- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 ++++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 +@@ -141,14 +141,30 @@ + RUNTIME DESTINATION ${BIN_DIR} + ) + +-# Yuk! All Makefiles are run from the top level build directory and +-# so the f90 .mod files end up there rather than in the bindings/f95 +-# directory. Ifort and pgf90 both have a -module command line option to +-# override this location, but I'm not sure how portable that? +-install( +-FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod +-DESTINATION ${F95_MOD_DIR} +-) ++if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # Yuk! All Makefiles are run from the top level build directory and ++ # so the f90 .mod files end up there rather than in the bindings/f95 ++ # directory. Ifort and pgf90 both have a -module command line option to ++ # override this location, but I'm not sure how portable that? ++ install( ++ FILES ++ ${CMAKE_BINARY_DIR}/plplot.mod ++ ${CMAKE_BINARY_DIR}/plplotp.mod ++ ${CMAKE_BINARY_DIR}/plplot_flt.mod ++ DESTINATION ${F95_MOD_DIR} ++ ) ++else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # For the current cvs version of CMake, the module files are created by ++ # default during the library build in the more logical bindings/f95 ++ # directory. ++ install( ++ FILES ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod ++ DESTINATION ${F95_MOD_DIR} ++ ) ++endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) + + # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} + if(PKG_CONFIG_EXECUTABLE) +diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake +--- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 +@@ -97,13 +97,7 @@ + string(REGEX REPLACE ";" " " + cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" + ) +- # Convert X linker information to preferred CMake form before appending +- # it to already converted ${linkflags} +- cmake_link_flags( +- cairo_X_LINK_FLAGS +- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" +- ) +- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) ++ set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES}) + else(PLD_xcairo AND X11_COMPILE_FLAGS) + message(STATUS + "WARNING: X windows not found. Setting xcairo driver to OFF." +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in +--- plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in 2008-07-15 15:47:30.000000000 +0100 +@@ -14,3 +14,4 @@ + ELSE(UNIX OR MINGW) + SET(CMAKE_Ada_OUTPUT_EXTENSION .obj) + ENDIF(UNIX OR MINGW) ++SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1) +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake +--- plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake 2008-07-15 15:47:54.000000000 +0100 +@@ -41,9 +41,9 @@ + SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) + ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS) + +-IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) ++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) + SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) ++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) + + IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG) + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) +@@ -53,6 +53,10 @@ + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) + ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP) + ++IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) ++ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) ++ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) ++ + # repeat for modules + IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS) + SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) +@@ -70,6 +74,22 @@ + SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) + ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) + ++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) ++ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG}) ++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) ++ ++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) ++ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP}) ++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) ++ ++IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) ++ SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG}) ++ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) ++ ++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) ++ SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) ++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) ++ + IF(NOT CMAKE_INCLUDE_FLAG_Ada) + SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) + ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) +@@ -85,7 +105,12 @@ + + SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") + +-SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING ++SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}") ++# avoid just having a space as the initial value for the cache ++IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") ++ SET(CMAKE_Ada_FLAGS_INIT) ++ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") ++SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING + "Flags for Ada compiler.") + + INCLUDE(CMakeCommonLanguageInclude) +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake +--- plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake 2008-07-15 15:48:05.000000000 +0100 +@@ -17,6 +17,8 @@ + + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt + " ++# FIXME: This specific location currently needs to be changed whenever the ++# location of the experimental Ada support files is changed. + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE) + project(test Ada) +diff -ur plplot-5.9.0-orig/cmake/modules/pkg-config.cmake plplot-5.9.0/cmake/modules/pkg-config.cmake +--- plplot-5.9.0-orig/cmake/modules/pkg-config.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/pkg-config.cmake 2008-07-15 16:27:07.000000000 +0100 +@@ -20,10 +20,10 @@ + # Module for determining pkg-config configuration variables related to the + # install-tree build of the examples. + # Also create useful macros called pkg_check_pkgconfig to emulate the +-# pkgconfig macro using the pkg_check_modules macro, +-# cmake_to_pkg_config_link_flags to process CMake link flags into ++# pkgconfig macro using the pkg_check_modules macro; ++# pkg_config_link_flags to process CMake link flags into + # pkg-config standard form for the configured output *.pc files, and +-# pkg_config_to_cmake_link_flags to process input link flags delivered ++# cmake_link_flags to process input link flags delivered + # by pkg-config into CMake standard form. + + # The following variables are set: +@@ -155,8 +155,10 @@ + set(${_link_flags_out}) + else("${_link_flags_in}" STREQUAL ""}) + #message("(original link flags) = ${_link_flags_in}") +- # Convert link flags to a list. +- string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}") ++ # Convert link flags to a list. Note some link flags are blank-delimited ++ # (such as "-framework whatever") so preserve those by splitting into ++ # separate list elements only if the next element starts with a hyphen. ++ string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}") + # Extract list of directories from -L options. + list(LENGTH _link_flags_list _link_flags_length) + math(EXPR _link_flags_length "${_link_flags_length} - 1") +@@ -164,7 +166,7 @@ + set(_link_directory_list) + foreach(_list_index RANGE ${_link_flags_length}) + list(GET _link_flags_list ${_list_index} _list_element) +- string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element}) ++ string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}") + if(_list_element STREQUAL "-L${_list_element1}") + list(APPEND _index_list ${_list_index}) + list(APPEND _link_directory_list ${_list_element1}) +@@ -186,7 +188,7 @@ + set(${_link_flags_out}) + foreach(_list_index RANGE ${_link_flags_length}) + list(GET _link_flags_list ${_list_index} _list_element) +- string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element}) ++ string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}") + if(_list_element STREQUAL "-l${_list_element1}") + set(_library_pathname "_library_pathname-NOTFOUND") + find_library( +diff -ur plplot-5.9.0-orig/cmake/modules/tcl-related.cmake plplot-5.9.0/cmake/modules/tcl-related.cmake +--- plplot-5.9.0-orig/cmake/modules/tcl-related.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/tcl-related.cmake 2008-07-15 16:55:58.000000000 +0100 +@@ -135,12 +135,7 @@ + endif(ENABLE_tk AND NOT X11_FOUND) + if(ENABLE_tk) + set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) +- set( +- TK_LIBRARY +- ${TK_LIBRARY} +- -L${X11_LIBRARY_DIR} +- ${X11_LIBRARIES} +- ) ++ set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES}) + message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") + message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") + else(ENABLE_tk) +@@ -157,7 +152,7 @@ + message(STATUS "Looking for itk library") + set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) + foreach(version ${itk_library_versions}) +- find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY} ++ find_library(ITK_LIBRARY itk${version} + PATH_SUFFIXES itk${version}) + endforeach(version ${itk_library_versions}) + if(ITK_LIBRARY) +diff -ur plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake plplot-5.9.0/cmake/modules/wxwidgets.cmake +--- plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/wxwidgets.cmake 2008-07-15 16:31:27.000000000 +0100 +@@ -23,8 +23,10 @@ + # PLD_wxwidgets - ON means the wxwidgets device is enabled. + # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets + # device. +-# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. +-# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. ++# wxwidgets_LINK_FLAGS - list of full path names of libraries and ++# linker flags for dynamic wxwidgets device driver. ++# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case ++# when ENABLE_DYNDRIVERS OFF. + + # Find wxWidgets needed for driver and bindings + if(PLD_wxwidgets) +@@ -39,11 +41,21 @@ + endif(PLD_wxwidgets) + + if(PLD_wxwidgets) ++ #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}") ++ #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}") + string(REGEX REPLACE ";" " -I" + wxwidgets_COMPILE_FLAGS +- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}" ++ "-I${wxWidgets_INCLUDE_DIRS}" + ) +- set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) ++ # 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 ";" " " ++ wxwidgets_COMPILE_FLAGS ++ ${wxwidgets_COMPILE_FLAGS} ++ " ${wxWidgets_DEFINITIONS}" ++ ) ++ # Convert wxWidgets_LIBRARIES to full pathname form. ++ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") + if(WITH_FREETYPE) + set( + wxwidgets_COMPILE_FLAGS +diff -ur plplot-5.9.0-orig/cmake/modules/xwin.cmake plplot-5.9.0/cmake/modules/xwin.cmake +--- plplot-5.9.0-orig/cmake/modules/xwin.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/xwin.cmake 2008-07-15 16:31:23.000000000 +0100 +@@ -30,12 +30,7 @@ + if(PLD_xwin) + if(X11_FOUND) + set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}") +- # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not +- # documented for external use so we may have to replace this +- # some day by the appropriate +- # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic. +- # But this works for now.... +- set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}") ++ set(xwin_LINK_FLAGS "${X11_LIBRARIES}") + option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF) + if(HAVE_PTHREAD) + find_package(Threads) +diff -ur plplot-5.9.0-orig/CMakeLists.txt plplot-5.9.0/CMakeLists.txt +--- plplot-5.9.0-orig/CMakeLists.txt 2008-02-10 15:54:06.000000000 +0000 ++++ plplot-5.9.0/CMakeLists.txt 2008-07-15 16:06:05.000000000 +0100 +@@ -21,6 +21,12 @@ + + # Version 2.4.5 or above of cmake is required! + CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) ++# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if ++# the user is using CMake 2.6.0 or newer). ++if(COMMAND cmake_policy) ++ # empty elements are not ignored in lists. ++ cmake_policy(SET CMP0007 NEW) ++endif(COMMAND cmake_policy) + + # Recommended way to do user overrides of C-related variables, is given at + # http://public.kitware.com/pipermail/cmake/2006-July/010334.html. +diff -ur plplot-5.9.0-orig/examples/f95/CMakeLists.txt plplot-5.9.0/examples/f95/CMakeLists.txt +--- plplot-5.9.0-orig/examples/f95/CMakeLists.txt 2008-02-10 15:54:08.000000000 +0000 ++++ plplot-5.9.0/examples/f95/CMakeLists.txt 2008-07-15 16:04:44.000000000 +0100 +@@ -50,32 +50,43 @@ + + if(BUILD_TEST) + remove_definitions("-DHAVE_CONFIG_H") +- # N.B. This is required because it's the location of plplot.mod +- # generated as a by-product of building libplplotf95${LIB_TAG}. +- include_directories(${CMAKE_BINARY_DIR}) + +- # Temporary workaround for module handling bug in CMake 2.4.3. Create a +- # file with arbitrary contents called plplot.mod.proxy in top-level +- # build tree. As a temporary measure we use cmake_workaround.f as the +- # generator of this file. (cmake_workaround.f was previously compiled, +- # but that is no longer the case.) Note, once CMake is fixed this comment +- # the following configure_file command and cmake_workaround.f should all +- # just disappear. +- configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f +- ${CMAKE_BINARY_DIR}/plplot.mod.proxy +- COPYONLY +- ) ++ if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # Temporary workaround for module handling bug in CMake 2.4.3. Create a ++ # file with arbitrary contents called plplot.mod.proxy in top-level ++ # build tree. As a temporary measure we use cmake_workaround.f as the ++ # generator of this file. (cmake_workaround.f was previously compiled, ++ # but that is no longer the case.) Note, once CMake is fixed this comment ++ # the following configure_file command and cmake_workaround.f should all ++ # just disappear. ++ configure_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f ++ ${CMAKE_BINARY_DIR}/plplot.mod.proxy ++ COPYONLY ++ ) ++ # The generated module location for 2.4.x CMake is the top-level build ++ # tree. ++ include_directories(${CMAKE_BINARY_DIR}) ++ else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # The generated module location for cvs CMake is the build-tree ++ # location where the corresponding library is generated. ++ include_directories(${CMAKE_BINARY_DIR}/bindings/f95) ++ endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) + endif(BUILD_TEST) + foreach(STRING_INDEX ${f95_STRING_INDICES}) + set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90) + if(BUILD_TEST) +- add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90) +- target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG}) ++ # Need unique target name ++ add_executable(x${STRING_INDEX}f95 x${STRING_INDEX}f.f90) ++ set_target_properties( ++ x${STRING_INDEX}f95 PROPERTIES ++ OUTPUT_NAME x${STRING_INDEX}f ++ ) ++ target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG}) + endif(BUILD_TEST) + endforeach(STRING_INDEX ${f95_STRING_INDICES}) + +-install(FILES ${f95_SRCS} ++install(FILES ${f95_SRCS} + DESTINATION ${DATA_DIR}/examples/f95 + ) + --- plplot-5.9.0.orig/debian/patches/11_minus-sign-manpage.dpatch +++ plplot-5.9.0/debian/patches/11_minus-sign-manpage.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_minus-sign-manpage.dpatch by Rafael Laboissiere +## +## DP: Escape "-" signs that mean the "minus" character + +@DPATCH@ + +--- plplot-5.9.0.orig/doc/plserver.1 ++++ plplot-5.9.0/doc/plserver.1 +@@ -14,10 +14,10 @@ + is just a front-end to the pltkMain() function. Structured along the + preferred lines for extended wish'es. It typically runs as a child + process from the PLplot TK driver to render output. Can use either TK +-send or Tcl-DP RPC for communication, depending on how it is invoked. ++send or Tcl\-DP RPC for communication, depending on how it is invoked. + .PP + Note that plserver can be used the same way as wish or dpwish, as it +-contains the functionality of each of these (except the -notk Tcl-DP ++contains the functionality of each of these (except the \-notk Tcl-DP + command-line option is not supported). + .SH "SEE ALSO" + See /usr/share/doc/plplot/plplot.ps.gz for more details. --- plplot-5.9.0.orig/debian/patches/00list +++ plplot-5.9.0/debian/patches/00list @@ -1,8 +1,8 @@ 01_check-for-octave2.9 02_unset-python-path 04_use-mkoctfile -05_octave_documentation -06_build_dir_use_physical_path 07_octave_prune_examples -08_fix_cxx_includes 09_pdftex-EC-encoding +10_print-usage-octave-3.0 +11_minus-sign-manpage +12_cmake-2.6-fixes.dpatch --- plplot-5.9.0.orig/debian/patches/04_use-mkoctfile.dpatch +++ plplot-5.9.0/debian/patches/04_use-mkoctfile.dpatch @@ -7,7 +7,7 @@ --- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt +++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt -@@ -128,66 +128,24 @@ +@@ -133,64 +133,34 @@ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h ) @@ -54,15 +54,17 @@ - ) -endif(USE_RPATH) - --# Have to be specific about permissions for some reason (probably oct suffix). --set(PERM_MODULES --OWNER_READ --OWNER_WRITE --OWNER_EXECUTE --GROUP_READ --GROUP_EXECUTE --WORLD_READ --WORLD_EXECUTE + # Have to be specific about permissions for some reason (probably oct suffix). + set(PERM_MODULES + OWNER_READ + OWNER_WRITE + OWNER_EXECUTE + GROUP_READ + GROUP_EXECUTE + WORLD_READ + WORLD_EXECUTE + ) + +add_custom_command( +OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc @@ -75,8 +77,8 @@ +add_custom_target( +plplot_octave_oct_file ALL +DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - ) - ++) ++ install( -TARGETS -plplot_octave @@ -84,11 +86,9 @@ +FILES +${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct DESTINATION ${OCTAVE_OCT_DIR} --PERMISSIONS ${PERM_MODULES} + PERMISSIONS ${PERM_MODULES} ) - - # Build and install plplot_stub.m -@@ -233,23 +191,4 @@ +@@ -238,23 +208,4 @@ DESTINATION ${PLPLOT_OCTAVE_DIR} )