r47214 - in /packages/jhdf/trunk/debian: changelog patches/javadocImages.diff patches/series rules

[pini at users.alioth.debian.org]

Author: pini
Date: Thu Mar 24 23:23:17 2016
New Revision: 47214

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47214
Log:
Fix libjhdf-doc build

Added:
    packages/jhdf/trunk/debian/patches/javadocImages.diff
Modified:
    packages/jhdf/trunk/debian/changelog
    packages/jhdf/trunk/debian/patches/series
    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=47214&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog	(original)
+++ packages/jhdf/trunk/debian/changelog	Thu Mar 24 23:23:17 2016
@@ -2,8 +2,9 @@
 
   * New upstream release
   * Refresh patches
-  * New patch:
+  * New patches:
     - slf4j.diff: Debian classpath for slf4j jar files
+    - javadocImages.diff: fix path of images for target install-javadocs
 
  -- Gilles Filippini <pini at debian.org>  Tue, 22 Mar 2016 23:35:39 +0100
 

Added: packages/jhdf/trunk/debian/patches/javadocImages.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/javadocImages.diff?rev=47214&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/javadocImages.diff	(added)
+++ packages/jhdf/trunk/debian/patches/javadocImages.diff	Thu Mar 24 23:23:17 2016
@@ -0,0 +1,19 @@
+Index: jhdf-2.11.0+dfsg/Makefile.in
+===================================================================
+--- jhdf-2.11.0+dfsg.orig/Makefile.in
++++ jhdf-2.11.0+dfsg/Makefile.in
+@@ -397,11 +397,11 @@ install-javadocs:
+ 	else \
+ 	$(JAVADOC) -sourcepath $(CLASSPATH) -d $(DOCDIR)/javadocs $(JAVADOC_FLAGS) ncsa.hdf.hdflib $(JHI5PACKAGES) $(HDFOBJPACKAGES); \
+ 	fi
+-	-mkdir -p $(DOCDIR)/javadocs/images;
+-	cp docs/javadocs/images/*.gif $(DOCDIR)/javadocs/images;
++	-mkdir -p $(DOCDIR)/javadocs/resources;
++	cp docs/javadocs/resources/*.gif $(DOCDIR)/javadocs/resources;
+ 
+ uninstall-javadocs:
+-	$(RM) -rf $(DOCDIR)/javadocs/*.html $(DOCDIR)/images
++	$(RM) -rf $(DOCDIR)/javadocs/*.html $(DOCDIR)/javadocs/resources
+ 
+ distclean: clean-natives clean-ncsa clean-classes clean-test clean-examples
+ 	$(RM) -f config.cache config.status config.log 

Modified: packages/jhdf/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/series?rev=47214&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/series	(original)
+++ packages/jhdf/trunk/debian/patches/series	Thu Mar 24 23:23:17 2016
@@ -15,3 +15,4 @@
 source1.5.diff
 
 slf4j.diff
+javadocImages.diff

Modified: packages/jhdf/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/rules?rev=47214&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/rules	(original)
+++ packages/jhdf/trunk/debian/rules	Thu Mar 24 23:23:17 2016
@@ -24,5 +24,8 @@
 DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=$(JAVA_HOME)/include/,$(JAVA_HOME)/lib/ --with-classpath=$(JAVA_HOME)/lib/ --with-javabin=$(JAVA_HOME)/bin/  --with-libz=yes,/usr/lib --with-libsz=yes,/usr/lib --with-libjpeg=yes,/usr/lib/   $(WITH_HDF5) --with-hdf4=/usr/include/hdf/,/usr/lib/
 DEB_CONFIGURE_PREFIX := $(CURDIR)/debian/tmp/
 
+install/libjhdf-doc::
+	$(MAKE) install-javadocs
+
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz