[Plplot-cvs] SF.net SVN: plplot:[12185] trunk/debian

[<and...@us...>]

Revision: 12185
          http://plplot.svn.sourceforge.net/plplot/?rev=12185&view=rev
Author:   andrewross
Date:     2012-04-02 15:49:42 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Commit (slightly modified) patch from Rafael Laboissiere to compile Debian packages with the new octave 3.6.1 packages.

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/control
    trunk/debian/control.in
    trunk/debian/octave-plplot.files
    trunk/debian/patches/series
    trunk/debian/rules

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-02-28 11:48:16 UTC (rev 12184)
+++ trunk/debian/changelog	2012-04-02 15:49:42 UTC (rev 12185)
@@ -1,5 +1,6 @@
 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.
@@ -18,9 +19,31 @@
     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 <and...@us...>  Mon, 27 Feb 2012 21:34:46 +0000
+  [ 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 <and...@us...>  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

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2012-02-28 11:48:16 UTC (rev 12184)
+++ trunk/debian/control	2012-04-02 15:49:42 UTC (rev 12185)
@@ -5,7 +5,7 @@
 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 @@
  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
@@ -316,7 +316,7 @@
 
 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

Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in	2012-02-28 11:48:16 UTC (rev 12184)
+++ trunk/debian/control.in	2012-04-02 15:49:42 UTC (rev 12185)
@@ -5,7 +5,7 @@
 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 @@
  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
@@ -316,7 +316,7 @@
 
 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

Modified: trunk/debian/octave-plplot.files
===================================================================
--- trunk/debian/octave-plplot.files	2012-02-28 11:48:16 UTC (rev 12184)
+++ trunk/debian/octave-plplot.files	2012-04-02 15:49:42 UTC (rev 12185)
@@ -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

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2012-02-28 11:48:16 UTC (rev 12184)
+++ trunk/debian/patches/series	2012-04-02 15:49:42 UTC (rev 12185)
@@ -2,3 +2,6 @@
 #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

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2012-02-28 11:48:16 UTC (rev 12184)
+++ trunk/debian/rules	2012-04-02 15:49:42 UTC (rev 12185)
@@ -11,7 +11,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/octave/debian/defs.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)
@@ -241,7 +244,6 @@
 	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)"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.