Author: malat-guest
Date: 2011-09-12 15:35:43 +0000 (Mon, 12 Sep 2011)
New Revision: 7768
Modified:
trunk/packages/netcdf-java/trunk/debian/control
trunk/packages/netcdf-java/trunk/debian/get-orig-source
trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch
trunk/packages/netcdf-java/trunk/debian/patches/series
Log:
fix patch + tweaks
Modified: trunk/packages/netcdf-java/trunk/debian/control
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/control 2011-09-12 15:14:22 UTC (rev 7767)
+++ trunk/packages/netcdf-java/trunk/debian/control 2011-09-12 15:35:43 UTC (rev 7768)
@@ -1,34 +1,24 @@
-Source: jai-core
+Source: netcdf-java
Priority: optional
-Section: non-free/java
+Section: java
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: debhelper (>= 8), javahelper (>=0.25)
-Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjdom1-java, libslf4j-java, libcommons-httpclient-java, libdb-je-java, libehcache-java, libprotobuf-java, libquartz-java
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjdom1-java,
+ libslf4j-java, libcommons-httpclient-java, libdb-je-java, libehcache-java,
+ libprotobuf-java, libquartz-java
Standards-Version: 3.9.2
-Homepage: http://java.net/projects/jai-core/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/jai-core/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/jai-core/trunk/
+Homepage: http://www.unidata.ucar.edu/software/netcdf-java/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/netcdf-java/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/netcdf-java/trunk/
-Package: libjai-core-java
-Architecture: i386 amd64
-Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${java:Recommends}
-Description: Java Advanced Imaging API reference implementation
- This project contains the source code for the core Java Advanced Imaging API
- reference implementation containing the packages javax.media.jai.* and
- com.sun.media.jai.*.
-
-Package: libjai-core-java-doc
-Section: non-free/doc
+Package: libnetcdf-java
Architecture: all
Depends: ${java:Depends}, ${misc:Depends}
Recommends: ${java:Recommends}
-Description: Java Advanced Imaging API reference implementation (documentation)
+Description: Java Advanced Imaging API reference implementation
This project contains the source code for the core Java Advanced Imaging API
reference implementation containing the packages javax.media.jai.* and
com.sun.media.jai.*.
- .
- This package provides the documentation for the library
Modified: trunk/packages/netcdf-java/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/get-orig-source 2011-09-12 15:14:22 UTC (rev 7767)
+++ trunk/packages/netcdf-java/trunk/debian/get-orig-source 2011-09-12 15:35:43 UTC (rev 7768)
@@ -23,6 +23,8 @@
FOLDER=${PACKAGE}-${VERSION}
+# http://www.unidata.ucar.edu/software/netcdf-java/
+# http://www.unidata.ucar.edu/downloads/netcdf/netcdf-java-4/index.jsp
wget -c ftp://ftp.unidata.ucar.edu/pub/netcdf-java/v4.2/ncSrc-4.2.zip
unzip ncSrc-4.2.zip -d ${FOLDER}
# remove jars:
Modified: trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch 2011-09-12 15:14:22 UTC (rev 7767)
+++ trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch 2011-09-12 15:35:43 UTC (rev 7768)
@@ -1,31 +1,8 @@
[javac] cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java:572: unreported exception com.sleepycat.je.DatabaseException; must be caught or declared to be thrown
-Index: netcdf-java-4.2/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java
-===================================================================
---- netcdf-java-4.2.orig/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java 2011-09-12 16:39:09.000000000 +0200
-+++ netcdf-java-4.2/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java 2011-09-12 16:41:05.000000000 +0200
-@@ -157,6 +157,8 @@
- double olderThanV = tu.getValueInSeconds();
- filters.add( new LastModifiedLimit((long) (1000 * olderThanV)));
- return olderThanV;
-+ } catch (com.sleepycat.je.DatabaseException e) {
-+ logger.error(collectionName + ": Invalid time unit for olderThan = {}", olderThan);
- } catch (Exception e) {
- logger.error(collectionName + ": Invalid time unit for olderThan = {}", olderThan);
- }
-@@ -570,6 +572,9 @@
- if (collectionName == null) return; // eg no scan in ncml
- try {
- mm = new MetadataManager(collectionName);
-+ } catch (com.sleepycat.je.DatabaseException e) {
-+ e.printStackTrace();
-+ throw new RuntimeException(e.getMessage());
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
Index: netcdf-java-4.2/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java
===================================================================
---- netcdf-java-4.2.orig/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java 2011-09-12 16:42:08.000000000 +0200
-+++ netcdf-java-4.2/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java 2011-09-12 17:07:06.000000000 +0200
+--- netcdf-java-4.2.orig/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java 2011-09-12 17:17:47.000000000 +0200
++++ netcdf-java-4.2/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java 2011-09-12 17:17:59.000000000 +0200
@@ -156,10 +156,9 @@
}
@@ -174,3 +151,15 @@
openDatabases.remove(this);
database = null;
}
+Index: netcdf-java-4.2/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java
+===================================================================
+--- netcdf-java-4.2.orig/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java 2011-09-12 17:18:57.000000000 +0200
++++ netcdf-java-4.2/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java 2011-09-12 17:20:10.000000000 +0200
+@@ -570,6 +570,7 @@
+ if (collectionName == null) return; // eg no scan in ncml
+ try {
+ mm = new MetadataManager(collectionName);
++ } catch (com.sleepycat.je.DatabaseException e) {
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
Modified: trunk/packages/netcdf-java/trunk/debian/patches/series
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/patches/series 2011-09-12 15:14:22 UTC (rev 7767)
+++ trunk/packages/netcdf-java/trunk/debian/patches/series 2011-09-12 15:35:43 UTC (rev 7768)
@@ -1,2 +1 @@
fix_exception_sleepycat.patch
-remove_jpegparam.patch