django1: Add python3-django1 package

This adds a Python 3 version of the django1 package.

This also adds a python-django1-common package that contains a
django-admin script based on the one in Debian[1]. This allows
python-django1 and python3-django1 to be installed at the same time.

python3-django conflicts with python-django1 (via python-django1-common)
and python3-django1.

This also updates older Python 3 Django plugin packages to depend on
python3-django1, and newer plugin packages to depend on "django", which
both python3-django and python3-django1 provide.

Because of this dependency on either version of Django, the MDEPENDS for
Python 3 Django plugin packages no longer functions correctly and has
been removed.

[1]: https://salsa.debian.org/python-team/modules/python-django/blob/debian/buster/debian/django-admin

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To
2020-02-05 19:13:45 +08:00
parent ec97bdee35
commit 07251a0543
19 changed files with 104 additions and 63 deletions

View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-simple-captcha
PKG_VERSION:=0.5.12
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mbi/django-simple-captcha/tar.gz/v$(PKG_VERSION)?
@@ -57,11 +57,10 @@ $(call Package/django-simple-captcha/Default)
DEPENDS:= \
+PACKAGE_python3-django-simple-captcha:python3 \
+PACKAGE_python3-django-simple-captcha:python3-six \
python3-django \
+PACKAGE_python3-django-simple-captcha:python3-django1 \
+PACKAGE_python3-django-simple-captcha:python3-pillow \
+PACKAGE_python3-django-simple-captcha:python3-django-ranged-response
VARIANT:=python3
MDEPENDS:=python3-django
endef
define Package/python3-django-simple-captcha/description