diff --git a/lang/python/python-version.mk b/lang/python/python-version.mk index cba9255f4..418217623 100644 --- a/lang/python/python-version.mk +++ b/lang/python/python-version.mk @@ -8,8 +8,8 @@ PYTHON_VERSION:=2.7 PYTHON_VERSION_MICRO:=16 -PYTHON_SETUPTOOLS_PKG_RELEASE:=1 -PYTHON_PIP_PKG_RELEASE:=1 +PYTHON_SETUPTOOLS_PKG_RELEASE:=2 +PYTHON_PIP_PKG_RELEASE:=2 PYTHON_SETUPTOOLS_VERSION:=40.6.2 PYTHON_PIP_VERSION:=18.1 diff --git a/lang/python/python/files/python-package-pip.mk b/lang/python/python/files/python-package-pip.mk index e0c6de978..fecc5d901 100644 --- a/lang/python/python/files/python-package-pip.mk +++ b/lang/python/python/files/python-package-pip.mk @@ -9,6 +9,9 @@ define Package/python-pip $(call Package/python/Default) TITLE:=Python $(PYTHON_VERSION) pip module VERSION:=$(PYTHON_PIP_VERSION)-$(PYTHON_PIP_PKG_RELEASE) + LICENSE:=MIT + LICENSE_FILES:=LICENSE.txt +# CPE_ID:=cpe:/a:python:pip # not currently handled this way by uscan DEPENDS:=+python +python-setuptools +python-pip-conf endef diff --git a/lang/python/python/files/python-package-setuptools.mk b/lang/python/python/files/python-package-setuptools.mk index f90b01864..c6d951a55 100644 --- a/lang/python/python/files/python-package-setuptools.mk +++ b/lang/python/python/files/python-package-setuptools.mk @@ -9,6 +9,9 @@ define Package/python-setuptools $(call Package/python/Default) TITLE:=Python $(PYTHON_VERSION) setuptools module VERSION:=$(PYTHON_SETUPTOOLS_VERSION)-$(PYTHON_SETUPTOOLS_PKG_RELEASE) + LICENSE:=MIT + LICENSE_FILES:=LICENSE +# CPE_ID:=cpe:/a:python:setuptools # not currently handled this way by uscan DEPENDS:=+python endef diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index abef3f2ca..9eebeb260 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -12,8 +12,8 @@ PYTHON3_VERSION_MICRO:=2 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) -PYTHON3_SETUPTOOLS_PKG_RELEASE:=1 -PYTHON3_PIP_PKG_RELEASE:=1 +PYTHON3_SETUPTOOLS_PKG_RELEASE:=2 +PYTHON3_PIP_PKG_RELEASE:=2 PYTHON3_SETUPTOOLS_VERSION:=40.6.2 PYTHON3_PIP_VERSION:=18.1 diff --git a/lang/python/python3/files/python3-package-pip.mk b/lang/python/python3/files/python3-package-pip.mk index 677f61efa..9f942c660 100644 --- a/lang/python/python3/files/python3-package-pip.mk +++ b/lang/python/python3/files/python3-package-pip.mk @@ -9,6 +9,9 @@ define Package/python3-pip $(call Package/python3/Default) TITLE:=Python $(PYTHON3_VERSION) pip module VERSION:=$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE) + LICENSE:=MIT + LICENSE_FILES:=LICENSE.txt +# CPE_ID:=cpe:/a:python:pip # not currently handled this way by uscan DEPENDS:=+python3 +python3-setuptools +python-pip-conf endef diff --git a/lang/python/python3/files/python3-package-setuptools.mk b/lang/python/python3/files/python3-package-setuptools.mk index 5cb5f58de..ce1fb5c11 100644 --- a/lang/python/python3/files/python3-package-setuptools.mk +++ b/lang/python/python3/files/python3-package-setuptools.mk @@ -9,6 +9,9 @@ define Package/python3-setuptools $(call Package/python3/Default) TITLE:=Python $(PYTHON3_VERSION) setuptools module VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE) + LICENSE:=MIT + LICENSE_FILES:=LICENSE +# CPE_ID:=cpe:/a:python:setuptools # not currently handled this way by uscan DEPENDS:=+python3 endef