[med-svn] [odil] 01/01: Merge NMU of 0.8.0-3.1; improve installation of Python wrappers

[Julien Lamy]

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

lamy-guest pushed a commit to branch master
in repository odil.

commit 65058b6752418a31245e288fd3d6ae924602419f
Author: Julien Lamy <lamy at unistra.fr>
Date:   Sun Oct 22 11:32:34 2017 +0200

    Merge NMU of 0.8.0-3.1; improve installation of Python wrappers
---
 debian/changelog                                         | 8 +++++++-
 debian/{python-odil.install => python-odil.install.in}   | 0
 debian/{python3-odil.install => python3-odil.install.in} | 0
 debian/rules                                             | 6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d80ca44..d129005 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,13 @@ odil (0.8.0-4) unstable; urgency=medium
   * Fix install of Python files (Closes: #878426)
   * Update standards version
 
- -- Julien Lamy <lamy at unistra.fr>  Mon, 16 Oct 2017 13:49:57 +0000
+ -- Julien Lamy <lamy at unistra.fr>  Sun, 22 Oct 2017 11:30:35 +0200
+
+odil (0.8.0-3.1) unstable; urgency=medium
+  * Non-maintainer upload.
+  * Fix installation of python3 modules.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 17 Oct 2017 09:50:40 +0200
 
 odil (0.8.0-3) unstable; urgency=medium
 
diff --git a/debian/python-odil.install b/debian/python-odil.install.in
similarity index 100%
rename from debian/python-odil.install
rename to debian/python-odil.install.in
diff --git a/debian/python3-odil.install b/debian/python3-odil.install.in
similarity index 100%
rename from debian/python3-odil.install
rename to debian/python3-odil.install.in
diff --git a/debian/rules b/debian/rules
index e856991..d7f66d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,10 @@ override_dh_auto_install-arch:
 	rm build
 
 override_dh_install-arch-py%:
-	sed -i 's/VERSION/$*/g' debian/python$(shell dpkg --compare-versions $* ge 3 && echo "3")-odil.install
+	sed \
+	  's/VERSION/$*/g' \
+	  debian/python$(shell dpkg --compare-versions $* ge 3 && echo "3")-odil.install.in > \
+	  debian/python$(shell dpkg --compare-versions $* ge 3 && echo "3")-odil.install
 
 override_dh_install-arch: $(ALLPY:%=override_dh_install-arch-py%)
 	dh_install
@@ -88,6 +91,7 @@ override_dh_clean:
 	dh_clean
 	find tests -name "*pyc" -delete
 	rm -rf build-nopy $(ALLPY:%=build-py%) doc
+	rm -f debian/python*-odil.install
 
 # These steps are not needed for arch-independent packages
 override_dh_auto_configure-indep:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/odil.git