r45439 - in /packages/jhdf/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Wed Dec 5 12:35:10 UTC 2012
Author: sylvestre
Date: Wed Dec 5 12:35:09 2012
New Revision: 45439
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45439
Log:
New upstream release
Modified:
packages/jhdf/trunk/debian/changelog
packages/jhdf/trunk/debian/patches/installIcons.diff
packages/jhdf/trunk/debian/patches/installPath.diff
packages/jhdf/trunk/debian/patches/jhdfobj.diff
packages/jhdf/trunk/debian/patches/manifest.diff
packages/jhdf/trunk/debian/patches/mkdir.diff
packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
packages/jhdf/trunk/debian/patches/settings_path.diff
packages/jhdf/trunk/debian/patches/source1.5.diff
packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff
packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff
packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff
packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff
Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Wed Dec 5 12:35:09 2012
@@ -1,3 +1,9 @@
+jhdf (2.9-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 05 Dec 2012 11:45:18 +0100
+
jhdf (2.8.0-6~exp1) experimental; urgency=low
[ James Page ]
Modified: packages/jhdf/trunk/debian/patches/installIcons.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installIcons.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installIcons.diff (original)
+++ packages/jhdf/trunk/debian/patches/installIcons.diff Wed Dec 5 12:35:09 2012
@@ -1,8 +1,8 @@
-Index: jhdf-2.8/Makefile.in
+Index: jhdf-2.9/Makefile.in
===================================================================
---- jhdf-2.8.orig/Makefile.in 2011-11-29 21:19:58.000000000 +0100
-+++ jhdf-2.8/Makefile.in 2011-12-01 11:12:00.998049562 +0100
-@@ -371,6 +371,14 @@
+--- jhdf-2.9.orig/Makefile.in 2012-12-05 11:46:15.000000000 +0100
++++ jhdf-2.9/Makefile.in 2012-12-05 11:46:21.000000000 +0100
+@@ -369,6 +369,14 @@
cp lib/junit.jar $(LIBDIR)
cp bin/hdfview.sh $(BINDIR)
chmod a+x $(BINDIR)/hdfview.sh
Modified: packages/jhdf/trunk/debian/patches/installPath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installPath.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installPath.diff (original)
+++ packages/jhdf/trunk/debian/patches/installPath.diff Wed Dec 5 12:35:09 2012
@@ -1,5 +1,7 @@
---- jhdf-2.8.orig/Makefile.in 2011-11-29 21:19:58.000000000 +0100
-+++ jhdf-2.8-beta/Makefile.in 2011-12-01 01:19:27.712200244 +0100
+Index: jhdf-2.9/Makefile.in
+===================================================================
+--- jhdf-2.9.orig/Makefile.in 2012-12-05 11:46:21.000000000 +0100
++++ jhdf-2.9/Makefile.in 2012-12-05 11:46:35.000000000 +0100
@@ -30,10 +30,10 @@
H5INC=@HDF5INC@
@@ -15,16 +17,7 @@
CLASS_DIR=$(TOP)/lib
CP="$(CLASSPATH):$(CLASS_DIR):. "
-@@ -267,7 +267,7 @@
- $(RM) -r *.html
-
- check-all: check check-mem-leak
--
-+
- check-mem-leak: install $(TESTPACKAGES)
- cd test/object/misc; $(MAKE) check-memory-leak;
-
-@@ -326,7 +326,7 @@
+@@ -324,7 +324,7 @@
do-install-jhdf: jhdf-packages
-mkdir -p $(LIBDIR);
@@ -33,7 +26,7 @@
@echo "Install JHI complete"
install-jhdf5:
-@@ -334,7 +334,7 @@
+@@ -332,7 +332,7 @@
do-install-jhdf5: jhdf5-packages
-mkdir -p $(LIBDIR);
@@ -42,7 +35,7 @@
@echo "Install JHI5 complete"
install-jhdfobj: ncsa.hdf.object
-@@ -346,20 +346,20 @@
+@@ -344,20 +344,20 @@
do-install-jhdf4obj: ncsa.hdf.object.h4
-mkdir -p $(LIBDIR);
@@ -69,7 +62,7 @@
$(RM) -rf $(UGDIR);
-mkdir -p $(UGDIR);
cp -R docs/hdfview/UsersGuide/* $(UGDIR);
-@@ -374,18 +374,18 @@
+@@ -380,18 +380,18 @@
@echo "Install HDFVIEW complete"
uninstall-jhi5:
Modified: packages/jhdf/trunk/debian/patches/jhdfobj.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/jhdfobj.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/jhdfobj.diff (original)
+++ packages/jhdf/trunk/debian/patches/jhdfobj.diff Wed Dec 5 12:35:09 2012
@@ -1,13 +1,13 @@
-Index: jhdf-2.8-beta/Makefile.in
+Index: jhdf-2.9/Makefile.in
===================================================================
---- jhdf-2.8-beta.orig/Makefile.in 2011-12-01 09:51:56.345917256 +0100
-+++ jhdf-2.8-beta/Makefile.in 2011-12-01 09:56:58.645925580 +0100
-@@ -339,7 +339,7 @@
+--- jhdf-2.9.orig/Makefile.in 2012-12-05 11:46:35.000000000 +0100
++++ jhdf-2.9/Makefile.in 2012-12-05 11:48:41.000000000 +0100
+@@ -337,7 +337,7 @@
install-jhdfobj: ncsa.hdf.object
-mkdir -p $(LIBDIR);
- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES)
+ $(JAR) cf $(LIBDIR)/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES)
- @if test -n "$(H4INC)" ; then $(MAKE) do-install-jhdf4obj ; fi
- @if test -n "$(H5INC)" ; then $(MAKE) do-install-jhdf5obj ; fi
+ @if test x'$(H4INC)' != x'' ; then $(MAKE) do-install-jhdf4obj ; fi
+ @if test x'$(H5INC)' != x'' ; then $(MAKE) do-install-jhdf5obj ; fi
@echo "Install HDFOBJ complete"
Modified: packages/jhdf/trunk/debian/patches/manifest.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/manifest.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/manifest.diff (original)
+++ packages/jhdf/trunk/debian/patches/manifest.diff Wed Dec 5 12:35:09 2012
@@ -1,5 +1,7 @@
---- jhdf-2.8.orig/Makefile.in 2011-12-01 01:21:33.056203696 +0100
-+++ jhdf-2.8-beta/Makefile.in 2011-12-01 01:22:15.824204873 +0100
+Index: jhdf-2.9/Makefile.in
+===================================================================
+--- jhdf-2.9.orig/Makefile.in 2012-12-05 11:48:41.000000000 +0100
++++ jhdf-2.9/Makefile.in 2012-12-05 11:48:49.000000000 +0100
@@ -183,7 +183,7 @@
$(JAR) cf $(CLASS_DIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
@@ -9,7 +11,7 @@
classes: packages
-@@ -356,7 +356,7 @@
+@@ -354,7 +354,7 @@
install-jhdfview: ncsa.hdf.view
-mkdir -p $(LIBDIR);
Modified: packages/jhdf/trunk/debian/patches/mkdir.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/mkdir.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/mkdir.diff (original)
+++ packages/jhdf/trunk/debian/patches/mkdir.diff Wed Dec 5 12:35:09 2012
@@ -1,7 +1,7 @@
-Index: jhdf-2.8-beta/configure.in
+Index: jhdf-2.9/configure.in
===================================================================
---- jhdf-2.8-beta.orig/configure.in 2011-12-01 01:13:03.948189676 +0100
-+++ jhdf-2.8-beta/configure.in 2011-12-01 01:25:28.524210180 +0100
+--- jhdf-2.9.orig/configure.in 2012-12-05 11:46:20.000000000 +0100
++++ jhdf-2.9/configure.in 2012-12-05 11:48:59.000000000 +0100
@@ -631,6 +631,7 @@
AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0)
fi
@@ -10,12 +10,3 @@
if test -z "$JH45INST" ; then
JH45INST=$ac_cv_lib_JH45INST;
fi
-@@ -638,7 +639,7 @@
- JH45INST_FOUND=0
- fi
- if test \( ! -w "$JH45INST" \); then
-- AC_MSG_ERROR( [ $JAVINST : not writable ])
-+ AC_MSG_ERROR( [ $JH45INST : not writable ])
- JH45INST_FOUND=0
- fi
- fi
Modified: packages/jhdf/trunk/debian/patches/removeDebugMessage.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/removeDebugMessage.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/removeDebugMessage.diff (original)
+++ packages/jhdf/trunk/debian/patches/removeDebugMessage.diff Wed Dec 5 12:35:09 2012
@@ -1,8 +1,8 @@
-Index: jhdf-2.7/ncsa/hdf/hdf5lib/H5.java
+Index: jhdf-2.9/ncsa/hdf/hdf5lib/H5.java
===================================================================
---- jhdf-2.7.orig/ncsa/hdf/hdf5lib/H5.java 2011-03-03 15:23:41.000000000 +0100
-+++ jhdf-2.7/ncsa/hdf/hdf5lib/H5.java 2011-03-03 15:25:20.000000000 +0100
-@@ -294,10 +294,10 @@
+--- jhdf-2.9.orig/ncsa/hdf/hdf5lib/H5.java 2012-11-13 00:11:48.000000000 +0100
++++ jhdf-2.9/ncsa/hdf/hdf5lib/H5.java 2012-12-05 11:49:38.000000000 +0100
+@@ -302,10 +302,10 @@
isLibraryLoaded = false;
}
finally {
@@ -17,7 +17,7 @@
}
}
-@@ -317,9 +317,9 @@
+@@ -325,9 +325,9 @@
isLibraryLoaded = false;
}
finally {
@@ -30,7 +30,7 @@
}
}
-@@ -344,10 +344,10 @@
+@@ -352,10 +352,10 @@
isLibraryLoaded = false;
}
finally {
Modified: packages/jhdf/trunk/debian/patches/settings_path.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/settings_path.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/settings_path.diff (original)
+++ packages/jhdf/trunk/debian/patches/settings_path.diff Wed Dec 5 12:35:09 2012
@@ -1,15 +1,15 @@
-Index: jhdf-2.8-beta/Makefile.in
+Index: jhdf-2.9/Makefile.in
===================================================================
---- jhdf-2.8-beta.orig/Makefile.in 2011-12-01 09:42:00.429900846 +0100
-+++ jhdf-2.8-beta/Makefile.in 2011-12-01 09:48:20.221911304 +0100
-@@ -291,8 +291,8 @@
+--- jhdf-2.9.orig/Makefile.in 2012-12-05 11:48:49.000000000 +0100
++++ jhdf-2.9/Makefile.in 2012-12-05 11:50:48.000000000 +0100
+@@ -289,8 +289,8 @@
+ cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; \
cp $(H5INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
- @if test -n "$(H4INC)" ; then \
- cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
-- @if test -n "$(H4INC)/../lib" ; then \
+ @if test x'$(H4INC)' != x'' ; then \
+- cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; \
- cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
-+# @if test -n "$(H4INC)/../lib" ; then \
++ cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
+# cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
- @if test -n "$(H45INC)" ; then \
+ @if test x'$(H45INC)' != x'' ; then \
cp $(CLASS_DIR)/@JAVATARG@/libjh4toh5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
@echo "Install Natives complete"
Modified: packages/jhdf/trunk/debian/patches/source1.5.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/source1.5.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/source1.5.diff (original)
+++ packages/jhdf/trunk/debian/patches/source1.5.diff Wed Dec 5 12:35:09 2012
@@ -1,7 +1,7 @@
-Index: jhdf-2.8.0/Config/Rules.mk
+Index: jhdf-2.8.0/config/Rules.mk
===================================================================
---- jhdf-2.8.0.orig/Config/Rules.mk 2011-09-29 22:08:18.000000000 +0200
-+++ jhdf-2.8.0/Config/Rules.mk 2012-02-28 21:27:52.181413614 +0100
+--- jhdf-2.8.0.orig/config/Rules.mk 2011-09-29 22:08:18.000000000 +0200
++++ jhdf-2.8.0/config/Rules.mk 2012-02-28 21:27:52.181413614 +0100
@@ -25,7 +25,7 @@
JAR_DIR=$(CLASS_DIR)
OUT_DIR=$(CLASS_DIR)/$(DIR)
Modified: packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff Wed Dec 5 12:35:09 2012
@@ -1,7 +1,7 @@
-Index: jhdf-2.8/configure.in
+Index: jhdf-2.9/configure.in
===================================================================
---- jhdf-2.8.orig/configure.in 2011-12-01 11:14:23.000000000 +0100
-+++ jhdf-2.8/configure.in 2011-12-01 11:15:40.470055606 +0100
+--- jhdf-2.9.orig/configure.in 2012-12-05 11:50:56.000000000 +0100
++++ jhdf-2.9/configure.in 2012-12-05 11:50:57.000000000 +0100
@@ -95,16 +95,16 @@
COPT="-pthread -shared"; COPTNOSHARED=;
;;
@@ -32,7 +32,7 @@
LLEXT="a";
TARGETLIB="$target"
esac
-@@ -669,17 +582,17 @@
+@@ -582,17 +582,17 @@
JAVAINC2=$JAVAINC/alpha ; JAVATARG=alpha;
;;
*aix*)
@@ -54,7 +54,7 @@
JAVAINC2=$JAVAINC/solaris ; JAVATARG=solaris;
;;
mips*-sgi-irix6*)
-@@ -752,7 +665,7 @@
+@@ -665,7 +665,7 @@
JAVAINC2=$JAVAINC/macosx;
JAVATARG=macosx;
;;
Modified: packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff Wed Dec 5 12:35:09 2012
@@ -1,5 +1,7 @@
---- jhdf-2.8-beta.orig/Makefile.in 2011-12-01 09:25:21.617873342 +0100
-+++ jhdf-2.8-beta/Makefile.in 2011-12-01 09:26:35.565875378 +0100
+Index: jhdf-2.9/Makefile.in
+===================================================================
+--- jhdf-2.9.orig/Makefile.in 2012-12-05 11:50:48.000000000 +0100
++++ jhdf-2.9/Makefile.in 2012-12-05 11:51:02.000000000 +0100
@@ -50,9 +50,9 @@
H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java ./ncsa/hdf/object/h5/Makefile.in ./ncsa/hdf/object/h5/CMakeLists.txt
@@ -21,8 +23,8 @@
+packages: jhdf-packages jhdf5-packages jhdfobj-packages jhdfview-packages
jhdf-packages:
- @if test -n "$(H4INC)" ; then $(MAKE) do-jhdf-packages; fi
-@@ -358,17 +358,17 @@
+ @if test x'$(H4INC)' != x'' ; then $(MAKE) do-jhdf-packages; fi
+@@ -356,17 +356,17 @@
-mkdir -p $(LIBDIR);
$(JAR) cfm $(LIBDIR)/jhdfview.jar debian/hdfview.manifest -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-mkdir -p $(LIBDIR)/ext
Modified: packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff Wed Dec 5 12:35:09 2012
@@ -1,6 +1,8 @@
---- jhdf-3.5.orig/native/hdflib/Makefile.in 2010-01-20 16:39:19.000000000 +0000
-+++ jhdf-2.5/native/hdflib/Makefile.in 2010-01-20 16:39:40.000000000 +0000
-@@ -56,7 +56,7 @@
+Index: jhdf-2.9/native/hdflib/Makefile.in
+===================================================================
+--- jhdf-2.9.orig/native/hdflib/Makefile.in 2012-12-05 11:50:56.000000000 +0100
++++ jhdf-2.9/native/hdflib/Makefile.in 2012-12-05 11:51:07.000000000 +0100
+@@ -61,7 +61,7 @@
libjhdf: $(OBJECTS)
-mkdir -p $(LIBDIR);
Modified: packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff?rev=45439&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff Wed Dec 5 12:35:09 2012
@@ -1,8 +1,8 @@
-Index: jhdf-2.5/native/hdf5lib/Makefile.in
+Index: jhdf-2.9/native/hdf5lib/Makefile.in
===================================================================
---- jhdf-2.5.orig/native/hdf5lib/Makefile.in 2010-01-20 22:53:24.000000000 +0000
-+++ jhdf-2.5/native/hdf5lib/Makefile.in 2010-01-20 22:54:00.000000000 +0000
-@@ -45,7 +45,7 @@
+--- jhdf-2.9.orig/native/hdf5lib/Makefile.in 2012-12-05 11:50:56.000000000 +0100
++++ jhdf-2.9/native/hdf5lib/Makefile.in 2012-12-05 11:51:05.000000000 +0100
+@@ -48,7 +48,7 @@
libjhdf5: $(OBJECTS)
-mkdir -p $(LIBDIR);
More information about the debian-science-commits
mailing list