[plplot] 37/68: Import Debian changes 5.9.0-2

Ole Streicher olebole at moszumanska.debian.org
Mon Jul 10 07:38:33 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 7e3d43e3ebcbe141a61f74ce06e44fce2c755bd0
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Mar 16 23:37:46 2008 +0100

    Import Debian changes 5.9.0-2
    
    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 ]
      * 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
---
 debian/changelog                            | 16 +++++++++++++++
 debian/control                              |  4 ++--
 debian/patches/00list                       |  1 +
 debian/patches/11_minus-sign-manpage.dpatch | 22 ++++++++++++++++++++
 debian/plplot-doc.doc-base                  |  2 +-
 debian/rules                                | 31 ++++++++++++++++++-----------
 6 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d96047a..fbbe413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+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 ]
+  * 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 <rafael at debian.org>  Sun, 16 Mar 2008 23:37:46 +0100
+
 plplot (5.9.0-1) unstable; urgency=low
 
   [ Andrew Ross ]
diff --git a/debian/control b/debian/control
index f5c460a..e19ff2b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
  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, gnat
+ fastjar, swig, gnat [!arm !mipsel]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
@@ -207,7 +207,7 @@ 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.  
+ library.
 
 Package: plplot-doc
 Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
index 2e2a167..f26a952 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,3 +4,4 @@
 07_octave_prune_examples
 09_pdftex-EC-encoding
 10_print-usage-octave-3.0
+11_minus-sign-manpage
diff --git a/debian/patches/11_minus-sign-manpage.dpatch b/debian/patches/11_minus-sign-manpage.dpatch
new file mode 100644
index 0000000..3cc478e
--- /dev/null
+++ b/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 <rafael at debian.org>
+##
+## DP: Escape "-" signs that mean the "minus" character
+
+ at 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.
diff --git a/debian/plplot-doc.doc-base b/debian/plplot-doc.doc-base
index 25d9de2..a7fc29d 100644
--- a/debian/plplot-doc.doc-base
+++ b/debian/plplot-doc.doc-base
@@ -7,7 +7,7 @@ Abstract: PLplot is a library of C functions that are useful for making
  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
diff --git a/debian/rules b/debian/rules
index eabe20d..481a5ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,23 +29,30 @@ 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
+# Disable java and ada build on arm - problems with java-gcj-compat-dev
+# at the moment. Also gnat not available on arm and mipsel.
 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 \
-	-DENABLE_ada=ON
+ADA_OPTIONS = -DENABLE_ada=OFF
+JAVA_OPTIONS = -DENABLE_java=OFF
+else ifeq ($(DEB_BUILD_ARCH),mipsel)
+ADA_OPTIONS = -DENABLE_ada=OFF
+JAVA_OPTIONS = \
+	-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
+	-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
+	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
 else
-CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
-	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
+ADA_OPTIONS = -DENABLE_ada=ON
+JAVA_OPTIONS = \
 	-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
 	-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
-	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \
+	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
+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_ada=ON
-endif
+	$(ADA_OPTIONS) $(JAVA_OPTIONS)
 
 BUILD_DIR = $(debbase)/build_tmp
 SRC_DIR = $(shell pwd)
@@ -73,7 +80,7 @@ build-arch-stamp: patch config-stamp
 	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)  )

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