[gerris] 03/06: Simplify d/rules.

[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 3098e7f06e6f4411c535b107f26842d63377925e
Author: Anton Gladky <gladk at debian.org>
Date:   Sun May 22 20:49:00 2016 +0200

    Simplify d/rules.
---
 debian/gerris.preinst   | 17 -----------------
 debian/libgfs-dev.links |  2 ++
 debian/rules            | 29 ++---------------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/debian/gerris.preinst b/debian/gerris.preinst
deleted file mode 100644
index dada8d2..0000000
--- a/debian/gerris.preinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-# From version 20090512-dfsg.1-1, there are both arch-dependent and 
-# arch-independent files in upstream's /usr/lib/gerris (with module libstokes
-# added), so can no longer take /usr/lib/gerris as a symlink to 
-# /usr/share/gerris/lib.
-if [ "$1" = "upgrade" ]; then
-    if dpkg --compare-versions "$2" lt-nl 20090512-dfsg.1-1; then
-	if [ -L /usr/lib/gerris ]; then
-		echo "Removing deprecated symlink /usr/lib/gerris"
-		rm /usr/lib/gerris
-	fi
-    fi
-fi
-
-
-#DEBHELPER#
diff --git a/debian/libgfs-dev.links b/debian/libgfs-dev.links
new file mode 100644
index 0000000..57d7a95
--- /dev/null
+++ b/debian/libgfs-dev.links
@@ -0,0 +1,2 @@
+usr/lib/x86_64-linux-gnu/libgfs3D-1.3.so.2.0.0 usr/lib/x86_64-linux-gnu/libgfs3D-1.3.so
+usr/lib/x86_64-linux-gnu/libgfs2D-1.3.so.2.0.0 usr/lib/x86_64-linux-gnu/libgfs2D-1.3.so
diff --git a/debian/rules b/debian/rules
index c09d8f0..1866b3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,18 +8,6 @@ BUILDDIR=debian/build
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=$(BUILDDIR) -- --enable-mpi
 
-# some autogenerated files get left behind by upstream autotools clean
-# so remove them here
-override_dh_auto_clean:
-	dh_auto_clean --builddirectory=$(BUILDDIR)
-	for bdir in $(BUILDDIR); do    \
-	   rm $$bdir/doc/examples/gerris.dic  || true;    \
-	   rm $$bdir/doc/examples/gfs.lang    || true;    \
-	   rm $$bdir/src/modules.c            || true;    \
-	   rm $$bdir/src/modules.h            || true;    \
-	done
-	-rm doc/examples/gfs2tex.pyc
-
 override_dh_auto_build:
 	dh_auto_build --builddirectory=$(BUILDDIR)
 
@@ -27,21 +15,8 @@ override_dh_auto_install:
 	dh_auto_install --builddirectory=$(BUILDDIR) --dest=debian/tmp
 	find $(CURDIR)/debian/ -name "*.la" | xargs rm -f
 	sed -i -e "s/mpicc/gcc/g" $(CURDIR)/debian/tmp/usr/share/gerris/build_function
-
-# don't need to install darcs2dist or gfs2doc
-# see bug#436240 for my opinion on the sensibleness of this
-override_dh_install:
-	dh_install -pgerris --exclude=darcs2dist
-	dh_install -plibgfs-1.3-2
-	dh_install -plibgfs-dev
+	rm -rf $(CURDIR)/debian/tmp/usr/bin/darcs2dist
+	rm -rf $(CURDIR)/debian/tmp/usr/bin/gfs2doc
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
-
-# gerris will pick up a dependency on libgfs-mpi-1.3-2
-# unless we specific -Llibgfs-1.3-2 here
-override_dh_shlibdeps:
-	dh_shlibdeps -pgerris -Llibgfs-1.3-2
-	dh_shlibdeps -plibgfs-1.3-2
-	dh_shlibdeps -plibgfs-dev
-

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