This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository hdf4.

commit b3c017589318b8c5b7b2f6dc484c8b5d7a66301b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Aug 8 20:48:44 2017 +0200

    Also build Java library. (closes: #871510)
---
 debian/changelog           |  2 ++
 debian/control             | 36 ++++++++++++++++++++++++++++++++++++
 debian/control.in          | 36 ++++++++++++++++++++++++++++++++++++
 debian/libhdf4-java.jlibs  |  1 +
 debian/libhdf4-jni.install |  1 +
 debian/rules               | 16 ++++++++++++++--
 6 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d472538..bf4a808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libhdf4 (4.2.13-2) UNRELEASED; urgency=medium
   * Team upload.
   * Enable SZIP support.
     (closes: #870079)
+  * Also build Java library.
+    (closes: #871510)
 
  -- Bas Couwenberg <sebas...@debian.org>  Mon, 31 Jul 2017 00:47:11 +0200
 
diff --git a/debian/control b/debian/control
index 3ba68fc..ec11ae5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,10 @@ Build-Depends: debhelper (>= 9),
                autotools-dev,
                bison,
                chrpath,
+               default-jdk-headless,
                flex,
                gfortran,
+               javahelper,
                libaec-dev,
                libjpeg-dev,
                sharutils,
@@ -128,6 +130,40 @@ 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 05d9164..39bb9e9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,8 +9,10 @@ Build-Depends: debhelper (>= 9),
                autotools-dev,
                bison,
                chrpath,
+               default-jdk-headless,
                flex,
                gfortran,
+               javahelper,
                libaec-dev,
                libjpeg-dev,
                sharutils,
@@ -128,6 +130,40 @@ Description: Hierarchical Data Format library -- 
documentation
  This package contains user guide and reference manual for HDF format
  and API
 
+Package: @PACKAGE@-java
+Architecture: any
+Section: java
+Depends: @PACKAGE@-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@-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
new file mode 100644
index 0000000..d1e3f8b
--- /dev/null
+++ b/debian/libhdf4-java.jlibs
@@ -0,0 +1 @@
+debian/tmp/usr/lib/jarhdf.jar
diff --git a/debian/libhdf4-jni.install b/debian/libhdf4-jni.install
new file mode 100644
index 0000000..7951294
--- /dev/null
+++ b/debian/libhdf4-jni.install
@@ -0,0 +1 @@
+usr/lib/*/jni
diff --git a/debian/rules b/debian/rules
index 931b38e..c2571fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,8 @@ 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_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 RELEASE := 4.2.13
 PACKAGE := libhdf4
@@ -87,6 +88,7 @@ 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)"
@@ -100,6 +102,7 @@ override_dh_auto_configure: templates
                             --enable-shared \
                             --disable-fortran \
                             --disable-netcdf \
+                            --disable-java \
                             --with-szlib=yes \
                             CC="$(CC)" CXX="$(CXX)" \
                             CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
@@ -178,11 +181,20 @@ 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 -- -v$(UPSTREAM_VERSION)
+       dh_makeshlibs -Xjni -- -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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to