[libvigraimpex] 07/10: dh_numpy is now available in all relevant dists

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libvigraimpex.

commit cb6d679ff1387db21fee1aa951c1358b851b555e
Author: Andreas Tille <tille at debian.org>
Date:   Wed Feb 12 13:36:28 2014 +0100

    dh_numpy is now available in all relevant dists
---
 debian/dh_numpy | 33 ---------------------------------
 debian/rules    |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/debian/dh_numpy b/debian/dh_numpy
deleted file mode 100755
index 0ed4760..0000000
--- a/debian/dh_numpy
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Find;
-use Debian::Debhelper::Dh_Lib;
-
-init();
-
-my $numpy_next_version;
-my $numpy_version = `python -c 'from numpy import __version__; print __version__'`;
-if (! defined $numpy_version || $numpy_version eq "")
-{
-    error("Numpy is not installed, aborting. (Probably forgot to Build-Depend on python-numpy.)");
-}
-elsif ($numpy_version =~ m/^(\d+)[.](\d+)([.]\d+)*/)
-{
-    $numpy_version = sprintf("%d.%d", $1, $2);
-    $numpy_next_version = sprintf("%d.%d", $1, $2 + 1);
-}
-else
-{
-    error("Unable to parse Numpy version out of \"$numpy_version\".");
-}
-
-foreach my $package (@{$dh{DOPACKAGES}})
-{
-    addsubstvar($package, "python:Depends",
-        "python-numpy (>= 1:$numpy_version), " .
-        "python-numpy (<< 1:$numpy_next_version)"
-    );
-}
-
-# vim:ts=4 sw=4 et
diff --git a/debian/rules b/debian/rules
index 84d8f04..1d6d19e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,7 +136,7 @@ binary-arch: build-arch
 	dh_makeshlibs -V 'libvigraimpex4 (>= 1.9.0)'
 	dh_shlibdeps
 	# See <http://lists.debian.org/debian-python/2010/07/msg00042.html>:
-	$(or $(wildcard /usr/bin/dh_numpy),debian/dh_numpy) -p python-vigra
+	dh_numpy -p python-vigra
 	dh_installdeb -a
 	dh_gencontrol -a
 	dh_md5sums -a

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