Added the use of update-alternatives

Rewritten-From: 3702569a69e523eb0c819307caf33b825653a2ee

diff --git a/debian/python-pysaml2.postinst b/debian/python-pysaml2.postinst
index 639876d9d6a4eece1a569643e18d997dcfe21594..282dee325e1640e8d8e277fecaa34eb2b8dd920c 100644 (file)
--- 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 79f7a1b785dde29bf17bb846a1326ceecf3cdb45..8563e63d8fa2cfb4d22858cd71fb6c57fd7ef35f 100644 (file)
--- 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 26fca4dde246e3d4c6b04f70e0701ff0bf2870ee..3472189c6dc4deb811cf5b578a4da2c79835f0d5 100644 (file)
--- 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 fbd89ab2baf0659106cd4ac7bb73d0de30bea159..e3983b6d848e05057c6787086f3c4c57568a1ce6 100644 (file)
--- 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 228c70c71ebb82b60b4b7583239d735da213758b..b4fed4d1dccc3d905a49edf489bf195281c3f0a4 100644 (file)
--- 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 9e1676f1cd46e3178e9fb0b63de1f8035ddc2e37..1554db0bae66c224f6461b0f35837427f0016920 100644 (file)
--- 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 600d98f9542d79c3edcd92b436c30345fb08362b..f753de7b91d4e1ef0cf3a6bf990196daa338a3c1 100755 (executable)
--- 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: