[plplot] 39/68: Import Debian changes 5.9.0-4

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 d9af4ec41cef228ac6e1ddef57aec937f4559563
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Mon Mar 24 10:57:11 2008 +0100

    Import Debian changes 5.9.0-4
    
    plplot (5.9.0-4) unstable; urgency=low
    
      * debian/control.in:
        + Renamed from debian/control.
        + Build-depend on slice
        + Build-depend on gnat-4.1 on alpha, mips, and mipsel, since gnat-4.3,
          the default Ada compiler in Debian unstable, has issues on those
          architectures
      * debian/rules:
        + Do not issue commands related to the libplplot9-java and
          libplplot-ada packages on arm
        + Process debian/control.in through the slice command to produce a
          debian/control file with some packages excluded for some
          architectures (currently, libplplot9-java and libplplot-ada are
          excluded for arm)
---
 debian/changelog               | 18 ++++++++++++++++++
 debian/control                 |  7 ++++---
 debian/{control => control.in} | 15 ++++++++-------
 debian/libplplot-dev.files     |  1 -
 debian/rules                   | 36 +++++++++++++++++++++++-------------
 5 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2665196..9b7ac72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+plplot (5.9.0-4) unstable; urgency=low
+
+  * debian/control.in:
+    + Renamed from debian/control.
+    + Build-depend on slice
+    + Build-depend on gnat-4.1 on alpha, mips, and mipsel, since gnat-4.3,
+      the default Ada compiler in Debian unstable, has issues on those
+      architectures
+  * debian/rules:
+    + Do not issue commands related to the libplplot9-java and
+      libplplot-ada packages on arm
+    + Process debian/control.in through the slice command to produce a
+      debian/control file with some packages excluded for some
+      architectures (currently, libplplot9-java and libplplot-ada are
+      excluded for arm)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 24 Mar 2008 10:57:11 +0100
+
 plplot (5.9.0-3) unstable; urgency=low
 
   * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile
diff --git a/debian/control b/debian/control
index 4c0368d..7b29094 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,12 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
  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,
- libltdl3-dev, pkg-config, dpatch,
+ libltdl3-dev, pkg-config, dpatch, slice,
  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 [!arm !mipsel]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel],
+ gnat-4.1 [alpha mips mipsel]
 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 [!arm] , ${shlibs:Depends}
+Depends: java-gcj-compat, ${shlibs:Depends}
 Description: Scientific plotting library
  This packages contains the Java bindings for PLplot, a scientific
  plotting library.
diff --git a/debian/control b/debian/control.in
similarity index 97%
copy from debian/control
copy to debian/control.in
index 4c0368d..438fef9 100644
--- a/debian/control
+++ b/debian/control.in
@@ -10,11 +10,12 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
  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,
- libltdl3-dev, pkg-config, dpatch,
+ libltdl3-dev, pkg-config, dpatch, slice,
  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 [!arm !mipsel]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel],
+ gnat-4.1 [alpha mips mipsel]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
@@ -73,14 +74,14 @@ Description: Scientific plotting library
  This package contains the Fortran 77 and Fortran 95 bindings for
  PLplot, a scientific plotting library.
 
-Package: libplplot9-java
+[JAVA:Package: libplplot9-java
 Architecture: any
 Section: libs
-Depends: java-gcj-compat [!arm] , ${shlibs:Depends}
+Depends: java-gcj-compat, ${shlibs:Depends}
 Description: Scientific plotting library
  This packages contains the Java bindings for PLplot, a scientific
  plotting library.
-
+:]
 Package: libcsiro0
 Architecture: any
 Section: libs
@@ -201,14 +202,14 @@ Description: Octave support for PLplot, a plotting library
  library.  It provides an almost drop-in replacement for the traditional
  Gnuplot graphical interface in Octave. Examples are also provided.
 
-Package: libplplot-ada
+[ADA:Package: libplplot-ada
 Architecture: any
 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.
-
+:]
 Package: plplot-doc
 Architecture: all
 Section: doc
diff --git a/debian/libplplot-dev.files b/debian/libplplot-dev.files
index 45a60a1..d13c6ab 100644
--- a/debian/libplplot-dev.files
+++ b/debian/libplplot-dev.files
@@ -6,4 +6,3 @@ usr/lib/pkgconfig
 usr/share/doc/libplplot9/examples
 usr/share/doc/libplplot9/README.pkg-config
 usr/share/doc/libplplot-dev
-usr/share/ada
diff --git a/debian/rules b/debian/rules
index 47a2b50..217d197 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,16 +33,10 @@ PYVERS = $(shell pyversions -vr)
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 # Disable java and ada build on arm - problems with java-gcj-compat-dev
-# at the moment. Also gnat not available on arm and mipsel.
+# at the moment. Also gnat not available on arm.
 ifeq ($(DEB_BUILD_ARCH),arm)
 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
 ADA_OPTIONS = -DENABLE_ada=ON
 JAVA_OPTIONS = \
@@ -60,8 +54,15 @@ 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
+	slice -o UNDEF:debian/control debian/control.in
+endif
+
 config: config-stamp
-config-stamp:
+config-stamp: control
 	mkdir $(BUILD_DIR)
 	(cd $(BUILD_DIR) ; \
 	PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
@@ -100,10 +101,17 @@ clean: unpatch
 
 install-arch: install-arch-stamp install-python
 	dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
-		     --no-package=plplot-bin --no-package=python-plplot
+		     --no-package=plplot-bin --no-package=python-plplot   \
+		     --no-package=libplplot9-java --no-package=libplplot-ada
 	dh_movefiles --package=python-plplot
-	dh_movefiles --package=libplplot-dev
 	dh_movefiles --package=plplot-bin
+ifneq ($(DEB_BUILD_ARCH),arm)
+	dh_movefiles --package=libplplot-ada
+	dh_movefiles --package=libplplot9-java
+	dh_movefiles --package=libplplot-dev usr/share/ada
+else
+	dh_movefiles --package=libplplot-dev
+endif
 	dh_movefiles --package=$(libpkg)
 
 install-arch-stamp: build-arch-stamp
@@ -128,12 +136,14 @@ install-arch-stamp: build-arch-stamp
 		plplot9-driver-gd plplot9-driver-xwin octave-plplot	\
 		python-plplot plplot-bin libplplot-c++9c2 		\
 		plplot9-driver-gnome2 plplot9-driver-wxwidgets		\
-		plplot9-driver-cairo libplplot-fortran9			\
-		libplplot9-java libplplot-ada; do			\
+		plplot9-driver-cairo libplplot-fortran9	; do		\
 	  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
 	mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar
 	( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
 endif
@@ -207,4 +217,4 @@ source diff:
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary config \
-        patch unpatch
+        patch unpatch control

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