[pyepr] 01/03: Fix file conflicts in binary files

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Mon Mar 31 17:54:31 UTC 2014


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

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

commit b9530daf516f35a0c9947fb4e68095e4c2793867
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Mar 31 17:44:03 2014 +0000

    Fix file conflicts in binary files
---
 debian/changelog | 6 ++++++
 debian/rules     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d75bb1b..df57c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyepr (0.8.1-2) UNRELEASED; urgency=medium
+
+  * Fix file conflicts in binary packages
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 31 Mar 2014 17:42:40 +0000
+
 pyepr (0.8.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 02a3855..ffd9bae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ override_dh_install:
 	# Install the debug extensions to python-epr-dbg
 	dh_install "debian/tmp/usr/lib/python2*/*-packages/*_d.so" -p python-epr-dbg
 	dh_install "debian/tmp/usr/lib/python3*/*-packages/*.cpython-??dm*.so" -p python3-epr-dbg
+	find debian/python3-epr -name '*.cpython-??dm-*.so' | xargs -r rm -f
 
 	# Continue with regular dh_install
 	dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyepr.git



More information about the Pkg-grass-devel mailing list