[gerris] 10/13: Minor update in install-files.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gerris.

commit 23b18019c5d27bf1175af96e5c1d57a7840548cf
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jul 31 23:09:32 2014 +0200

    Minor update in install-files.
---
 debian/control                | 5 +++--
 debian/gerris-mpi.install     | 4 +---
 debian/gerris.install         | 6 ++----
 debian/gerris.links           | 4 ++--
 debian/libgfs-dev.install     | 2 --
 debian/libgfs-mpi-dev.install | 2 --
 debian/rules                  | 3 ++-
 7 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index bc5972e..17f67d5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Drew Parsons <dparsons at debian.org>, Anton Gladky <gladk at debian.org>
 Build-Depends: debhelper (>= 9), autotools-dev,	libgts-dev (>= 0.7.6+darcs121130-1.2),  
+  dh-autoreconf,
   libgts-bin (>= 0.7.6+darcs121130-1.2), libnetcdf-dev, libgsl0-dev, 
   libglib2.0-dev, python,	gfortran, mpi-default-dev
 Standards-Version: 3.9.5
@@ -13,7 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gerris.
 
 Package: gerris
 Architecture: any
-Depends: libgfs-dev, m4, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libav-tools
 Conflicts: gerris-mpi
 Replaces: gerris-mpi
 Suggests: python
@@ -74,7 +75,7 @@ Description: Fluid Flow Solver -- shared libraries
 
 Package: gerris-mpi
 Architecture: any
-Depends: libgfs-mpi-dev, m4, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: python
 Conflicts: gerris
 Replaces: gerris
diff --git a/debian/gerris-mpi.install b/debian/gerris-mpi.install
index bb8c6bf..a33306d 100644
--- a/debian/gerris-mpi.install
+++ b/debian/gerris-mpi.install
@@ -1,5 +1,3 @@
 usr/bin
-usr/lib/*/gerris/gfs2tex.py usr/share/gerris/lib
-usr/lib/*/gerris/m4.awk usr/share/gerris/lib
-usr/lib/*/gerris/libstokes*
 usr/share
+usr/lib/*/gerris/libstokes*
diff --git a/debian/gerris.install b/debian/gerris.install
index 9d3dfd7..29ff842 100644
--- a/debian/gerris.install
+++ b/debian/gerris.install
@@ -1,5 +1,3 @@
 debian/tmp/usr/bin
-debian/tmp/usr/lib/*/gerris/gfs2tex.py usr/share/gerris/lib
-debian/tmp/usr/lib/*/gerris/m4.awk usr/share/gerris/lib
-debian/tmp/usr/lib/*/gerris/libstokes*
-debian/tmp/usr/share
+usr/share
+usr/lib/*/gerris/libstokes*
diff --git a/debian/gerris.links b/debian/gerris.links
index 44f171f..6c4a275 100644
--- a/debian/gerris.links
+++ b/debian/gerris.links
@@ -1,2 +1,2 @@
-usr/share/gerris/lib/gfs2tex.py  	usr/lib/gerris/gfs2tex.py
-usr/share/gerris/lib/m4.awk  		usr/lib/gerris/m4.awk
+usr/share/gerris/lib/gfs2tex.py  	usr/share/gerris/gfs2tex.py
+usr/share/gerris/lib/m4.awk  		usr/share/gerris/m4.awk
diff --git a/debian/libgfs-dev.install b/debian/libgfs-dev.install
index 3b40d38..1689889 100644
--- a/debian/libgfs-dev.install
+++ b/debian/libgfs-dev.install
@@ -1,5 +1,3 @@
 debian/tmp/usr/include
 debian/tmp/usr/lib/*/libgfs*.so
-debian/tmp/usr/lib/*/libgfs*.la
-debian/tmp/usr/lib/*/libgfs*.a
 debian/tmp/usr/lib/*/pkgconfig/gerris*.pc
diff --git a/debian/libgfs-mpi-dev.install b/debian/libgfs-mpi-dev.install
index c20ccf7..b673259 100644
--- a/debian/libgfs-mpi-dev.install
+++ b/debian/libgfs-mpi-dev.install
@@ -1,5 +1,3 @@
 usr/include
 usr/lib/*/libgfs*.so
-usr/lib/*/libgfs*.la
-usr/lib/*/libgfs*.a
 usr/lib/*/pkgconfig/gerris*.pc
diff --git a/debian/rules b/debian/rules
index d667035..b46f818 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_BUILD_OPTIONS=nocheck
 BUILDDIR=debian/build
 BUILDDIR_MPI=debian/build-mpi
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=$(BUILDDIR) -- --disable-mpi
@@ -30,6 +30,7 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install --builddirectory=$(BUILDDIR) --dest=debian/tmp
 	dh_auto_install --builddirectory=$(BUILDDIR_MPI) --dest=debian/tmp-mpi
+	find $(CURDIR)/debian/ -name "*.la" | xargs rm -f
 
 # don't need to install darcs2dist or gfs2doc
 # see bug#436240 for my opinion on the sensibleness of this

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gerris.git