[plplot] 35/68: Import Debian changes 5.8.0-6

Ole Streicher olebole at moszumanska.debian.org
Mon Jul 10 07:38:32 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 67760367d2418235f1d708cb470edbb5cbd8f9e9
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Mon Dec 24 00:06:08 2007 +0100

    Import Debian changes 5.8.0-6
    
    plplot (5.8.0-6) unstable; urgency=low
    
      [ Andrew Ross ]
      * debian/rules, debian/control, debian/libplplot9.README.debian: Disable java
        on arm platform. Currently java-gcj-compat-dev is out of date on that
        architecture. Instead the libplplot9-java package will be empty on arm.
    
      [ Rafael Laboissiere ]
      * debian/control:
        + Force build-dependency on python-numpy to be >=1.0.4-4, because the
          previous version had the include files installed in the  wrong
          directory
        + Build-depends on octave3.0-headers instead of octave2.9-headers
      * debian/patches/01_check-for-octave2.9.dpatch: Adapted for also
        accepting Octave 3.0
      * debian/rules: Adjusted path of numpy include files, which are now in
        /usr/include/numpy
---
 debian/changelog                             | 20 ++++++++++++++++++++
 debian/control                               |  7 ++++---
 debian/libplplot9.README.Debian              |  3 ++-
 debian/patches/01_check-for-octave2.9.dpatch |  8 ++++----
 debian/rules                                 | 12 +++++++++++-
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 144864c..4b51ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+plplot (5.8.0-6) unstable; urgency=low
+
+  [ Andrew Ross ]
+  * debian/rules, debian/control, debian/libplplot9.README.debian: Disable java
+    on arm platform. Currently java-gcj-compat-dev is out of date on that
+    architecture. Instead the libplplot9-java package will be empty on arm.
+
+  [ Rafael Laboissiere ]
+  * debian/control:
+    + Force build-dependency on python-numpy to be >=1.0.4-4, because the
+      previous version had the include files installed in the  wrong
+      directory
+    + Build-depends on octave3.0-headers instead of octave2.9-headers
+  * debian/patches/01_check-for-octave2.9.dpatch: Adapted for also
+    accepting Octave 3.0
+  * debian/rules: Adjusted path of numpy include files, which are now in
+    /usr/include/numpy
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 24 Dec 2007 00:06:08 +0100
+
 plplot (5.8.0-5) unstable; urgency=low
 
   [ Andrew Ross ]
diff --git a/debian/control b/debian/control
index 53288a8..aaa9a3b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.7.3
 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
  tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev,
- libxi-dev, gfortran, itk3-dev, octave2.9-headers,
+ libxi-dev, gfortran, itk3-dev, octave3.0-headers,
  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,
@@ -14,7 +14,8 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
  [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k],
  python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
- python-numpy, ttf-freefont, java-gcj-compat-dev, fastjar, swig
+ python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm],
+ fastjar, swig
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
@@ -76,7 +77,7 @@ Description: Scientific plotting library
 Package: libplplot9-java
 Architecture: any
 Section: libs
-Depends: java-gcj-compat, ${shlibs:Depends}
+Depends: java-gcj-compat [!arm] , ${shlibs:Depends}
 Description: Scientific plotting library
  This packages contains the Java bindings for PLplot, a scientific
  plotting library.
diff --git a/debian/libplplot9.README.Debian b/debian/libplplot9.README.Debian
index 6ddca6b..4034dcd 100644
--- a/debian/libplplot9.README.Debian
+++ b/debian/libplplot9.README.Debian
@@ -48,7 +48,8 @@ plplot for Debian
 	the PLplot functions.
 
       * libplplot9-java: Contains the bindings for using the PLplot
-	functions from java.
+	functions from java. This package is currently empty on arm due 
+        to problems with java-gcj-compat-dev on this platform.
 
       * plplot-tcl: Modules allowing binding of the PLplot functions
         for Tcl/Tk.  Contains also the Tk driver module and some interactive
diff --git a/debian/patches/01_check-for-octave2.9.dpatch b/debian/patches/01_check-for-octave2.9.dpatch
index 3e6f4ec..3c57a08 100755
--- a/debian/patches/01_check-for-octave2.9.dpatch
+++ b/debian/patches/01_check-for-octave2.9.dpatch
@@ -1,7 +1,7 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01_check-for-octave2.9.dpatch by Rafael Laboissiere <rafael at debian.org>
 ##
-## DP: Abort toggle_plplot_use if not using Octave 2.9
+## DP: Abort toggle_plplot_use if not using Octave 2.9 or newer
 
 @DPATCH@
 
@@ -11,9 +11,9 @@
  
  1;
  
-+## Abort if not using Octave 2.9
-+if (split (version , '.') (1, 1) != '2' || split (version , '.') (2, 1) != '9')
-+  error ("This version of octave-plplot only works with Octave 2.9\n");
++## Abort if not using Octave 2.9 or newer
++if ! ((split (version , '.') (1, 1) == '2' && split (version , '.') (1, 2) == '9') || split (version , '.') (1, 1) > '2' ) 
++  error ("This version of octave-plplot only works with Octave 2.9 or newer\n");
 +endif
 +
  if ! exist ("use_plplot_state")
diff --git a/debian/rules b/debian/rules
index 9c0cdf8..08f8f49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,13 @@ debex		:= $(debshr)/plplot$(version)/examples
 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
+else
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
@@ -36,6 +43,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \
 	-DOCTAVE_OCT_DIR=$(OCTDIR) \
 	-DUSE_RPATH=OFF -DPLD_psttf=OFF
+endif
 
 BUILD_DIR = $(debbase)/build_tmp
 SRC_DIR = $(shell pwd)
@@ -113,8 +121,10 @@ install-arch-stamp: build-arch-stamp
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done
 
+ifneq ($(DEB_BUILD_ARCH),arm)
 	mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar
 	( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
+endif
 
 	touch install-arch-stamp
 
@@ -136,7 +146,7 @@ install-python: $(PYVERS:%=install-python%)
 
 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/lib/python$*/site-packages/numpy/core/include/numpy"  -DNUMERIC_INCLUDE_PATH=/usr/lib/python$*/site-packages/numpy/core/include/numpy ; \
+	  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		\
 	    ( cd bindings/$$d;				\
 	      $(MAKE) clean ;				\

-- 
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