r46859 - /packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff

[pini at users.alioth.debian.org]

Author: pini
Date: Tue Aug 12 22:30:55 2014
New Revision: 46859

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46859
Log:
remove dirs fits and nc2 from the build.

Modified:
    packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff

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=46859&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff	(original)
+++ packages/jhdf/trunk/debian/patches/z_nc2-fits-disabled.diff	Tue Aug 12 22:30:55 2014
@@ -1,8 +1,8 @@
 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 @@
+--- jhdf-2.9.orig/Makefile.in
++++ jhdf-2.9/Makefile.in
+@@ -50,9 +50,9 @@ H4OBJDISTFILES= ./ncsa/hdf/object/h4/*.j
  
  H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java ./ncsa/hdf/object/h5/Makefile.in ./ncsa/hdf/object/h5/CMakeLists.txt
  
@@ -15,7 +15,7 @@
  
  NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./ncsa/hdf/object/nc2/Makefile.in ./ncsa/hdf/object/nc2/CMakeLists.txt $(CLASS_DIR)/netcdf.jar 
  
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ install-just-hdf4: install-hdflib instal
  
  install-just-hdf5: install-hdf5lib install-jhdf5
  
@@ -24,7 +24,7 @@
  
  jhdf-packages: 
  	@if test x'$(H4INC)' != x'' ; then $(MAKE) do-jhdf-packages; fi
-@@ -356,17 +356,17 @@
+@@ -356,17 +356,17 @@ install-jhdfview: ncsa.hdf.view
  	-mkdir -p $(LIBDIR);
  	$(JAR) cfm $(LIBDIR)/jhdfview.jar debian/hdfview.manifest -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
  	-mkdir -p $(LIBDIR)/ext
@@ -47,3 +47,16 @@
  	cp bin/hdfview.sh $(BINDIR)
  	chmod a+x $(BINDIR)/hdfview.sh
  	for size in 16 22 24 32 48 64 96; do \
+Index: jhdf-2.9/ncsa/hdf/object/Makefile.in
+===================================================================
+--- jhdf-2.9.orig/ncsa/hdf/object/Makefile.in
++++ jhdf-2.9/ncsa/hdf/object/Makefile.in
+@@ -13,7 +13,7 @@
+  
+ TOP = ../../..
+ DIR	= ncsa/hdf/object
+-SUBDIRS = fits h4 h5 nc2
++SUBDIRS = h4 h5
+ 
+ JAVAC           = @JAVAC@
+ JAVADOC         = @JAVADOC@