[plplot] 42/68: Import Debian changes 5.9.0-7

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 123e35db752ffd3394e1010abbdc2bcc216661d0
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 2 15:45:20 2008 +0200

    Import Debian changes 5.9.0-7
    
    plplot (5.9.0-7) unstable; urgency=low
    
      * debian/control.in, debian/rules:
        + Build-depend on default-jdk-builddep instead of java-gcj-compat-dev
          and prevents building of the libplplot9-java package on alpha, hppa,
          and hurd-i386 (closes: #477902)
        + Prevent libplplot-ada of building on armeb and armel (closes: #478891)
---
 debian/changelog  | 14 ++++++++++++--
 debian/control    |  4 ++--
 debian/control.in |  4 ++--
 debian/rules      | 22 ++++++++--------------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bbc54b..ba50fb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plplot (5.9.0-7) unstable; urgency=low
+
+  * debian/control.in, debian/rules:
+    + Build-depend on default-jdk-builddep instead of java-gcj-compat-dev
+      and prevents building of the libplplot9-java package on alpha, hppa,
+      and hurd-i386 (closes: #477902)
+    + Prevent libplplot-ada of building on armeb and armel (closes: #478891)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 02 May 2008 15:45:20 +0200
+
 plplot (5.9.0-6) unstable; urgency=low
 
   * debian/control.in, debian/rules: Disable building of the Ada binding
@@ -288,7 +298,7 @@ plplot (5.6.1-9) unstable; urgency=low
 
 plplot (5.6.1-8) unstable; urgency=low
 
-  * debian/control, debian/rules: Do not build the libplplot9-java pacakge
+  * debian/control, debian/rules: Do not build the libplplot9-java package
     anymore, at least until the problems in building the PLplot Java
     buildings in the autobuilders is fixed (closes: #384329)
 
@@ -1336,7 +1346,7 @@ plplot (5.2.0.cvs.20030219-1) unstable; urgency=low
 plplot (5.2.0.cvs.20030218-2) unstable; urgency=low
 
   * Something was strangely broken with the inclusion of files in the
-    plplot-doc pacakge, probably related to an extraneous config.cache
+    plplot-doc package, probably related to an extraneous config.cache
     file.  Fixed now.
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 18 Feb 2003 21:37:44 +0100
diff --git a/debian/control b/debian/control
index e5b574b..c780121 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
  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 [!alpha !arm !mips !mipsel]
+ python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
+ fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel]
 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 340148a..6e6da7c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,8 +13,8 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
  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 [!alpha !arm !mips !mipsel]
+ python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
+ fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
diff --git a/debian/rules b/debian/rules
index 3f44f69..92c4823 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# -*- Makefile -*-
+# -*- gmake -*-
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # This version is for a hypothetical package that builds an
@@ -32,28 +32,22 @@ 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, mips, and mipsel.
 
-ifeq ($(DEB_BUILD_ARCH),alpha)
+ifneq (,$(findstring $(DEB_BUILD_ARCH):,alpha:arm:armeb:armel:mips:mipsel:))
 BUILD_ADA = no
+else
+BUILD_ADA = yes
 endif
 
-ifeq ($(DEB_BUILD_ARCH),arm)
-BUILD_ADA = no
+ifneq (,$(findstring $(DEB_BUILD_ARCH):,alpha:arm:hppa:hurd-i386:))
 BUILD_JAVA = no
+else
+BUILD_JAVA = yes
 endif
 
-ifeq ($(DEB_BUILD_ARCH),mips)
-BUILD_ADA = no
-endif
-
-ifeq ($(DEB_BUILD_ARCH),mipsel)
-BUILD_ADA = no
-endif
+# Configure options
 
 ifeq ($(BUILD_ADA),yes)
 ADA_OPTIONS = -DENABLE_ada=ON

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git