r47203 - in /packages/jhdf/trunk/debian: changelog patches/useSharedLib.diff rules

[pini at users.alioth.debian.org]

Author: pini
Date: Tue Mar 22 19:20:13 2016
New Revision: 47203

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47203
Log:
Upload release 2.9-4 to unstable

Support linking against libsz.

Modified:
    packages/jhdf/trunk/debian/changelog
    packages/jhdf/trunk/debian/patches/useSharedLib.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=47203&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog	(original)
+++ packages/jhdf/trunk/debian/changelog	Tue Mar 22 19:20:13 2016
@@ -1,13 +1,16 @@
-jhdf (2.11+dfsg-1) UNRELEASED; urgency=medium
+jhdf (2.9-4) unstable; urgency=medium
 
   [ Andreas Tille ]
-  * Team upload
   * Fix watch file
   * machine readable copyright file
   * Use Files-Excluded to strip *.jar files
   * cme fix dpkg-control
 
- -- Andreas Tille <tille at debian.org>  Tue, 05 May 2015 09:55:44 +0200
+  [ Gilles Filippini ]
+  * Team upload
+  * Support linking against libsz (closes: #813261).
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 22 Mar 2016 20:18:49 +0100
 
 jhdf (2.9-3) unstable; urgency=medium
 

Modified: packages/jhdf/trunk/debian/patches/useSharedLib.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/useSharedLib.diff?rev=47203&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/useSharedLib.diff	(original)
+++ packages/jhdf/trunk/debian/patches/useSharedLib.diff	Tue Mar 22 19:20:13 2016
@@ -85,6 +85,15 @@
  if test -n "$JPEGLIB"; then
    LIBS="$LIBS $JPEGLIB"
    HAVE_JPEG="yes"
+@@ -246,7 +209,7 @@ case "$withval" in
+   *)
+   if test -n "$withval" ; then
+       sz_lib="`echo $withval |cut -f2 -d, -s`"
+-    SZLIB=$sz_lib"/libsz."$LLEXT
++    SZLIB="-lsz"
+     dnl AC_MSG_RESULT([szlib found: $SZLIB]);
+     HAVE_SZIP="yes"
+   else
 @@ -274,33 +237,10 @@ withval="";
  AC_SUBST(HDF4LIB) HDF4LIB=""
  AC_ARG_WITH(hdf4,[  --with-hdf4=LIB     Path to the hdf library (required if not in default path)],,)

Modified: packages/jhdf/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/rules?rev=47203&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/rules	(original)
+++ packages/jhdf/trunk/debian/rules	Tue Mar 22 19:20:13 2016
@@ -17,7 +17,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := CC=gcc
 
-DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=/usr/lib/jvm/default-java/include/,/usr/lib/jvm/default-java/lib/ --with-classpath=/usr/lib/jvm/default-java/lib/ --with-javabin=/usr/lib/jvm/default-java/bin/  --with-libz=yes,/usr/lib  --with-libjpeg=yes,/usr/lib/   $(WITH_HDF5) --with-hdf4=/usr/include/hdf/,/usr/lib/
+DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=/usr/lib/jvm/default-java/include/,/usr/lib/jvm/default-java/lib/ --with-classpath=/usr/lib/jvm/default-java/lib/ --with-javabin=/usr/lib/jvm/default-java/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/
 
 get-orig-source: