[hdf4] 03/05: Revert "Also build Java library. (closes: #871510)"
Bas Couwenberg
sebastic at debian.org
Fri Oct 13 09:44:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository hdf4.
commit 47d95465c70bba062bb41af4cc19127bdccd7755
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 13 11:16:50 2017 +0200
Revert "Also build Java library. (closes: #871510)"
This reverts commit b3c017589318b8c5b7b2f6dc484c8b5d7a66301b.
---
debian/control | 36 ------------------------------------
debian/control.in | 36 ------------------------------------
debian/libhdf4-java.jlibs | 1 -
debian/libhdf4-jni.install | 1 -
debian/rules | 16 ++--------------
5 files changed, 2 insertions(+), 88 deletions(-)
diff --git a/debian/control b/debian/control
index 34c4a15..6a98242 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,8 @@ Build-Depends: debhelper (>= 9),
autotools-dev,
bison,
chrpath,
- default-jdk-headless,
flex,
gfortran,
- javahelper,
libaec-dev,
libjpeg-dev,
sharutils,
@@ -128,40 +126,6 @@ Description: Hierarchical Data Format library -- documentation
This package contains user guide and reference manual for HDF format
and API
-Package: libhdf4-java
-Architecture: any
-Section: java
-Depends: libhdf4-jni,
- ${shlibs:Depends},
- ${java:Depends},
- ${misc:Depends}
-Description: Hierarchical Data Format library -- Java wrapper
- HDF is a multi-object file format for storing and transferring
- graphical and numerical data mainly used in scientific computing.
- HDF supports several different data models, including multidimensional
- arrays, raster images, and tables.
- Each defines a specific aggregate data type and provides an API for
- reading, writing, and organizing the data and metadata. New data models
- can be added by the HDF developers or users.
- .
- This package contains the Java wrapper library for HDF4.
-
-Package: libhdf4-jni
-Architecture: any
-Section: java
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Hierarchical Data Format library -- JNI library
- HDF is a multi-object file format for storing and transferring
- graphical and numerical data mainly used in scientific computing.
- HDF supports several different data models, including multidimensional
- arrays, raster images, and tables.
- Each defines a specific aggregate data type and provides an API for
- reading, writing, and organizing the data and metadata. New data models
- can be added by the HDF developers or users.
- .
- This package contains the native library used by the Java wrapper.
-
Package: hdf4-tools
Architecture: any
Depends: ${shlibs:Depends},
diff --git a/debian/control.in b/debian/control.in
index d930324..ec26e45 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,10 +9,8 @@ Build-Depends: debhelper (>= 9),
autotools-dev,
bison,
chrpath,
- default-jdk-headless,
flex,
gfortran,
- javahelper,
libaec-dev,
libjpeg-dev,
sharutils,
@@ -128,40 +126,6 @@ Description: Hierarchical Data Format library -- documentation
This package contains user guide and reference manual for HDF format
and API
-Package: @PACKAGE at -java
-Architecture: any
-Section: java
-Depends: @PACKAGE at -jni,
- ${shlibs:Depends},
- ${java:Depends},
- ${misc:Depends}
-Description: Hierarchical Data Format library -- Java wrapper
- HDF is a multi-object file format for storing and transferring
- graphical and numerical data mainly used in scientific computing.
- HDF supports several different data models, including multidimensional
- arrays, raster images, and tables.
- Each defines a specific aggregate data type and provides an API for
- reading, writing, and organizing the data and metadata. New data models
- can be added by the HDF developers or users.
- .
- This package contains the Java wrapper library for HDF4.
-
-Package: @PACKAGE at -jni
-Architecture: any
-Section: java
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Hierarchical Data Format library -- JNI library
- HDF is a multi-object file format for storing and transferring
- graphical and numerical data mainly used in scientific computing.
- HDF supports several different data models, including multidimensional
- arrays, raster images, and tables.
- Each defines a specific aggregate data type and provides an API for
- reading, writing, and organizing the data and metadata. New data models
- can be added by the HDF developers or users.
- .
- This package contains the native library used by the Java wrapper.
-
Package: hdf4-tools
Architecture: any
Depends: ${shlibs:Depends},
diff --git a/debian/libhdf4-java.jlibs b/debian/libhdf4-java.jlibs
deleted file mode 100644
index d1e3f8b..0000000
--- a/debian/libhdf4-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/jarhdf.jar
diff --git a/debian/libhdf4-jni.install b/debian/libhdf4-jni.install
deleted file mode 100644
index 7951294..0000000
--- a/debian/libhdf4-jni.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/jni
diff --git a/debian/rules b/debian/rules
index c2571fc..931b38e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,7 @@ include /usr/share/dpkg/pkg-info.mk
UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
RELEASE := 4.2.13
PACKAGE := libhdf4
@@ -88,7 +87,6 @@ override_dh_auto_configure: templates
--libdir=/usr/lib \
--enable-shared \
--enable-fortran \
- --enable-java \
--with-szlib=yes \
F77="$(F77)" CC="$(CC)" CXX="$(CXX)" \
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
@@ -102,7 +100,6 @@ override_dh_auto_configure: templates
--enable-shared \
--disable-fortran \
--disable-netcdf \
- --disable-java \
--with-szlib=yes \
CC="$(CC)" CXX="$(CXX)" \
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
@@ -181,20 +178,11 @@ override_dh_auto_install:
mv $(DESTDIR)/usr/share/man/man1/ncgen.1 $(DESTDIR)/usr/share/man/man1/ncgen-hdf.1
sed -i -e 's/ncgen/ncgen-hdf/g' $(DESTDIR)/usr/share/man/man1/ncgen-hdf.1
- # Java wrapper
- mv $(DESTDIR)/usr/lib/jarhdf-*.jar $(DESTDIR)/usr/lib/jarhdf.jar
- rm -f $(DESTDIR)/usr/lib/libhdf_java.so $(DESTDIR)/usr/lib/libhdf_java.so.?
- rm -f $(DESTDIR)/usr/lib/libhdf_java.la $(DESTDIR)/usr/lib/libhdf_java.a
- mkdir -p $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/jni
- mv $(DESTDIR)/usr/lib/libhdf_java.so.?.?.? $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/jni/libhdf_java.so
-
- jh_installlibs
-
override_dh_install:
dh_install --list-missing --sourcedir=$(DESTDIR)
override_dh_makeshlibs:
- dh_makeshlibs -Xjni -- -v$(UPSTREAM_VERSION)
+ dh_makeshlibs -- -v$(UPSTREAM_VERSION)
override_dh_shlibdeps:
dh_shlibdeps -l$(DESTDIR)/usr/lib:$(DESTDIR)/usr/lib-alt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git
More information about the Pkg-grass-devel
mailing list