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

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

Revision: 10654
          http://plplot.svn.sourceforge.net/plplot/?rev=10654&view=rev
Author:   andrewross
Date:     2009-12-01 07:24:53 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Update build-dependencies and rules for debian packages.

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

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-01 05:46:38 UTC (rev 10653)
+++ trunk/debian/changelog	2009-12-01 07:24:53 UTC (rev 10654)
@@ -10,6 +10,11 @@
       handle info install triggers. Fixes lintian warning.
     + Bump debian standards version to 3.8.3.
     + Fix typo in java bindings package description. (closes: #557677)
+  * debian/control.in, debian/rules:
+    + Update java to build-dep on default-jdk and runtime depend on default-jre
+      which should work for all architectures.
+    + Update ada packages so built on all architectures except armel where gnat
+      seems to be unavailable. (closes: #544187)
 
  -- Andrew Ross <and...@us...>  Wed, 23 Aug 2009 12:05:07 +0100
 

Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in	2009-12-01 05:46:38 UTC (rev 10653)
+++ trunk/debian/control.in	2009-12-01 07:24:53 UTC (rev 10654)
@@ -13,7 +13,7 @@
  libltdl3-dev, pkg-config, quilt, 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, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
+ python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
  fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
@@ -96,10 +96,10 @@
  This package contains the Fortran 77 and Fortran 95 bindings for
  PLplot.
 
-[JAVA:Package: libplplot9-java
+Package: libplplot9-java
 Architecture: any
 Section: java
-Depends: java-gcj-compat, ${shlibs:Depends}
+Depends: default-jre, ${shlibs:Depends}
 Description: Scientific plotting library (Java bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -110,7 +110,7 @@
  virtually all aspects of plotting are configurable.
  .
  This package contains the Java bindings for PLplot.
-:]
+
 Package: libcsiro0
 Architecture: any
 Section: libs

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-12-01 05:46:38 UTC (rev 10653)
+++ trunk/debian/rules	2009-12-01 07:24:53 UTC (rev 10654)
@@ -32,21 +32,14 @@
 
 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, mips, and mipsel.
+# Disable Ada build on armel - gnat not available on armel at the moment.
 
-ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:kfreebsd-amd64:))
+ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:armel:))
 BUILD_ADA = no
 else
 BUILD_ADA = yes
 endif
 
-ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:hppa:hurd-i386:))
-BUILD_JAVA = no
-else
-BUILD_JAVA = yes
-endif
-
 # Configure options
 
 ifeq ($(BUILD_ADA),yes)
@@ -55,14 +48,10 @@
 ADA_OPTIONS = -DENABLE_ada=OFF
 endif
 
-ifeq ($(BUILD_JAVA),yes)
 JAVA_OPTIONS = \
 	-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
 	-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
 	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
-else
-JAVA_OPTIONS = -DENABLE_java=OFF
-endif
 
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
@@ -76,18 +65,10 @@
 
 control:
 ifeq ($(BUILD_ADA),no)
-ifeq ($(BUILD_JAVA),no)
-	slice -o UNDEF:debian/control debian/control.in
-else
-	slice -o UNDEF+JAVA:debian/control debian/control.in
-endif
-else
-ifeq ($(BUILD_JAVA),no)
 	slice -o UNDEF+ADA:debian/control debian/control.in
 else
-	slice -o UNDEF+JAVA+ADA:debian/control debian/control.in
+	slice -o UNDEF+ADA:debian/control debian/control.in
 endif
-endif
 
 config: config-stamp
 config-stamp: control
@@ -133,9 +114,7 @@
 		     --no-package=libplplot9-java --no-package=libplplot-ada
 	dh_movefiles --package=python-plplot
 	dh_movefiles --package=plplot-bin
-ifeq ($(BUILD_JAVA),yes)
 	dh_movefiles --package=libplplot9-java
-endif
 ifeq ($(BUILD_ADA),yes)
 	dh_movefiles --package=libplplot-ada
 	dh_movefiles --package=libplplot-dev usr/share/ada
@@ -170,11 +149,9 @@
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done
 
-ifeq ($(BUILD_JAVA),yes)
 	ln -s $(libpkg) $(debdoc)/libplplot9-java
 	mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar
 	( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
-endif
 
 ifeq ($(BUILD_ADA),yes)
 	ln -s $(libpkg) $(debdoc)/libplplot-ada


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