[plplot] 41/68: Import Debian changes 5.9.0-6

[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 27c6a8634c446eb2458b733b9ad0927875f225bc
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Thu Apr 3 11:59:36 2008 +0200

    Import Debian changes 5.9.0-6
    
    plplot (5.9.0-6) unstable; urgency=low
    
      * debian/control.in, debian/rules: Disable building of the Ada binding
        on alpha
---
 debian/changelog  | 7 +++++++
 debian/control    | 5 +++--
 debian/control.in | 6 +++---
 debian/rules      | 4 ++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 930c5a6..3bbc54b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plplot (5.9.0-6) unstable; urgency=low
+
+  * debian/control.in, debian/rules: Disable building of the Ada binding
+    on alpha
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 03 Apr 2008 11:59:36 +0200
+
 plplot (5.9.0-5) unstable; urgency=low
 
   [ Andrew Ross ]
diff --git a/debian/control b/debian/control
index 4235c8f..e5b574b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +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]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
@@ -207,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/control.in b/debian/control.in
index 426d05e..340148a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +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]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
@@ -207,8 +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. The ada bindings are currently under development and should be 
- considered experimental. 
+ 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 b4c6b0a..3f44f69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,10 @@ 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)
+BUILD_ADA = no
+endif
+
 ifeq ($(DEB_BUILD_ARCH),arm)
 BUILD_ADA = no
 BUILD_JAVA = no

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