[plplot] 55/68: Import Debian changes 5.9.9-3
Ole Streicher
olebole at moszumanska.debian.org
Mon Jul 10 07:38:39 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 27c1dced737de34dc6632ea74adf6d9c2a66f6ad
Author: Andrew Ross <andrewross at users.sourceforge.net>
Date: Mon Apr 2 15:30:25 2012 +0100
Import Debian changes 5.9.9-3
plplot (5.9.9-3) unstable; urgency=low
[ Andrew Ross ]
* debian/control.in:
+ Bump standards version to 3.9.3.
+ Fix broken suggests package plplot11-tcl for libplplot11.
+ Remove reference to ada-compiler in libplplot-ada0-dev package as per new
Debian Ada policy. Fixes lintian warning.
+ Add note for fortran bindings package description that Fortran 77 support
is deprecated in the current upstream SVN and will be dropped in a future
release. New code should use the Fortran 95 bindings.
* debian/rules:
+ Tidy up obsolete / unneeded code.
+ Ensure CFLAGS, CXXFLAGS and LDFLAGS are properly exported to cmake. Add in
FFLAGS. -fvisibility=hidden and --as-needed should now work properly. The
latter fixes a lot of dpkg-shlibdeps warnings.
* debian/patches/series, debian/patches/08_nn_link_libm.diff: Add patch to
explicitly link nn library against maths library. Fixes dpkg-shlibdeps
warning.
* Rebuild python-plplot package against new version of numpy as part of the
numpy transition.
[ Rafael Laboissiere ]
* debian/control.in:
+ Build-depend on liboctave-dev
+ Drop build-conflict with octave3.0-headers
+ Depend directly on octave, instead of using the substitution
variable ${octave:Depends}
* debian/rules:
+ Set directly the Octave paths, instead of using defs.make
+ Drop the call to octave-depends
* Adjust the upstream code for working with Octave 3.6.1, by adding the
following patches:
+ debian/patches/replace-deprecated-split.diff
+ debian/patches/proper-path-handling.diff
+ debian/patches/fix-boolean-operators.diff
* debian/octave-plplot.files: The path in /usr/lib has now an
architecture triplet
[ Andrew Ross ]
* debian/patches/replace-deprecated-split.diff:
+ Fix use of split in the test_octave.sh test script as well. This plus
previous changes by Rafael fix octave-3.6 support (closes: #666708).
---
debian/changelog | 46 ++++++
debian/control | 16 +-
debian/control.in | 16 +-
debian/octave-plplot.files | 2 +-
debian/patches/02_unset-python-path.diff | 10 +-
debian/patches/08_nn_link_libm.diff | 39 +++++
debian/patches/fix-boolean-operators.diff | 213 +++++++++++++++++++++++++++
debian/patches/proper-path-handling.diff | 17 +++
debian/patches/replace-deprecated-split.diff | 46 ++++++
debian/patches/series | 4 +
debian/rules | 29 ++--
11 files changed, 405 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f6b3635..d84f015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+plplot (5.9.9-3) unstable; urgency=low
+
+ [ Andrew Ross ]
+ * debian/control.in:
+ + Bump standards version to 3.9.3.
+ + Fix broken suggests package plplot11-tcl for libplplot11.
+ + Remove reference to ada-compiler in libplplot-ada0-dev package as per new
+ Debian Ada policy. Fixes lintian warning.
+ + Add note for fortran bindings package description that Fortran 77 support
+ is deprecated in the current upstream SVN and will be dropped in a future
+ release. New code should use the Fortran 95 bindings.
+ * debian/rules:
+ + Tidy up obsolete / unneeded code.
+ + Ensure CFLAGS, CXXFLAGS and LDFLAGS are properly exported to cmake. Add in
+ FFLAGS. -fvisibility=hidden and --as-needed should now work properly. The
+ latter fixes a lot of dpkg-shlibdeps warnings.
+ * debian/patches/series, debian/patches/08_nn_link_libm.diff: Add patch to
+ explicitly link nn library against maths library. Fixes dpkg-shlibdeps
+ warning.
+ * Rebuild python-plplot package against new version of numpy as part of the
+ numpy transition.
+
+ [ Rafael Laboissiere ]
+ * debian/control.in:
+ + Build-depend on liboctave-dev
+ + Drop build-conflict with octave3.0-headers
+ + Depend directly on octave, instead of using the substitution
+ variable ${octave:Depends}
+ * debian/rules:
+ + Set directly the Octave paths, instead of using defs.make
+ + Drop the call to octave-depends
+ * Adjust the upstream code for working with Octave 3.6.1, by adding the
+ following patches:
+ + debian/patches/replace-deprecated-split.diff
+ + debian/patches/proper-path-handling.diff
+ + debian/patches/fix-boolean-operators.diff
+ * debian/octave-plplot.files: The path in /usr/lib has now an
+ architecture triplet
+
+ [ Andrew Ross ]
+ * debian/patches/replace-deprecated-split.diff:
+ + Fix use of split in the test_octave.sh test script as well. This plus
+ previous changes by Rafael fix octave-3.6 support (closes: #666708).
+
+ -- Andrew Ross <andrewross at users.sourceforge.net> Mon, 02 Apr 2012 15:30:25 +0100
+
plplot (5.9.9-2) unstable; urgency=low
* debian/control.in: Add recommends on cmake for libplplot-dev since
diff --git a/debian/control b/debian/control
index aeb3a20..1cd6f26 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: plplot
Section: math
Priority: optional
Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.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,
+ libxi-dev, gfortran, itk3-dev, liboctave-dev,
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,
@@ -17,7 +17,7 @@ Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc-v1
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex, ghostscript
-Build-Conflicts: libplplot5, octave3.0-headers
+Build-Conflicts: libplplot5
X-Python-Version: >=2.4
Homepage: http://www.plplot.org
Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian
@@ -29,7 +29,7 @@ Section: libs
Conflicts: libplplot9
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: plplot11-driver-xwin, plplot11-driver-gd,
- plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot11-tcl
+ plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot-tcl
Replaces: plplot-bin (<< 5.9.6-1)
Breaks: plplot-bin (<<5.9.6-1)
Description: Scientific plotting library
@@ -101,7 +101,9 @@ Description: Scientific plotting library (fortran bindings)
virtually all aspects of plotting are configurable.
.
This package contains the Fortran 77 and Fortran 95 bindings for
- PLplot.
+ PLplot. Note: the Fortran 77 bindings have been deprecated in the latest
+ version of PLplot, and will be dropped from a future release. New code
+ should use the Fortran 95 bindings.
Package: libplplot-java
Architecture: any
@@ -314,7 +316,7 @@ Description: Scientific plotting library (python qt GUI)
Package: octave-plplot
Architecture: any
-Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends},
+Depends: libplplot11 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
${misc:Depends}
Description: Octave support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@ -351,7 +353,7 @@ Architecture: any
Section: libdevel
Suggests: plplot-doc
Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
- libltdl3-dev, libqsastime-dev, ada-compiler, gnat, gnat-4.6, ${misc:Depends},
+ libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends},
libplplot-ada0 (= ${binary:Version})
Recommends: libplplot-dev
Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
diff --git a/debian/control.in b/debian/control.in
index df2e703..ab9edd1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,10 +2,10 @@ Source: plplot
Section: math
Priority: optional
Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.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,
+ libxi-dev, gfortran, itk3-dev, liboctave-dev,
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,
@@ -17,7 +17,7 @@ Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc-v1
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex, ghostscript
-Build-Conflicts: libplplot5, octave3.0-headers
+Build-Conflicts: libplplot5
X-Python-Version: >=2.4
Homepage: http://www.plplot.org
Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian
@@ -29,7 +29,7 @@ Section: libs
Conflicts: libplplot9
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: plplot11-driver-xwin, plplot11-driver-gd,
- plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot11-tcl
+ plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot-tcl
Replaces: plplot-bin (<< 5.9.6-1)
Breaks: plplot-bin (<<5.9.6-1)
Description: Scientific plotting library
@@ -101,7 +101,9 @@ Description: Scientific plotting library (fortran bindings)
virtually all aspects of plotting are configurable.
.
This package contains the Fortran 77 and Fortran 95 bindings for
- PLplot.
+ PLplot. Note: the Fortran 77 bindings have been deprecated in the latest
+ version of PLplot, and will be dropped from a future release. New code
+ should use the Fortran 95 bindings.
Package: libplplot-java
Architecture: any
@@ -314,7 +316,7 @@ Description: Scientific plotting library (python qt GUI)
Package: octave-plplot
Architecture: any
-Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends},
+Depends: libplplot11 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
${misc:Depends}
Description: Octave support for PLplot, a plotting library
PLplot is relatively small, portable, freely distributable, and is rich
@@ -351,7 +353,7 @@ Architecture: any
Section: libdevel
Suggests: plplot-doc
Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
- libltdl3-dev, libqsastime-dev, ada-compiler, gnat, gnat-4.6, ${misc:Depends},
+ libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends},
libplplot-ada0 (= ${binary:Version})
Recommends: libplplot-dev
Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
diff --git a/debian/octave-plplot.files b/debian/octave-plplot.files
index 04fca69..4cbd872 100644
--- a/debian/octave-plplot.files
+++ b/debian/octave-plplot.files
@@ -1,6 +1,6 @@
usr/share/plplot_octave
usr/share/octave/site/m/PLplot
-usr/lib/octave
+usr/lib/*/octave
usr/share/doc/libplplot11/*.octave
usr/share/doc/libplplot11/examples/*octave*
usr/share/doc/octave-plplot
diff --git a/debian/patches/02_unset-python-path.diff b/debian/patches/02_unset-python-path.diff
index 6949f54..46ef870 100755
--- a/debian/patches/02_unset-python-path.diff
+++ b/debian/patches/02_unset-python-path.diff
@@ -7,12 +7,14 @@
@DPATCH@
---- plplot/examples/python/CMakeLists.txt.old
-+++ plplot/examples/python/CMakeLists.txt
-@@ -214,7 +214,7 @@
+Index: plplot-5.9.9/examples/python/CMakeLists.txt
+===================================================================
+--- plplot-5.9.9.orig/examples/python/CMakeLists.txt 2012-02-28 11:40:09.000000000 +0000
++++ plplot-5.9.9/examples/python/CMakeLists.txt 2012-02-28 11:42:31.000000000 +0000
+@@ -241,7 +241,7 @@
@ONLY
)
-
+
- set(python_location1 ${PYTHON_INSTDIR})
+ set(python_location1)
set(python_location2)
diff --git a/debian/patches/08_nn_link_libm.diff b/debian/patches/08_nn_link_libm.diff
new file mode 100644
index 0000000..d2d1e97
--- /dev/null
+++ b/debian/patches/08_nn_link_libm.diff
@@ -0,0 +1,39 @@
+#
+# Patch from upstream to ensure nn library is linked against the maths library.
+#
+Index: plplot-5.9.9/lib/nn/CMakeLists.txt
+===================================================================
+--- plplot-5.9.9.orig/lib/nn/CMakeLists.txt 2012-02-28 11:40:08.000000000 +0000
++++ plplot-5.9.9/lib/nn/CMakeLists.txt 2012-02-28 11:45:48.000000000 +0000
+@@ -38,6 +38,7 @@
+ endif(BUILD_SHARED_LIBS)
+
+ add_library(csironn ${csironn_LIB_SRCS})
++
+ set_target_properties(
+ csironn
+ PROPERTIES
+@@ -46,7 +47,22 @@
+ COMPILE_FLAGS "-I${QHULL_INCLUDE_DIRS}"
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+- target_link_libraries(csironn ${QHULL_LIBRARIES})
++
++ set(
++ csironn_LINK_LIBRARIES
++ ${csironn_LINK_LIBRARIES}
++ ${QHULL_LIBRARIES}
++ )
++
++ if(MATH_LIB)
++ set(
++ csironn_LINK_LIBRARIES
++ ${csironn_LINK_LIBRARIES}
++ ${MATH_LIB}
++ )
++ endif(MATH_LIB)
++
++ target_link_libraries(csironn ${csironn_LINK_LIBRARIES})
+ install(TARGETS csironn
+ EXPORT export_plplot
+ ARCHIVE DESTINATION ${LIB_DIR}
diff --git a/debian/patches/fix-boolean-operators.diff b/debian/patches/fix-boolean-operators.diff
new file mode 100644
index 0000000..6a1014f
--- /dev/null
+++ b/debian/patches/fix-boolean-operators.diff
@@ -0,0 +1,213 @@
+Description: Fix the short-circuit boolean operators
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-03-31
+
+--- plplot-5.9.9.orig/bindings/octave/PLplot/figure.m
++++ plplot-5.9.9/bindings/octave/PLplot/figure.m
+@@ -183,7 +183,7 @@ function [n, driver, intp]= figure (n, d
+ endif
+
+ ## the tk stuff
+- if (0 & strcmp("tk", sprintf("%s",plgdev')))
++ if (0 && strcmp("tk", sprintf("%s",plgdev')))
+ if (! exist("tk_start") && nargin == 6)
+ error("Can't use this Tk feature of PLplot until tk_octave \
+ is installed!\n")
+@@ -234,7 +234,7 @@ function [n, driver, intp]= figure (n, d
+ #pladv(0);
+ #plflush;pleop;
+
+- if ( 0 & exist("__tk_name") & (strcmp("tk", sprintf("%s",plgdev'))))
++ if ( 0 && exist("__tk_name") && (strcmp("tk", sprintf("%s",plgdev'))))
+ eval(tk_receive(1));
+ __pl.intp = __pl_matstr(__pl.intp, intp, strm); # tk interpreter name
+ unlink(init_file);
+--- plplot-5.9.9.orig/bindings/octave/PLplot/shade.m
++++ plplot-5.9.9/bindings/octave/PLplot/shade.m
+@@ -52,7 +52,7 @@ function shade(x, y, z, levels, cont )
+ levels = 2;
+ endif
+
+- if (rows(x) > 1 & columns(x) > 1 & rows(y) > 1 & columns(y) > 1)
++ if (rows(x) > 1 && columns(x) > 1 && rows(y) > 1 && columns(y) > 1)
+ xymat = 1;
+ else
+ xymat = 0;
+@@ -76,7 +76,7 @@ function shade(x, y, z, levels, cont )
+ if (__pl.axis_st(strm))
+ xm = __pl.axis(strm,1); xM = __pl.axis(strm,2);
+ if (xymat == 0)
+- ix = find(x >= xm & x <= xM);
++ ix = find(x >= xm && x <= xM);
+ x=x(ix); z=z(:,ix);
+ xmm = min(x);
+ endif
+@@ -84,7 +84,7 @@ function shade(x, y, z, levels, cont )
+ if (length(__pl.axis(strm,:)) >= 4)
+ ym = __pl.axis(strm,3); yM = __pl.axis(strm,4);
+ if (xymat == 0)
+- iy = find(y >= ym & y <= yM);
++ iy = find(y >= ym && y <= yM);
+ y=y(iy); z=z(iy,:);
+ ymm = min(y);
+ endif
+@@ -113,8 +113,8 @@ function shade(x, y, z, levels, cont )
+ ymm = ym = __pl.axis(strm,3); yM = __pl.axis(strm,4);
+ zm = __pl.axis(strm,5); zM = __pl.axis(strm,6);
+ if (xymat == 0)
+- ix = find(x >= xm & x <= xM);
+- iy = find(y >= ym & y <= yM);
++ ix = find(x >= xm && x <= xM);
++ iy = find(y >= ym && y <= yM);
+ z = z( iy, ix );
+ x = x( ix );
+ y = y( iy );
+@@ -122,10 +122,10 @@ function shade(x, y, z, levels, cont )
+ endif
+
+ maxx = max(max(x)); maxy = max(max(y)); minx = min(min(x)); miny = min(min(y));
+- if (columns(x)>1 & rows(x) == 1)
++ if (columns(x)>1 && rows(x) == 1)
+ x = x';
+ endif
+- if (columns(y)>1 & rows(y) == 1)
++ if (columns(y)>1 && rows(y) == 1)
+ y = y';
+ endif
+
+@@ -154,7 +154,7 @@ function shade(x, y, z, levels, cont )
+ cont_color, cont_width, max_color, max_width, 1, x, y);
+ endfor
+ else
+- if (columns(x) == 1 & columns(y) == 1)
++ if (columns(x) == 1 && columns(y) == 1)
+ plshades1(z', minx, maxx, miny, maxy,
+ clevel', 1, cont_color, cont_width, 1, x, y);
+ else
+--- plplot-5.9.9.orig/bindings/octave/PLplot/plot3.m
++++ plplot-5.9.9/bindings/octave/PLplot/plot3.m
+@@ -32,11 +32,11 @@ function plot3 (x, y, z, fmt)
+ global __pl
+ strm = __pl_init;
+
+- if (nargin != 4 & nargin != 3)
++ if (nargin != 4 && nargin != 3)
+ error("plot3: not yet.\n");
+ endif
+
+- if (isvector(x) & isvector(y) & isvector(y))
++ if (isvector(x) && isvector(y) && isvector(y))
+
+ if (nargin == 3)
+ fmt = "-r";
+@@ -44,7 +44,7 @@ function plot3 (x, y, z, fmt)
+
+ __pl_plot3(x, y, z, fmt);
+
+- elseif (ismatrix(x) & ismatrix(y) & ismatrix(z))
++ elseif (ismatrix(x) && ismatrix(y) && ismatrix(z))
+
+ if (!common_size(x,y,z))
+
+--- plplot-5.9.9.orig/bindings/octave/PLplot/fill.m
++++ plplot-5.9.9/bindings/octave/PLplot/fill.m
+@@ -45,10 +45,10 @@ function fill(x, y, c)
+ error("fill: not yet.\n");
+ endif
+
+- if (isvector(x) & isvector(y))
++ if (isvector(x) && isvector(y))
+ __pl_fill(x, y, c);
+
+- elseif (ismatrix(x) | ismatrix(y))
++ elseif (ismatrix(x) || ismatrix(y))
+
+ if (rows(x) == rows(y))
+ if (isvector(x))
+--- plplot-5.9.9.orig/bindings/octave/PLplot/save_fig.m
++++ plplot-5.9.9/bindings/octave/PLplot/save_fig.m
+@@ -88,7 +88,7 @@ function save_fig(file, device, rev)
+
+ device = dev;
+
+- if (nargin >= 1 && ischar(device) & ischar(file))
++ if (nargin >= 1 && ischar(device) && ischar(file))
+
+ to_prt = 0;
+ if (strcmp(file,"|lp")) # special output file, printer!
+@@ -97,7 +97,7 @@ function save_fig(file, device, rev)
+ fclose(fp);
+ elseif (file(1) == '~')
+ file = tilde_expand(file);
+- elseif (exist("FIGDIR") & file(1) != '/' & file(1) != '.')
++ elseif (exist("FIGDIR") && file(1) != '/' && file(1) != '.')
+ file = [FIGDIR, '/', file];
+ endif
+
+--- plplot-5.9.9.orig/bindings/octave/PLplot/support/__pl_logplotit.m
++++ plplot-5.9.9/bindings/octave/PLplot/support/__pl_logplotit.m
+@@ -39,7 +39,7 @@ function __pl_logplotit
+ endif
+ elseif (__pl.type(strm) == 30)
+ if (any(y <= 0) || any(x <= 0))
+- expr = "ix = find(y > 0 & x > 0);";
++ expr = "ix = find(y > 0 && x > 0);";
+ else
+ break;
+ endif
+--- plplot-5.9.9.orig/bindings/octave/PLplot/support/__pl_fill.m
++++ plplot-5.9.9/bindings/octave/PLplot/support/__pl_fill.m
+@@ -31,7 +31,7 @@ function __pl_fill(x, y, c)
+
+ strm = plgstrm+1;
+
+- if (isvector(x) & isvector(y))
++ if (isvector(x) && isvector(y))
+ if (columns(x) != 1)
+ x = x';
+ y = y';
+@@ -55,7 +55,7 @@ function __pl_fill(x, y, c)
+ __pl_plenv(min(x), max(x), min(y), max(y), 0, -1);
+ endif
+
+- if (ischar(c) & length(c) == 1)
++ if (ischar(c) && length(c) == 1)
+ ## map to plplot color
+ coln = ['r','g','b','c','m','y','w','k'];
+ coli = [2, 4, 10, 12, 14, 3, 16, 1];
+@@ -67,11 +67,11 @@ function __pl_fill(x, y, c)
+ else
+ plcol1(c);
+ endif
+- elseif (isvector(c) & length(c) == 3)
++ elseif (isvector(c) && length(c) == 3)
+ ## FIXME -- color 15 became permanently set!
+ plscol0(15, c(1), c(2), c(3));
+ plcol0(15);
+- elseif (isvector(c) & length(x) == length(x))
++ elseif (isvector(c) && length(x) == length(x))
+
+ ## If C is a vector the same length as X and Y, its elements are
+ ## scaled by CAXIS and used as indices into the current COLORMAP to
+--- plplot-5.9.9.orig/bindings/octave/PLplot/support/__pl_plot3.m
++++ plplot-5.9.9/bindings/octave/PLplot/support/__pl_plot3.m
+@@ -20,7 +20,7 @@ function __pl_plot3(x, y, z, c)
+
+ strm = plgstrm+1;
+
+- if (isvector(x) & isvector(y) & isvector(z))
++ if (isvector(x) && isvector(y) && isvector(z))
+
+ if (columns(x) != 1)
+ x = x';
+--- plplot-5.9.9.orig/bindings/octave/PLplot/support/__pl_matstr.m
++++ plplot-5.9.9/bindings/octave/PLplot/support/__pl_matstr.m
+@@ -20,7 +20,7 @@
+ function out = __pl_matstr(mat, str, n)
+
+ ## Octave damned string arrays are defective!
+- if (ischar(str) & ischar(mat) & rows(str) == 1)
++ if (ischar(str) && ischar(mat) && rows(str) == 1)
+ if (isempty(mat))
+ out(n,:) = str;
+ else
diff --git a/debian/patches/proper-path-handling.diff b/debian/patches/proper-path-handling.diff
new file mode 100644
index 0000000..943ff78
--- /dev/null
+++ b/debian/patches/proper-path-handling.diff
@@ -0,0 +1,17 @@
+Description: Proper use of the rmpath function
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-03-31
+
+--- plplot-5.9.9.orig/bindings/octave/PLplot/toggle_plplot_use.m
++++ plplot-5.9.9/bindings/octave/PLplot/toggle_plplot_use.m
+@@ -34,9 +34,7 @@ endif
+ use_plplot_path = plplot_octave_path;
+ plplot_path_to_remove = strsplit(genpath(use_plplot_path),pathsep);
+ for use_plplot_i=1:size(plplot_path_to_remove)(1)
+- if (findstr(path,deblank(plplot_path_to_remove(use_plplot_i,:))) > 0)
+- rmpath(deblank(plplot_path_to_remove(use_plplot_i,:)));
+- endif
++ rmpath(plplot_path_to_remove{use_plplot_i});
+ endfor
+
+ if (strcmp (use_plplot_state, "on"))
diff --git a/debian/patches/replace-deprecated-split.diff b/debian/patches/replace-deprecated-split.diff
new file mode 100644
index 0000000..d9015e6
--- /dev/null
+++ b/debian/patches/replace-deprecated-split.diff
@@ -0,0 +1,46 @@
+Description: Replace the calls to the deprecated split function
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-03-31
+
+--- plplot-5.9.9.orig/bindings/octave/PLplot/figure.m
++++ plplot-5.9.9/bindings/octave/PLplot/figure.m
+@@ -49,7 +49,7 @@ function [n, driver, intp]= figure (n, d
+ global pl_automatic_replot
+
+ if (!exist("__pl") || !struct_contains (__pl,"inited"))
+- v = split(version ,'.');
++ v = char(strsplit(version ,'.'));
+ if (! ((str2num(v(1,:)) > 2) ||
+ (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 9 &&
+ str2num(v(3,:)) >= 0)))
+--- plplot-5.9.9.orig/bindings/octave/PLplot/toggle_plplot_use.m
++++ plplot-5.9.9/bindings/octave/PLplot/toggle_plplot_use.m
+@@ -32,7 +32,7 @@ else
+ endif
+
+ use_plplot_path = plplot_octave_path;
+-plplot_path_to_remove = split(genpath(use_plplot_path),pathsep);
++plplot_path_to_remove = strsplit(genpath(use_plplot_path),pathsep);
+ for use_plplot_i=1:size(plplot_path_to_remove)(1)
+ if (findstr(path,deblank(plplot_path_to_remove(use_plplot_i,:))) > 0)
+ rmpath(deblank(plplot_path_to_remove(use_plplot_i,:)));
+--- plplot-5.9.9.orig/plplot_test/test_octave.sh.in
++++ plplot-5.9.9/plplot_test/test_octave.sh.in
+@@ -45,7 +45,7 @@
+ endif
+
+ plplot_stub;
+-t = split("$options", "-");
++t = char(strsplit("$options", "-"));
+ if (t); t(1,:)=""; endif;
+ for i=1:rows(t)
+ tt = deblank (t(i,:)); len = length(tt);
+@@ -83,7 +83,7 @@
+ if (verbose_test)
+ printf("%s\n",cmd);
+ endif
+- t = split("$options", "-");
++ t = char(strsplit("$options", "-"));
+ if (t) ; t(1,:)=""; endif
+ for j=1:rows(t)
+ tt = deblank (t(j,:)); len = length(tt);
diff --git a/debian/patches/series b/debian/patches/series
index 4275c90..a6f52f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,7 @@
02_unset-python-path.diff
#04_use-mkoctfile.diff
#07_octave_prune_examples.diff
+08_nn_link_libm.diff
+replace-deprecated-split.diff
+proper-path-handling.diff
+fix-boolean-operators.diff
diff --git a/debian/rules b/debian/rules
index d0f37b3..38112cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/octave/debian/defs.make
-include /usr/share/quilt/quilt.make
+# Paths for Octave
+MDIR = $(shell octave-config --print LOCALAPIFCNFILEDIR)
+OCTDIR = $(shell octave-config --print LOCALAPIOCTFILEDIR)
+
+#include /usr/share/quilt/quilt.make
version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake)
libpkg := libplplot11
@@ -32,6 +35,8 @@ CFLAGS += -fvisibility=hidden
#Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the octave bindings.
CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
#CXXFLAGS += -fvisibility=hidden
+FFLAGS = $(shell dpkg-buildflags --get FFLAGS)
+FFLAGS += -fvisibility=hidden
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS += -Wl,--as-needed
DC = gdc-v1
@@ -92,30 +97,31 @@ config-stamp: control
mkdir $(BUILD_DIR)
(cd $(BUILD_DIR) ; \
PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
- JAVA_HOME=$(JAVA_HOME) \
- DC=$(DC) \
+ JAVA_HOME=$(JAVA_HOME) DC=$(DC) \
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) )
touch config-stamp
build-arch: build-arch-stamp
-build-arch-stamp: patch config-stamp
+build-arch-stamp: config-stamp
dh_testdir
( cd $(BUILD_DIR) ; $(MAKE) )
-( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive )
touch build-arch-stamp
build-indep: build-indep-stamp
-build-indep-stamp: patch
+build-indep-stamp:
dh_testdir
( cd $(BUILD_DIR) ; cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \
cd doc ; $(MAKE) )
touch build-indep-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp install-arch-stamp install-indep-stamp \
- config-stamp patch-stamp debian/files install-python*
+ config-stamp debian/files install-python*
rm -rf $(BUILD_DIR)
rm -rf $(debbase)/$(libpkg)
dh_clean
@@ -159,7 +165,6 @@ install-arch-stamp: build-arch-stamp
install --mode=644 examples/perl/x* examples/perl/README* \
$(debex)/perl
mv $(debex) $(debdoc)/$(libpkg)
- rm -f $(debtmp)/usr/bin/plplot-config
for i in libplplot-dev plplot-tcl plplot-tcl-dev \
plplot11-driver-gd plplot11-driver-xwin octave-plplot \
@@ -239,19 +244,15 @@ binary-arch: build-arch install-arch
dh_shlibdeps -a --no-package=octave-plplot -L $(libpkg) \
-l $(debbase)/$(libpkg)/usr/lib:$(debbase)/plplot-tcl/usr/lib
dpkg-shlibdeps -Tdebian/octave-plplot.substvars -S$(debbase)/$(libpkg)/usr/lib/*.so* -S/usr/lib/$(octver)/*.so* $(debbase)/octave-plplot/$(OCTDIR)/plplot_octave.oct
- octave-depends --package=octave-plplot
dh_installdeb -a
dh_lintian -a
dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
dh_md5sums -a
dh_builddeb -a
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary config \
- patch unpatch control
+ control
.NOTPARALLEL:
--
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