[plplot] 40/68: Import Debian changes 5.9.0-5
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 f36ef012e9eef3c3c592ef2e6f15132e7cffbd1f
Author: Rafael Laboissiere <rafael at debian.org>
Date: Fri Mar 28 11:32:20 2008 +0100
Import Debian changes 5.9.0-5
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
---
debian/changelog | 12 +++++++++++
debian/control | 3 +--
debian/control.in | 6 +++---
debian/rules | 60 +++++++++++++++++++++++++++++++++++++++++++------------
4 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9b7ac72..930c5a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 <rafael at debian.org> Fri, 28 Mar 2008 11:32:20 +0100
+
plplot (5.9.0-4) unstable; urgency=low
* debian/control.in:
diff --git a/debian/control b/debian/control
index 7b29094..4235c8f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,7 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
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 [!alpha !arm !mips !mipsel],
- gnat-4.1 [alpha mips mipsel]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel], gnat-4.1 [alpha]
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex
Build-Conflicts: libplplot5, octave2.1-headers
diff --git a/debian/control.in b/debian/control.in
index 438fef9..426d05e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,8 +14,7 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
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 [!alpha !arm !mips !mipsel],
- gnat-4.1 [alpha mips mipsel]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel], gnat-4.1 [alpha]
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex
Build-Conflicts: libplplot5, octave2.1-headers
@@ -208,7 +207,8 @@ 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. The ada bindings are currently under development and should be
+ considered experimental.
:]
Package: plplot-doc
Architecture: all
diff --git a/debian/rules b/debian/rules
index 217d197..b4c6b0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,17 +32,38 @@ PYVERS = $(shell pyversions -vr)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+BUILD_ADA = yes
+BUILD_JAVA = yes
+
# Disable java and ada build on arm - problems with java-gcj-compat-dev
-# at the moment. Also gnat not available on arm.
+# at the moment. Also gnat not available on arm, mips, and mipsel.
+
ifeq ($(DEB_BUILD_ARCH),arm)
-ADA_OPTIONS = -DENABLE_ada=OFF
-JAVA_OPTIONS = -DENABLE_java=OFF
-else
+BUILD_ADA = no
+BUILD_JAVA = no
+endif
+
+ifeq ($(DEB_BUILD_ARCH),mips)
+BUILD_ADA = no
+endif
+
+ifeq ($(DEB_BUILD_ARCH),mipsel)
+BUILD_ADA = no
+endif
+
+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
+else
+JAVA_OPTIONS = -DENABLE_java=OFF
endif
CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
@@ -54,11 +75,20 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
BUILD_DIR = $(debbase)/build_tmp
SRC_DIR = $(shell pwd)
+
control:
-ifneq ($(DEB_BUILD_ARCH),arm)
- slice -o UNDEF+JAVA+ADA:debian/control debian/control.in
-else
+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
@@ -105,9 +135,11 @@ install-arch: install-arch-stamp install-python
--no-package=libplplot9-java --no-package=libplplot-ada
dh_movefiles --package=python-plplot
dh_movefiles --package=plplot-bin
-ifneq ($(DEB_BUILD_ARCH),arm)
- dh_movefiles --package=libplplot-ada
+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
@@ -140,14 +172,16 @@ install-arch-stamp: build-arch-stamp
ln -s $(libpkg) $(debdoc)/$$i ; \
done
-ifneq ($(DEB_BUILD_ARCH),arm)
- for i in libplplot9-java libplplot-ada ; do \
- ln -s $(libpkg) $(debdoc)/$$i ; \
- done
+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
--
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