[numexpr] 02/04: Fixed file conflict (closes: #735131)

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository numexpr.

commit a306a612e4a583ac6d5608c41dc7dddf8eb810d3
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Jan 13 09:45:54 2014 +0000

    Fixed file conflict (closes: #735131)
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bb6a2b3..1e7039b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ numexpr (2.2.2-4) UNRELEASED; urgency=low
     - remove the Breaks field: compatibility with PyTables >= 3.0 has
       been resotred in numexpr 2.2.2 (see
       https://code.google.com/p/numexpr/wiki/ReleaseNotes)
+  * debian/rules
+    - fixed file conflict between python3-numexpr and
+      python3-numexpr-dbg packages (Closes: #735131) 
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 16 Dec 2013 08:33:34 +0100
 
diff --git a/debian/rules b/debian/rules
index 1479adf..0de6237 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ override_dh_auto_install: $(PY3VERS:%=install-python%)
 override_dh_install:
 	# Install everything excluding the *_d.so debug extensions to python-numexpr
 	dh_install -X"*_d.so" "debian/tmp/usr/lib/python2*" -p python-numexpr
-	dh_install -X"*dmu.so" -X"*dm.so" "debian/tmp/usr/lib/python3*" -p python3-numexpr
+	dh_install -X"dm" "debian/tmp/usr/lib/python3*" -p python3-numexpr
 
 	# Install the debug extensions to python-numexpr-dbg
 	dh_install "debian/tmp/usr/lib/python2*/*-packages/numexpr/*_d.so" -p python-numexpr-dbg

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