[plplot] 38/68: Import Debian changes 5.9.0-3

[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 6d8aff64a17d9c96ed12126c3dcaadf6fb83e04c
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Mar 23 22:18:14 2008 +0100

    Import Debian changes 5.9.0-3
    
    plplot (5.9.0-3) unstable; urgency=low
    
      * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile
        fails on this architecture
      * debian/rules: Set variable DEB_BUID_ARCH using dpkg-architecture
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 debian/rules     | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fbbe413..2665196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plplot (5.9.0-3) unstable; urgency=low
+
+  * debian/control: Build-depend on g++-4.1 on arm, otherwise mkoctfile
+    fails on this architecture
+  * debian/rules: Set variable DEB_BUID_ARCH using dpkg-architecture
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 23 Mar 2008 22:18:14 +0100
+
 plplot (5.9.0-2) unstable; urgency=low
 
   [ Andrew Ross ]
diff --git a/debian/control b/debian/control
index e19ff2b..4c0368d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.7.3
-Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
+Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
  tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev,
  libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2),
  libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev,
diff --git a/debian/rules b/debian/rules
index 481a5ec..47a2b50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,9 @@ debex		:= $(debshr)/plplot$(version)/examples
 JAVA_HOME = /usr/lib/jvm/java-gcj
 
 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.
 ifeq ($(DEB_BUILD_ARCH),arm)

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