pip2 is not the same as pip: makepip missing for pip2

[Daniel Hahler]

debian/rules uses the "makepip.py" program to generate fixed/custom pip and pip3 scripts, but leaves the original pip2 alone:

override_dh_python3:
        dh_python3
        rm -f debian/python3-pip/usr/bin/pip
        rm -f debian/python3-pip/usr/bin/pip3.?
        rm -rf debian/python3-pip/usr/lib/python3.?
        python3 debian/makepip.py /usr/bin/python3 \
                debian/python3-pip/usr/bin/pip3

override_dh_python2:
        dh_python2
        rm -f debian/python-pip/usr/bin/pip2.?
        python3 debian/makepip.py /usr/bin/python \
                debian/python-pip/usr/bin/pip

% diff -u /usr/bin/pip*
--- /usr/bin/pip 2016-05-24 14:23:26.000000000 +0000
+++ /usr/bin/pip2 2016-05-24 14:23:16.000000000 +0000
@@ -1,11 +1,10 @@
 #!/usr/bin/python
-# GENERATED BY DEBIAN
-
+# EASY-INSTALL-ENTRY-SCRIPT: 'pip==8.1.1','console_scripts','pip2'
+__requires__ = 'pip==8.1.1'
 import sys
+from pkg_resources import load_entry_point

-# Run the main entry point, similarly to how setuptools does it, but because
-# we didn't install the actual entry point from setup.py, don't use the
-# pkg_resources API.
-from pip import main
 if __name__ == '__main__':
- sys.exit(main())
+ sys.exit(
+ load_entry_point('pip==8.1.1', 'console_scripts', 'pip2')()
+ )

I think there should be an additional line in override_dh_python2:

 python3 debian/makepip.py /usr/bin/python \
  debian/python-pip/usr/bin/pip2

I've noticed this because Saltstack will prefer "pip2" over "pip".

[Kai Kasurinen (kai-kasurinen)]

Fixed in version python-pip/8.1.2-3