[h5utils] 08/39: Imported Debian patch 1.10-3

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository h5utils.

commit 0d09a4de1b7aa6008e018f7ce0273a321fd2dd1c
Author: Josselin Mouette <joss at debian.org>
Date:   Thu Nov 10 21:46:22 2005 +0100

    Imported Debian patch 1.10-3
---
 Makefile.am      |  7 +++++--
 Makefile.in      | 11 ++++++-----
 aclocal.m4       |  4 ++--
 debian/changelog |  9 +++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 59c784a..943d11c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,8 +41,11 @@ h5math_LDADD = -lmatheval
 octdir = @OCT_INSTALL_DIR@
 oct_DATA = @H5READ@
 
-h5read.oct: h5read.cc arrayh5.h arrayh5.o
-	mkoctfile $(DEFS) $(CPPFLAGS) $(srcdir)/h5read.cc arrayh5.o $(LDFLAGS) $(LIBS)
+%.pic.o: %.c
+	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
+
+h5read.oct: h5read.cc arrayh5.h arrayh5.pic.o
+	mkoctfile -s $(DEFS) $(CPPFLAGS) $(srcdir)/h5read.cc arrayh5.pic.o $(LDFLAGS) $(LIBS)
 
 clean-hook:
 	rm -f h5read.oct
diff --git a/Makefile.in b/Makefile.in
index f04f4b5..7112824 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(h4fromh5_SOURCES) $(h5fromh4_SOURCES) $(h5fromitxt_SOURCES) $(h5fromtxt_SOURCES) $(h5math_SOURCES) $(h5topng_SOURCES) $(h5totxt_SOURCES) $(h5tov5d_SOURCES) $(h5tovtk_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -803,8 +801,11 @@ uninstall-man: uninstall-man1
 	uninstall-octDATA
 
 
-h5read.oct: h5read.cc arrayh5.h arrayh5.o
-	mkoctfile $(DEFS) $(CPPFLAGS) $(srcdir)/h5read.cc arrayh5.o $(LDFLAGS) $(LIBS)
+%.pic.o: %.c
+	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
+
+h5read.oct: h5read.cc arrayh5.h arrayh5.pic.o
+	mkoctfile -s $(DEFS) $(CPPFLAGS) $(srcdir)/h5read.cc arrayh5.pic.o $(LDFLAGS) $(LIBS)
 
 clean-hook:
 	rm -f h5read.oct
diff --git a/aclocal.m4 b/aclocal.m4
index 2b84dd9..b7a0e85 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
diff --git a/debian/changelog b/debian/changelog
index f41d686..c7e3ed0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+h5utils (1.10-3) unstable; urgency=low
+
+  * Makefile.am:
+    + Really build the plugin with -fPIC (closes: #338088).
+    + Use mkoctfile's -s option.
+  * Re-run aclocal and automake.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 10 Nov 2005 21:46:22 +0100
+
 h5utils (1.10-2) unstable; urgency=low
 
   * control:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/h5utils.git