[Plplot-cvs] SF.net SVN: plplot: [8256] trunk/debian

[<and...@us...>]

Revision: 8256
          http://plplot.svn.sourceforge.net/plplot/?rev=8256&view=rev
Author:   andrewross
Date:     2008-03-05 11:53:10 -0800 (Wed, 05 Mar 2008)

Log Message:
-----------
Disable ada support in debian packges for arm architecture. gnat is 
not available on arm.

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/control
    trunk/debian/rules

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-03 07:55:29 UTC (rev 8255)
+++ trunk/debian/changelog	2008-03-05 19:53:10 UTC (rev 8256)
@@ -1,3 +1,11 @@
+plplot (5.9.0-2) unstable; urgency=low
+
+  * debian/control, debian/rules: Disable ada support for arm. The 
+    gnat compiler is not available on the arm architecture. The
+    libplplot-ada package will be empty on this architecture.
+
+ -- Andrew Ross <and...@us...>  Wed, 05 Mar 2008 19:49:02 +0000
+
 plplot (5.9.0-1) unstable; urgency=low
 
   [ Andrew Ross ]

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-03-03 07:55:29 UTC (rev 8255)
+++ trunk/debian/control	2008-03-05 19:53:10 UTC (rev 8256)
@@ -14,7 +14,7 @@
  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
+ fastjar, swig, gnat [!arm]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-03-03 07:55:29 UTC (rev 8255)
+++ trunk/debian/rules	2008-03-05 19:53:10 UTC (rev 8256)
@@ -29,13 +29,14 @@
 JAVA_HOME = /usr/lib/jvm/java-gcj
 
 PYVERS = $(shell pyversions -vr)
-# Disable java build on arm - problems with java-gcj-compat-dev at the moment
+# Disable java and ada build on arm - problems with java-gcj-compat-dev 
+# at the moment. Also gnat not available on arm.
 ifeq ($(DEB_BUILD_ARCH),arm)
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
 	-DOCTAVE_OCT_DIR=$(OCTDIR) \
 	-DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_java=OFF \
-	-DENABLE_ada=ON
+	-DENABLE_ada=OFF
 else
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.