[libvigraimpex] 06/06: deb/rules: run dh_numpy w/o script

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit a446852d5ba4386c84622b37711c9719ed9d6c24
Author: Daniel Stender <debian at danielstender.com>
Date:   Wed Apr 29 16:49:02 2015 +0200

    deb/rules: run dh_numpy w/o script
---
 debian/changelog |  4 +++-
 debian/dh_numpy  | 33 ---------------------------------
 debian/rules     |  2 +-
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc799d3..cf3cdfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ libvigraimpex (1.10.0+dfsg-9) UNRELEASED; urgency=medium
     + added Vcs-Browser and Vcs-Git.
   * deb/copyright:
     + updated Source: (upstream moved to Github).
+  * deb/rules:
+    + run dh_numpy w/o script (deb/dh_numpy dropped) [Andreas Tille].
 
- -- Daniel Stender <debian at danielstender.com>  Wed, 29 Apr 2015 16:31:19 +0200
+ -- Daniel Stender <debian at danielstender.com>  Wed, 29 Apr 2015 16:47:58 +0200
 
 libvigraimpex (1.10.0+dfsg-8) experimental; urgency=medium
 
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 4b93e94..5b637c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,7 +148,7 @@ binary-arch: build-arch
 	dh_makeshlibs -V 'libvigraimpex5 (>= 1.10.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