r44082 - in /packages/jhdf/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Thu Dec 1 10:33:59 UTC 2011
Author: sylvestre
Date: Thu Dec 1 10:33:58 2011
New Revision: 44082
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44082
Log:
jhdf (2.8-beta-1) experimental; urgency=low
* New upstream release
* libjhdf-doc is now arch independent
* Really use quilt for the patches
Added:
packages/jhdf/trunk/debian/patches/jhdfobj.diff
packages/jhdf/trunk/debian/patches/series
packages/jhdf/trunk/debian/patches/settings_path.diff
Modified:
packages/jhdf/trunk/debian/changelog
packages/jhdf/trunk/debian/control
packages/jhdf/trunk/debian/patches/fpicFlag.diff
packages/jhdf/trunk/debian/patches/installIcons.diff
packages/jhdf/trunk/debian/patches/installPath.diff
packages/jhdf/trunk/debian/patches/manifest.diff
packages/jhdf/trunk/debian/patches/mkdir.diff
packages/jhdf/trunk/debian/patches/useSharedLib.diff
packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff
packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff
packages/jhdf/trunk/debian/rules
Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Thu Dec 1 10:33:58 2011
@@ -1,6 +1,8 @@
jhdf (2.8-beta-1) experimental; urgency=low
* New upstream release
+ * libjhdf-doc is now arch independent
+ * Really use quilt for the patches
-- Sylvestre Ledru <sylvestre at debian.org> Wed, 30 Nov 2011 16:59:22 +0100
@@ -13,7 +15,7 @@
jhdf (2.7-1) experimental; urgency=low
* New upstream release
- * hdfview suggests now www-browser
+ * hdfview suggests now www-browser
* Switch to dpkg-source 3.0 (quilt) format
* Standards-Version updated to version 3.9.2
* hdfview manifest added
Modified: packages/jhdf/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/control?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/control (original)
+++ packages/jhdf/trunk/debian/control Thu Dec 1 10:33:58 2011
@@ -39,7 +39,7 @@
Package: libjhdf-doc
Section: doc
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Java HDF Object Package - Documentation
HDF is a versatile data model that can represent very complex data objects
Modified: packages/jhdf/trunk/debian/patches/fpicFlag.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/fpicFlag.diff?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/fpicFlag.diff (original)
+++ packages/jhdf/trunk/debian/patches/fpicFlag.diff Thu Dec 1 10:33:58 2011
@@ -1,13 +1,13 @@
-Index: jhdf-2.5.obsolete.0.952461238092841/configure.in
+Index: jhdf-2.8/configure.in
===================================================================
---- jhdf-2.5.obsolete.0.952461238092841.orig/configure.in 2010-01-21 09:53:58.000000000 +0100
-+++ jhdf-2.5.obsolete.0.952461238092841/configure.in 2010-01-21 09:54:32.000000000 +0100
-@@ -664,7 +664,7 @@
- *) LD=$CC; LDOPT=-g; SLEXT="so";
+--- jhdf-2.8.orig/configure.in 2011-12-01 11:06:09.922039895 +0100
++++ jhdf-2.8/configure.in 2011-12-01 11:07:40.026042376 +0100
+@@ -754,7 +754,7 @@
+ *) LD=$CC; LDOPT=-G; SLEXT="so";
JSLEXT="so";
LLEXT="a";
-COPT=-shared; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
-+COPT="-shared -fPIC"; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
++COPT="-shared -fPIC"; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
esac
AC_SUBST(LD)
Modified: packages/jhdf/trunk/debian/patches/installIcons.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installIcons.diff?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installIcons.diff (original)
+++ packages/jhdf/trunk/debian/patches/installIcons.diff Thu Dec 1 10:33:58 2011
@@ -1,7 +1,9 @@
---- jhdf-2.5/Makefile.in 2010-02-19 00:02:21.000000000 +1300
-+++ jhdf-2.5_achim/Makefile.in 2010-02-19 00:00:42.000000000 +1300
-@@ -332,6 +332,14 @@
- -mkdir -p $(BINDIR);
+Index: jhdf-2.8/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 @@
+ cp lib/junit.jar $(LIBDIR)
cp bin/hdfview.sh $(BINDIR)
chmod a+x $(BINDIR)/hdfview.sh
+ for size in 16 22 24 32 48 64 96; do \
@@ -14,4 +16,4 @@
+ /usr/bin/dh_icons -phdfview
@echo "Install HDFVIEW complete"
- install-h5srb: ncsa.hdf.srb
+ uninstall-jhi5:
Modified: packages/jhdf/trunk/debian/patches/installPath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/installPath.diff?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/installPath.diff (original)
+++ packages/jhdf/trunk/debian/patches/installPath.diff Thu Dec 1 10:33:58 2011
@@ -1,6 +1,6 @@
---- hdf5.java.orig/Makefile.in 2009-02-12 15:51:58.000000000 +0100
-+++ hdf5.java/Makefile.in 2009-09-14 18:12:36.000000000 +0200
-@@ -27,10 +27,10 @@
+--- 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
+@@ -30,10 +30,10 @@
H5INC=@HDF5INC@
#make this relative to the source root...
@@ -13,58 +13,63 @@
+DOCDIR= $(JH45INSTALLDIR)/usr/share/doc/libjhdf-doc/docs
+UGDIR= $(JH45INSTALLDIR)//usr/share/doc/libjhdf-doc/UsersGuide
- HDFVIEWDISTFILES= ./ncsa/hdf/view/*.java $(HDFVIEWICONS)
+ CLASS_DIR=$(TOP)/lib
+ CP="$(CLASSPATH):$(CLASS_DIR):. "
+@@ -267,7 +267,7 @@
+ $(RM) -r *.html
-@@ -296,7 +296,7 @@
+ check-all: check check-mem-leak
+-
++
+ check-mem-leak: install $(TESTPACKAGES)
+ cd test/object/misc; $(MAKE) check-memory-leak;
+
+@@ -326,7 +326,7 @@
do-install-jhdf: jhdf-packages
-mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf.jar $(JHICLASSES)
-+ $(JAR) cf $(LIBDIR)/jhdf.jar $(JHICLASSES)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
++ $(JAR) cf $(LIBDIR)/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
@echo "Install JHI complete"
install-jhdf5:
-@@ -304,32 +304,32 @@
+@@ -334,7 +334,7 @@
do-install-jhdf5: jhdf5-packages
-mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5.jar $(JHI5CLASSES)
-+ $(JAR) cf $(LIBDIR)/jhdf5.jar $(JHI5CLASSES)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
++ $(JAR) cf $(LIBDIR)/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
@echo "Install JHI5 complete"
install-jhdfobj: ncsa.hdf.object
- -mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfobj.jar $(HDFOBJCLASSES)
-+ $(JAR) cf $(LIBDIR)/jhdfobj.jar $(HDFOBJCLASSES)
- @if test -n "$(H4INC)" ; then $(MAKE) do-install-jhdf4obj ; fi
- @if test -n "$(H5INC)" ; then $(MAKE) do-install-jhdf5obj ; fi
- @echo "Install HDFOBJ complete"
+@@ -346,20 +346,20 @@
do-install-jhdf4obj: ncsa.hdf.object.h4
-mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar $(H4OBJCLASSES)
-+ $(JAR) cf $(LIBDIR)/jhdf4obj.jar $(H4OBJCLASSES)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
++ $(JAR) cf $(LIBDIR)/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
@echo "Install JHDF4 complete"
do-install-jhdf5obj: ncsa.hdf.object.h5
-mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar $(H5OBJCLASSES)
-+ $(JAR) cf $(LIBDIR)/jhdf5obj.jar $(H5OBJCLASSES)
- @echo "Install JHDF4 complete"
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
+- @echo "Install JHDF4 complete"
++ $(JAR) cf $(LIBDIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
++ @echo "Install JHDF5 complete"
install-jhdfview: ncsa.hdf.view
-mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-+ $(JAR) cf $(LIBDIR)/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
++ $(JAR) cf $(LIBDIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-mkdir -p $(LIBDIR)/ext
-- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar $(NC2OBJCLASSES)
-- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar $(FITSOBJCLASSES)
-+ $(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
-+ $(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
++ $(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
++ $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
$(RM) -rf $(UGDIR);
-mkdir -p $(UGDIR);
cp -R docs/hdfview/UsersGuide/* $(UGDIR);
-@@ -346,18 +346,18 @@
+@@ -374,18 +374,18 @@
@echo "Install HDFVIEW complete"
uninstall-jhi5:
Added: packages/jhdf/trunk/debian/patches/jhdfobj.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/jhdfobj.diff?rev=44082&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/jhdfobj.diff (added)
+++ packages/jhdf/trunk/debian/patches/jhdfobj.diff Thu Dec 1 10:33:58 2011
@@ -1,0 +1,13 @@
+Index: jhdf-2.8-beta/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 @@
+
+ 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
+ @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=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/manifest.diff (original)
+++ packages/jhdf/trunk/debian/patches/manifest.diff Thu Dec 1 10:33:58 2011
@@ -1,22 +1,20 @@
-Index: jhdf-2.7/Makefile.in
-===================================================================
---- jhdf-2.7.orig/Makefile.in 2011-05-16 20:58:18.000000000 +0200
-+++ jhdf-2.7/Makefile.in 2011-05-16 20:59:07.000000000 +0200
-@@ -160,7 +160,7 @@
- $(JAR) cf ./lib/jhdf5obj.jar $(H5OBJCLASSES)
+--- 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
+@@ -183,7 +183,7 @@
+ $(JAR) cf $(CLASS_DIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
jhdfview-packages: $(HDFVIEWPACKAGES)
-- $(JAR) cf ./lib/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-+ $(JAR) cfm ./lib/jhdfview.jar debian/hdfview.manifest $(HDFVIEWCLASSES) $(HDFVIEWICONS)
+- $(JAR) cf $(CLASS_DIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
++ $(JAR) cfm $(CLASS_DIR)/jhdfview.jar debian/hdfview.manifest -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
classes: packages
-@@ -321,7 +321,7 @@
+@@ -356,7 +356,7 @@
install-jhdfview: ncsa.hdf.view
-mkdir -p $(LIBDIR);
-- $(JAR) cf $(LIBDIR)/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-+ $(JAR) cfm $(LIBDIR)/jhdfview.jar debian/hdfview.manifest $(HDFVIEWCLASSES) $(HDFVIEWICONS)
+- $(JAR) cf $(LIBDIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
++ $(JAR) cfm $(LIBDIR)/jhdfview.jar debian/hdfview.manifest -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-mkdir -p $(LIBDIR)/ext
- $(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
- $(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
+ $(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+ $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
Modified: packages/jhdf/trunk/debian/patches/mkdir.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/mkdir.diff?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/mkdir.diff (original)
+++ packages/jhdf/trunk/debian/patches/mkdir.diff Thu Dec 1 10:33:58 2011
@@ -1,21 +1,21 @@
---- hdf5.java.orig/configure.in 2009-02-11 16:46:31.000000000 +0100
-+++ hdf5.java/configure.in 2009-09-15 10:27:46.000000000 +0200
-@@ -626,14 +538,17 @@
+Index: jhdf-2.8-beta/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
+@@ -631,6 +631,7 @@
AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0)
fi
if test $JH45INST_FOUND -eq 1; then
-+ mkdir -p $JH45INST
- if test -z "$JH45INST" ; then
- JH45INST=$ac_cv_lib_JH45INST;
- fi
-+
- if test \( ! -d "$JH45INST" \); then
- 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
++ mkdir -p $JH45INST
+ 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
Added: packages/jhdf/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/series?rev=44082&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/series (added)
+++ packages/jhdf/trunk/debian/patches/series Thu Dec 1 10:33:58 2011
@@ -1,0 +1,14 @@
+fpicFlag.diff
+installIcons.diff
+installPath.diff
+jhdfobj.diff
+manifest.diff
+mkdir.diff
+removeDebugMessage.diff
+settings_path.diff
+useSharedLib.diff
+z_lowercase_argument.diff
+z_missing_shared_flag.diff
+z_nc2-fits-disabled.diff
+z_sharedOptMissing5.diff
+z_sharedOptMissing.diff
Added: 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=44082&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/settings_path.diff (added)
+++ packages/jhdf/trunk/debian/patches/settings_path.diff Thu Dec 1 10:33:58 2011
@@ -1,0 +1,15 @@
+Index: jhdf-2.8-beta/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 @@
+ 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 \
+- cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
++# @if test -n "$(H4INC)/../lib" ; then \
++# cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
+ @if test -n "$(H45INC)" ; then \
+ cp $(CLASS_DIR)/@JAVATARG@/libjh4toh5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
+ @echo "Install Natives complete"
Modified: packages/jhdf/trunk/debian/patches/useSharedLib.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/useSharedLib.diff?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/useSharedLib.diff (original)
+++ packages/jhdf/trunk/debian/patches/useSharedLib.diff Thu Dec 1 10:33:58 2011
@@ -1,146 +1,3 @@
-Index: jhdf-2.7.obsolete.0.647783268782408/configure.in
-===================================================================
---- jhdf-2.7.obsolete.0.647783268782408.orig/configure.in 2011-03-03 15:32:36.000000000 +0100
-+++ jhdf-2.7.obsolete.0.647783268782408/configure.in 2011-03-03 15:34:32.000000000 +0100
-@@ -165,26 +165,7 @@
- AC_SUBST(ZLIB) ZLIB=""
- AC_ARG_WITH(libz,[ --with-libz=LIB Path to the gzip library (required if not in default path)],,)
-
--case "$withval" in
-- yes)
-- ZLIB=""
-- HAVE_ZLIB="no"
-- ;;
-- no)
-- ZLIB=""
-- HAVE_ZLIB="suppressed"
-- ;;
-- *)
-- if test -n "$withval" ; then
-- z_lib="`echo $withval |cut -f2 -d, -s`"
-- ZLIB=$z_lib"/libz."$LLEXT
-- HAVE_ZLIB="yes"
-- else
-- ZLIB=""
-- HAVE_ZLIB="no"
-- fi
--;;
--esac
-+ZLIB=" -lz "
- if test -n "$ZLIB"; then
- LIBS="$LIBS $ZLIB"
- HAVE_ZLIB="yes"
-@@ -200,25 +181,7 @@
- AC_SUBST(JPEGLIB) JPEGLIB=""
- AC_ARG_WITH(libjpeg,[ --with-libjpeg=LIB Path to the jpeg library (required if not in default path)],,)
-
--case "$withval" in
-- yes)
-- HAVE_JPEG="no"
-- ;;
-- no)
-- JPEGLIB=""
-- HAVE_JPEG="suppressed"
-- ;;
-- *)
-- if test -n "$withval" ; then
-- jpeg_lib="`echo $withval |cut -f2 -d, -s`"
-- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
-- dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]);
-- HAVE_JPEG="yes"
-- else
-- HAVE_JPEG="no"
-- fi
--;;
--esac
-+JPEGLIB=" -ljpeg"
- if test -n "$JPEGLIB"; then
- LIBS="$LIBS $JPEGLIB"
- HAVE_JPEG="yes"
-@@ -274,33 +237,11 @@
- AC_SUBST(HDF4LIB) HDF4LIB=""
- AC_ARG_WITH(hdf4,[ --with-hdf4=LIB Path to the hdf library (required if not in default path)],,)
-
--case "$withval" in
-- yes)
-- dnl AC_MSG_ERROR(HDF4 library needed for compilation.)
-- HDF4LIB=""
-- HAVE_HDF4="no"
-- ;;
-- no)
-- HDF4LIB=""
-- HAVE_HDF4="suppressed"
-- ;;
-- *)
-- if test -n "$withval" ; then
-- hdf4_inc="`echo $withval |cut -f1 -d,`"
-- if test -n "$hdf4_inc"; then
-- HDF4INC="$hdf4_inc"
-- fi
-- hdf4_lib="`echo $withval |cut -f2 -d, -s`"
-- if test -n "$hdf4_lib"; then
-- HDF4LIB=$hdf4_lib
-- fi
-- HAVE_HDF4="yes"
-- else
-- HDF4LIB=""
-- HAVE_HDF4="no"
-- fi
-- ;;
--esac
-+HDF4LIB=" -lmfhdf -ldf "
-+LIBS=" -lmfhdf -ldf $LIBS"
-+HDF4INC="/usr/include/hdf/"
-+HAVE_HDF4="yes"
-+
- if test -n "$HDF4LIB"; then
- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
- HAVE_HDF4="yes"
-@@ -351,38 +292,12 @@
- AC_SUBST(HDF5LIB) HDF5LIB=""
- AC_ARG_WITH(hdf5,[ --with-hdf5=LIB Path to the hdf5 library (required if not in default path)],,)
-
--case "$withval" in
-- yes)
-- HDF5LIB=""
-- HAVE_HDF5="no"
-- ;;
-- no)
-- HDF5LIB=""
-- HAVE_HDF5="suppressed"
-- ;;
-- *)
-- if test -n "$withval" ; then
-- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
-- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
-- hdf5_inc="`echo $withval |cut -f1 -d,`"
-- if test -n "$hdf5_inc"; then
-- HDF5INC="$hdf5_inc"
-- fi
-- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
-- if test -n "$hdf5_lib"; then
-- HDF5LIB=$hdf5_lib
-- fi
-- HAVE_HDF5="yes"
-- else
-- HDF5LIB=""
-- HAVE_HDF5="no"
-- fi
-- ;;
--esac
--if test -n "$HDF5LIB"; then
-- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
-- HAVE_HDF5="yes"
--fi
-+HDF5LIB=" -lhdf5 "
-+LIBS=" -lhdf5 $LIBS"
-+HDF5INC="/usr/include/"
-+HAVE_HDF5="yes"
-+
-+
- AC_MSG_RESULT([$HAVE_HDF5])
- if test $HAVE_HDF5 = "yes"; then
- AC_MSG_RESULT([HDF5 found: $HDF5LIB]);
Index: jhdf-2.7.obsolete.0.647783268782408/native/hdf5lib/Makefile.in
===================================================================
--- jhdf-2.7.obsolete.0.647783268782408.orig/native/hdf5lib/Makefile.in 2011-03-03 15:35:23.000000000 +0100
@@ -169,3 +26,142 @@
# Macro def: object filename used
OBJECTS = hdfstructsutil.o \
+--- jhdf-2.8.orig/configure.in 2011-11-29 21:19:58.000000000 +0100
++++ jhdf-2.8-beta/configure.in 2011-12-01 01:29:38.584217066 +0100
+@@ -165,26 +165,7 @@
+ AC_SUBST(ZLIB) ZLIB=""
+ AC_ARG_WITH(libz,[ --with-libz=LIB Path to the gzip library (required if not in default path)],,)
+
+-case "$withval" in
+- yes)
+- ZLIB=""
+- HAVE_ZLIB="no"
+- ;;
+- no)
+- ZLIB=""
+- HAVE_ZLIB="suppressed"
+- ;;
+- *)
+- if test -n "$withval" ; then
+- z_lib="`echo $withval |cut -f2 -d, -s`"
+- ZLIB=$z_lib"/libz."$LLEXT
+- HAVE_ZLIB="yes"
+- else
+- ZLIB=""
+- HAVE_ZLIB="no"
+- fi
+-;;
+-esac
++ZLIB=" -lz "
+ if test -n "$ZLIB"; then
+ LIBS="$LIBS $ZLIB"
+ HAVE_ZLIB="yes"
+@@ -200,25 +181,7 @@
+ AC_SUBST(JPEGLIB) JPEGLIB=""
+ AC_ARG_WITH(libjpeg,[ --with-libjpeg=LIB Path to the jpeg library (required if not in default path)],,)
+
+-case "$withval" in
+- yes)
+- HAVE_JPEG="no"
+- ;;
+- no)
+- JPEGLIB=""
+- HAVE_JPEG="suppressed"
+- ;;
+- *)
+- if test -n "$withval" ; then
+- jpeg_lib="`echo $withval |cut -f2 -d, -s`"
+- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
+- dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]);
+- HAVE_JPEG="yes"
+- else
+- HAVE_JPEG="no"
+- fi
+-;;
+-esac
++JPEGLIB=" -ljpeg"
+ if test -n "$JPEGLIB"; then
+ LIBS="$LIBS $JPEGLIB"
+ HAVE_JPEG="yes"
+@@ -274,33 +237,10 @@
+ AC_SUBST(HDF4LIB) HDF4LIB=""
+ AC_ARG_WITH(hdf4,[ --with-hdf4=LIB Path to the hdf library (required if not in default path)],,)
+
+-case "$withval" in
+- yes)
+- dnl AC_MSG_ERROR(HDF4 library needed for compilation.)
+- HDF4LIB=""
+- HAVE_HDF4="no"
+- ;;
+- no)
+- HDF4LIB=""
+- HAVE_HDF4="suppressed"
+- ;;
+- *)
+- if test -n "$withval" ; then
+- hdf4_inc="`echo $withval |cut -f1 -d,`"
+- if test -n "$hdf4_inc"; then
+- HDF4INC="$hdf4_inc"
+- fi
+- hdf4_lib="`echo $withval |cut -f2 -d, -s`"
+- if test -n "$hdf4_lib"; then
+- HDF4LIB=$hdf4_lib
+- fi
+- HAVE_HDF4="yes"
+- else
+- HDF4LIB=""
+- HAVE_HDF4="no"
+- fi
+- ;;
+-esac
++HDF4LIB=" -lmfhdf -ldf "
++LIBS=" -lmfhdf -ldf $LIBS"
++HDF4INC="/usr/include/hdf/"
++HAVE_HDF4="yes"
+ if test -n "$HDF4LIB"; then
+ LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
+ HAVE_HDF4="yes"
+@@ -351,38 +291,11 @@
+ AC_SUBST(HDF5LIB) HDF5LIB=""
+ AC_ARG_WITH(hdf5,[ --with-hdf5=LIB Path to the hdf5 library (required if not in default path)],,)
+
+-case "$withval" in
+- yes)
+- HDF5LIB=""
+- HAVE_HDF5="no"
+- ;;
+- no)
+- HDF5LIB=""
+- HAVE_HDF5="suppressed"
+- ;;
+- *)
+- if test -n "$withval" ; then
+- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
+- hdf5_inc="`echo $withval |cut -f1 -d,`"
+- if test -n "$hdf5_inc"; then
+- HDF5INC="$hdf5_inc"
+- fi
+- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+- if test -n "$hdf5_lib"; then
+- HDF5LIB=$hdf5_lib
+- fi
+- HAVE_HDF5="yes"
+- else
+- HDF5LIB=""
+- HAVE_HDF5="no"
+- fi
+- ;;
+-esac
+-if test -n "$HDF5LIB"; then
+- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
+- HAVE_HDF5="yes"
+-fi
++HDF5LIB=" -lhdf5 "
++LIBS=" -lhdf5 $LIBS"
++HDF5INC="/usr/include/"
++HAVE_HDF5="yes"
++
+ AC_MSG_RESULT([$HAVE_HDF5])
+ if test $HAVE_HDF5 = "yes"; then
+ AC_MSG_RESULT([HDF5 found: $HDF5LIB]);
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=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_lowercase_argument.diff Thu Dec 1 10:33:58 2011
@@ -1,5 +1,7 @@
---- jhdf-2.5.orig/configure.in 2009-10-12 09:58:47.000000000 +0200
-+++ jhdf-2.5/configure.in 2009-10-12 09:59:32.000000000 +0200
+Index: jhdf-2.8/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
@@ -95,16 +95,16 @@
COPT="-pthread -shared"; COPTNOSHARED=;
;;
@@ -30,7 +32,7 @@
LLEXT="a";
TARGETLIB="$target"
esac
-@@ -663,17 +663,17 @@
+@@ -669,17 +582,17 @@
JAVAINC2=$JAVAINC/alpha ; JAVATARG=alpha;
;;
*aix*)
@@ -52,7 +54,7 @@
JAVAINC2=$JAVAINC/solaris ; JAVATARG=solaris;
;;
mips*-sgi-irix6*)
-@@ -746,7 +746,7 @@
+@@ -752,7 +665,7 @@
JAVAINC2=$JAVAINC/macosx;
JAVATARG=macosx;
;;
@@ -60,4 +62,4 @@
+*) LD=$CC; LDOPT=-g; SLEXT="so";
JSLEXT="so";
LLEXT="a";
- COPT=-shared; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
+ COPT="-shared -fPIC"; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
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=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff (original)
+++ packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff Thu Dec 1 10:33:58 2011
@@ -1,21 +1,19 @@
-Index: jhdf-2.6/Makefile.in
-===================================================================
---- jhdf-2.6.orig/Makefile.in 2010-01-23 21:27:55.000000000 +0100
-+++ jhdf-2.6/Makefile.in 2010-01-23 21:29:40.000000000 +0100
-@@ -40,9 +40,9 @@
+--- 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
+@@ -50,9 +50,9 @@
- H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java
+ H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java ./ncsa/hdf/object/h5/Makefile.in ./ncsa/hdf/object/h5/CMakeLists.txt
--FITSDISTJARFILE = ./lib/fits.jar
--NC2SDISTJARFILE = ./lib/netcdf.jar
--JUNITSDISTJARFILE = ./lib/junit.jar
-+#FITSDISTJARFILE = ./lib/fits.jar
-+#NC2SDISTJARFILE = ./lib/netcdf.jar
-+#JUNITSDISTJARFILE = ./lib/junit.jar
+-FITSDISTJARFILE = $(CLASS_DIR)/fits.jar
+-NC2SDISTJARFILE = $(CLASS_DIR)/netcdf.jar
+-JUNITSDISTJARFILE = $(CLASS_DIR)/junit.jar
++#FITSDISTJARFILE = $(CLASS_DIR)/fits.jar
++#NC2SDISTJARFILE = $(CLASS_DIR)/netcdf.jar
++#JUNITSDISTJARFILE = $(CLASS_DIR)/junit.jar
- NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./lib/netcdf.jar
+ NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./ncsa/hdf/object/nc2/Makefile.in ./ncsa/hdf/object/nc2/CMakeLists.txt $(CLASS_DIR)/netcdf.jar
-@@ -120,7 +120,7 @@
+@@ -152,7 +152,7 @@
install-just-hdf5: install-hdf5lib install-jhdf5
@@ -24,14 +22,14 @@
jhdf-packages:
@if test -n "$(H4INC)" ; then $(MAKE) do-jhdf-packages; fi
-@@ -330,17 +330,17 @@
+@@ -358,17 +358,17 @@
-mkdir -p $(LIBDIR);
- $(JAR) cf $(LIBDIR)/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
+ $(JAR) cfm $(LIBDIR)/jhdfview.jar debian/hdfview.manifest -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-mkdir -p $(LIBDIR)/ext
-- $(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
-- $(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
-+# $(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
-+# $(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
+- $(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+- $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
++# $(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
++# $(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
$(RM) -rf $(UGDIR);
-mkdir -p $(UGDIR);
cp -R docs/hdfview/UsersGuide/* $(UGDIR);
@@ -46,4 +44,4 @@
+# cp lib/junit.jar $(LIBDIR)
cp bin/hdfview.sh $(BINDIR)
chmod a+x $(BINDIR)/hdfview.sh
- @echo "Install HDFVIEW complete"
+ for size in 16 22 24 32 48 64 96; do \
Modified: packages/jhdf/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/rules?rev=44082&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/rules (original)
+++ packages/jhdf/trunk/debian/rules Thu Dec 1 10:33:58 2011
@@ -3,7 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
debian/stamp-autotools-files:
autoreconf -v -i
More information about the debian-science-commits
mailing list