The following commit has been merged in the master branch: commit e33fce35bf4e4f5fd842642231b24fc89a610972 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Mon Jul 1 12:09:49 2013 +0200
Added java support. diff --git a/debian/changelog b/debian/changelog index 0d5558d..d8d3ca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ gdal (1.10.0-0~exp3) experimental; urgency=low * Added netcdf-bin build-dep to get nc-config, as required by current config. * Fixed gdalpaths patch for version 1.10. * Fixed symbols files to manage correctly library dependencies. + * Added java support. Thanks Ezequiel Lara Gómez for initial patch. + (closes: #628022) -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 26 Jun 2013 11:19:15 +0200 diff --git a/debian/control b/debian/control index 05ffe88..9fffca6 100644 --- a/debian/control +++ b/debian/control @@ -264,3 +264,28 @@ Depends: libgdal-ruby1.8, ${misc:Depends} Description: Ruby bindings to the Geospatial Data Abstraction Library This is a dummy package which depends on current ruby version to support GDAL/OGR library binding upgrades. + +Package: libgdal-java +Section: java +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Homepage: http://map.hut.fi/doc/Geo-GDAL/html/ +Description: Java bindings to the Geospatial Data Abstraction Library + GDAL is a translator library for raster geospatial data formats. + As a library, it presents a single abstract data model to the + calling application for all supported formats. The related OGR + library (which lives within the GDAL source tree) provides + a similar capability for simple features vector data. + . + GDAL supports 40+ popular data formats, including commonly used + ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in + GIS and remote sensing software packages (ERDAS Imagine, + ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote + sensing and scientific data distribution formats such as HDF, + EOS FAST, NOAA L1B, NetCDF, FITS. + . + OGR library supports popular vector formats like ESRI Shapefile, + TIGER data, S57, MapInfo File, DGN, GML and more. + . + This package contains Java bindings for GDAL/OGR library. + diff --git a/debian/libgdal-java.install b/debian/libgdal-java.install new file mode 100644 index 0000000..ca4ff23 --- /dev/null +++ b/debian/libgdal-java.install @@ -0,0 +1,2 @@ +usr/lib/jni/* +usr/share/java/* diff --git a/debian/patches/java.opt b/debian/patches/java.opt new file mode 100644 index 0000000..d290356 --- /dev/null +++ b/debian/patches/java.opt @@ -0,0 +1,13 @@ +Index: gdal/swig/java/java.opt +=================================================================== +--- gdal.orig/swig/java/java.opt 2013-07-01 12:07:30.000000000 +0200 ++++ gdal/swig/java/java.opt 2013-07-01 12:07:50.000000000 +0200 +@@ -1,7 +1,7 @@ + # + # Java Stuff + #JAVA_HOME = "C:\Program Files\Java\jdk1.6.0_16" +-JAVA_HOME = /usr/lib/jvm/java-6-openjdk/ ++JAVA_HOME = /usr/lib/jvm/default-java/ + JAVADOC=$(JAVA_HOME)/bin/javadoc + JAVAC=$(JAVA_HOME)/bin/javac + JAVA=$(JAVA_HOME)/bin/java diff --git a/debian/patches/series b/debian/patches/series index 95e771e..e52fe93 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ mrsid-plugin symver spatialite force-ruby1.8 +java.opt diff --git a/debian/rules b/debian/rules index 769188b..2d598be 100755 --- a/debian/rules +++ b/debian/rules @@ -81,6 +81,7 @@ configure-stamp: --with-mysql \ --with-perl \ --with-ruby \ + --with-java=/usr/lib/jvm/default-java \ --with-python \ --with-odbc \ --with-ogdi \ @@ -114,6 +115,7 @@ build-stamp: configure-stamp rm -rf $(CURDIR)/swig/perl/*.c $(CURDIR)/swig/perl/*.cpp $(MAKE) -C $(CURDIR)/swig/perl generate build $(MAKE) -C $(CURDIR)/swig/ruby generate build + $(MAKE) -C $(CURDIR)/swig/java clean generate build # It needs pre-installing just after the building due to intermediate cleaning. # Apply conditionally an on-fly patch for pre 1.3.38 swig versions. @@ -138,6 +140,7 @@ clean: [ ! -f GDALmake.opt ] || $(MAKE) distclean rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs + rm -rf $(CURDIR)/swig/java/*.so $(CURDIR)/swig/java/*.o $(CURDIR)/swig/java/build/ $(CURDIR)/swig/java/*.jar $(CURDIR)/swig/java/.libs rm -rf $(CURDIR)/.libs rm -f GDALmake.opt-* rm -rf $(CURDIR)/man/man1 @@ -156,7 +159,7 @@ install: build dh_installdirs cp `ls GDALmake.opt-*|tail -1` GDALmake.opt - $(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \ + $(MAKE) install BINDINGS="perl ruby java" DESTDIR=$(CURDIR)/debian/tmp \ INST_DATA="\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)" $(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \ "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\ @@ -170,6 +173,11 @@ install: build install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/. + # java stuff + mkdir -p $(CURDIR)/debian/tmp/usr/share/java $(CURDIR)/debian/tmp/usr/lib/jni + install -o root -g root $(CURDIR)/swig/java/gdal.jar $(CURDIR)/debian/tmp/usr/share/java/. + install -o root -g root $(CURDIR)/swig/java/*jni.so* $(CURDIR)/debian/tmp/usr/lib/jni + # removing license file rm -f $(CURDIR)/debian/tmp/usr/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)/LICENSE.TXT # removing empty packlist MakeMaker files -- GDAL/OGR library and tools _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel