r36099 - in /packages/jhdf/trunk/debian: changelog libjhdf4-jni.install libjhdf5-jni.install patches/fpicFlag.diff patches/z_sharedOptMissing.diff patches/z_sharedOptMissing5.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Jan 21 17:00:32 2010
New Revision: 36099

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36099
Log:
  * Install path of the libjhdf.so & libjhdf5.so were wrong
  * Missing fpic on some archs (fpicFlag.diff)

Added:
    packages/jhdf/trunk/debian/patches/fpicFlag.diff
    packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff
    packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff
Modified:
    packages/jhdf/trunk/debian/changelog
    packages/jhdf/trunk/debian/libjhdf4-jni.install
    packages/jhdf/trunk/debian/libjhdf5-jni.install

Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=36099&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Thu Jan 21 17:00:32 2010
@@ -1,3 +1,17 @@
+jhdf (2.5-10) unstable; urgency=low
+
+  * Install path of the libjhdf.so & libjhdf5.so were wrong
+  * Missing fpic on some archs (fpicFlag.diff)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 21 Jan 2010 09:56:05 +0100
+
+jhdf (2.5-9) unstable; urgency=low
+
+  * Fix the build issues z_sharedOptMissing.diff & z_sharedOptMissing5.diff
+    (Closes: #554090)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 21 Jan 2010 00:10:46 +0100
+
 jhdf (2.5-8) unstable; urgency=low
 
   * Bad links to the VCS

Modified: packages/jhdf/trunk/debian/libjhdf4-jni.install
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/libjhdf4-jni.install?rev=36099&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/libjhdf4-jni.install (original)
+++ packages/jhdf/trunk/debian/libjhdf4-jni.install Thu Jan 21 17:00:32 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/java/linux/libjhdf.so usr/lib/jni/
+debian/tmp/usr/share/java/*/libjhdf.so usr/lib/jni/

Modified: packages/jhdf/trunk/debian/libjhdf5-jni.install
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/libjhdf5-jni.install?rev=36099&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/libjhdf5-jni.install (original)
+++ packages/jhdf/trunk/debian/libjhdf5-jni.install Thu Jan 21 17:00:32 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/java/linux/libjhdf5.so usr/lib/jni/
+debian/tmp/usr/share/java/*/libjhdf5.so usr/lib/jni/

Added: packages/jhdf/trunk/debian/patches/fpicFlag.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/fpicFlag.diff?rev=36099&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/fpicFlag.diff (added)
+++ packages/jhdf/trunk/debian/patches/fpicFlag.diff Thu Jan 21 17:00:32 2010
@@ -1,0 +1,13 @@
+Index: jhdf-2.5.obsolete.0.952461238092841/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";
+ JSLEXT="so";
+ LLEXT="a";
+-COPT=-shared; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
++COPT="-shared  -fPIC"; COPTNOSHSARED=; JAVAINC2=$JAVAINC/$target; JAVATARG=$TARGET ;;
+ esac
+ 
+ AC_SUBST(LD)

Added: 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=36099&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff (added)
+++ packages/jhdf/trunk/debian/patches/z_sharedOptMissing.diff Thu Jan 21 17:00:32 2010
@@ -1,0 +1,11 @@
+--- 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 @@
+ 
+ libjhdf: $(OBJECTS) 
+ 	-mkdir -p $(LIBDIR);
+-	$(LD) $(LDOPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)
++	$(LD) $(LDOPT) $(COPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)
+ 
+ clean:
+ 	$(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT)

Added: 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=36099&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff (added)
+++ packages/jhdf/trunk/debian/patches/z_sharedOptMissing5.diff Thu Jan 21 17:00:32 2010
@@ -1,0 +1,13 @@
+Index: jhdf-2.5/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 @@
+ 
+ libjhdf5: $(OBJECTS)
+ 	-mkdir -p $(LIBDIR);
+-	$(LD) $(LDOPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)
++	$(LD) $(LDOPT) $(COPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)
+ 
+ clean:
+ 	$(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT)