This is an automated email from the git hooks/post-receive script.
afif-guest pushed a commit to branch master
in repository python-avro.
commit 903549aac8814f65a9f6f54d2e98b0753f43b061
Author: Afif Elghraoui <a...@ghraoui.name>
Date: Sat Oct 17 18:38:08 2015 -0700
Properly remove /usr/bin/avro provided by the python2 package
It wasn't done using the pyremove file and dh_install -X wasn't
working.
---
debian/python-avro.pyremove | 3 ---
debian/rules | 6 ++++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/python-avro.pyremove b/debian/python-avro.pyremove
deleted file mode 100644
index 1892c78..0000000
--- a/debian/python-avro.pyremove
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is also provided by the python3-avro package. Avoid conflict
-# by removing the python2 implementation
-usr/bin/avro
diff --git a/debian/rules b/debian/rules
index 2d6f7e3..1b0f4d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,3 +55,9 @@ override_dh_auto_test:
dh_auto_test \
--sourcedirectory=lang/py3 \
--package=python3-avro
+
+# Only keep /usr/bin/avro that is provided by the python3
+# package
+override_dh_install:
+ rm -f debian/python-avro/usr/bin/avro
+ dh_install
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/debian-med/python-avro.git
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
