From 5173dabe36534385c9c41a72919924b1907b9346 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 31 Jul 2015 09:04:37 +0000 Subject: [PATCH] Added the use of update-alternatives Rewritten-From: 3702569a69e523eb0c819307caf33b825653a2ee --- debian/python-pysaml2.postinst | 8 ++++---- debian/python-pysaml2.postrm | 10 +++++----- debian/python-pysaml2.prerm | 8 ++++---- debian/python3-pysaml2.postinst | 8 ++++---- debian/python3-pysaml2.postrm | 10 +++++----- debian/python3-pysaml2.prerm | 8 ++++---- debian/rules | 12 ++++-------- 7 files changed, 30 insertions(+), 34 deletions(-) diff --git a/debian/python-pysaml2.postinst b/debian/python-pysaml2.postinst index 639876d..282dee3 100644 --- a/debian/python-pysaml2.postinst +++ b/debian/python-pysaml2.postinst @@ -3,12 +3,12 @@ set -e if [ "$1" = "configure" ] ; then - update-alternatives --install /usr/bin/pysaml2-make-metadata pysaml2-make-metadata /usr/bin/python2-pysaml2-make-metadata 300 - update-alternatives --install /usr/bin/pysaml2-mdexport pysaml2-mdexport /usr/bin/python2-pysaml2-mdexport 300 - update-alternatives --install /usr/bin/pysaml2-parse-xsd2 pysaml2-parse-xsd2 /usr/bin/python2-pysaml2-parse-xsd2 300 + update-alternatives --install /usr/bin/make_metadata make_metadata /usr/bin/python2-make_metadata 300 + update-alternatives --install /usr/bin/mdexport mdexport /usr/bin/python2-mdexport 300 + update-alternatives --install /usr/bin/parse_xsd2 parse_xsd2 /usr/bin/python2-parse_xsd2 300 + update-alternatives --install /usr/bin/merge_metadata merge_metadata /usr/bin/python2-merge_metadata 300 fi #DEBHELPER# exit 0 - diff --git a/debian/python-pysaml2.postrm b/debian/python-pysaml2.postrm index 79f7a1b..8563e63 100644 --- a/debian/python-pysaml2.postrm +++ b/debian/python-pysaml2.postrm @@ -2,13 +2,13 @@ set -e -if [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then - update-alternatives --remove pysaml2-make-metadata /usr/bin/python2-pysaml2-make-metadata - update-alternatives --remove pysaml2-mdexport /usr/bin/python2-pysaml2-mdexport - update-alternatives --remove pysaml2-parse-xsd2 /usr/bin/python2-pysaml2-parse-xsd2 +if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then + update-alternatives --remove make_metadata /usr/bin/python2-make_metadata + update-alternatives --remove mdexport /usr/bin/python2-mdexport + update-alternatives --remove parse_xsd2 /usr/bin/python2-parse_xsd2 + update-alternatives --remove merge_metadata /usr/bin/python2-merge_metadata fi #DEBHELPER# exit 0 - diff --git a/debian/python-pysaml2.prerm b/debian/python-pysaml2.prerm index 26fca4d..3472189 100644 --- a/debian/python-pysaml2.prerm +++ b/debian/python-pysaml2.prerm @@ -3,12 +3,12 @@ set -e if [ "$1" = "remove" ] ; then - update-alternatives --remove pysaml2-make-metadata /usr/bin/python2-pysaml2-make-metadata - update-alternatives --remove pysaml2-mdexport /usr/bin/python2-pysaml2-mdexport - update-alternatives --remove pysaml2-parse-xsd2 /usr/bin/python2-pysaml2-parse-xsd2 + update-alternatives --remove make_metadata /usr/bin/python2-make_metadata + update-alternatives --remove mdexport /usr/bin/python2-mdexport + update-alternatives --remove parse_xsd2 /usr/bin/python2-parse_xsd2 + update-alternatives --remove merge_metadata /usr/bin/python2-merge_metadata fi #DEBHELPER# exit 0 - diff --git a/debian/python3-pysaml2.postinst b/debian/python3-pysaml2.postinst index fbd89ab..e3983b6 100644 --- a/debian/python3-pysaml2.postinst +++ b/debian/python3-pysaml2.postinst @@ -3,12 +3,12 @@ set -e if [ "$1" = "configure" ] ; then - update-alternatives --install /usr/bin/pysaml2-make-metadata pysaml2-make-metadata /usr/bin/python3-pysaml2-make-metadata 200 - update-alternatives --install /usr/bin/pysaml2-mdexport pysaml2-mdexport /usr/bin/python3-pysaml2-mdexport 200 - update-alternatives --install /usr/bin/pysaml2-parse-xsd2 pysaml2-parse-xsd2 /usr/bin/python3-pysaml2-parse-xsd2 200 + update-alternatives --install /usr/bin/make_metadata make_metadata /usr/bin/python3-make_metadata 200 + update-alternatives --install /usr/bin/mdexport mdexport /usr/bin/python3-mdexport 200 + update-alternatives --install /usr/bin/parse_xsd2 parse_xsd2 /usr/bin/python3-parse_xsd2 200 + update-alternatives --install /usr/bin/merge_metadata merge_metadata /usr/bin/python3-merge_metadata 200 fi #DEBHELPER# exit 0 - diff --git a/debian/python3-pysaml2.postrm b/debian/python3-pysaml2.postrm index 228c70c..b4fed4d 100644 --- a/debian/python3-pysaml2.postrm +++ b/debian/python3-pysaml2.postrm @@ -2,13 +2,13 @@ set -e -if [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then - update-alternatives --remove pysaml2-make-metadata /usr/bin/python3-pysaml2-make-metadata - update-alternatives --remove pysaml2-mdexport /usr/bin/python3-pysaml2-mdexport - update-alternatives --remove pysaml2-parse-xsd2 /usr/bin/python3-pysaml2-parse-xsd2 +if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then + update-alternatives --remove make_metadata /usr/bin/python3-make_metadata + update-alternatives --remove mdexport /usr/bin/python3-mdexport + update-alternatives --remove parse_xsd2 /usr/bin/python3-parse_xsd2 + update-alternatives --remove merge_metadata /usr/bin/python3-merge_metadata fi #DEBHELPER# exit 0 - diff --git a/debian/python3-pysaml2.prerm b/debian/python3-pysaml2.prerm index 9e1676f..1554db0 100644 --- a/debian/python3-pysaml2.prerm +++ b/debian/python3-pysaml2.prerm @@ -3,12 +3,12 @@ set -e if [ "$1" = "remove" ] ; then - update-alternatives --remove pysaml2-make-metadata /usr/bin/python3-pysaml2-make-metadata - update-alternatives --remove pysaml2-mdexport /usr/bin/python3-pysaml2-mdexport - update-alternatives --remove pysaml2-parse-xsd2 /usr/bin/python3-pysaml2-parse-xsd2 + update-alternatives --remove make_metadata /usr/bin/python3-make_metadata + update-alternatives --remove mdexport /usr/bin/python3-mdexport + update-alternatives --remove parse_xsd2 /usr/bin/python3-parse_xsd2 + update-alternatives --remove merge_metadata /usr/bin/python3-merge_metadata fi #DEBHELPER# exit 0 - diff --git a/debian/rules b/debian/rules index 600d98f..f753de7 100755 --- a/debian/rules +++ b/debian/rules @@ -17,18 +17,14 @@ override_dh_install: python$$pyvers setup.py install --install-layout=deb \ --no-compile --root $(CURDIR)/debian/python-pysaml2; \ done - mv $(CURDIR)/debian/python-pysaml2/usr/bin/make_metadata.py \ - $(CURDIR)/debian/python-pysaml2/usr/bin/python2-pysaml2-make-metadata - mv $(CURDIR)/debian/python-pysaml2/usr/bin/mdexport.py \ - $(CURDIR)/debian/python-pysaml2/usr/bin/python2-pysaml2-mdexport - mv $(CURDIR)/debian/python-pysaml2/usr/bin/parse_xsd2.py \ - $(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-parse-xsd2 - mv $(CURDIR)/debian/python-pysaml2/usr/bin/merge_metadata.py \ - $(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-merge-metadata set -e ; for pyvers in $(PYTHON3S); do \ python$$pyvers setup.py install --install-layout=deb \ --root $(CURDIR)/debian/python3-pysaml2; \ done + for i in make_metadata mdexport parse_xsd2 merge_metadata ; do \ + mv $(CURDIR)/debian/python-pysaml2/usr/bin/$$i.py $(CURDIR)/debian/python-pysaml2/usr/bin/python2-$$i ; \ + mv $(CURDIR)/debian/python3-pysaml2/usr/bin/$$i.py $(CURDIR)/debian/python3-pysaml2/usr/bin/python3-$$i ; \ + done rm -rf $(CURDIR)/debian/python*-pysaml2/usr/lib/python*/dist-packages/*.pth override_dh_auto_test: -- 2.45.2