summaryrefslogtreecommitdiff
path: root/lang/python/django-webpack-loader
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2020-02-05 19:13:45 +0800
committerJeffery To <jeffery.to@gmail.com>2020-02-13 15:29:59 +0800
commit07251a0543600765e16e9f767d52e28a11768600 (patch)
tree80fbda1bd52baaa639bae813ca6ecb2cb7a8ac95 /lang/python/django-webpack-loader
parentec97bdee355752a92d4b9f3a5d566ee0e424a700 (diff)
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>
Diffstat (limited to 'lang/python/django-webpack-loader')
-rw-r--r--lang/python/django-webpack-loader/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/lang/python/django-webpack-loader/Makefile b/lang/python/django-webpack-loader/Makefile
index 1ff80d64c..90c65d2ac 100644
--- a/lang/python/django-webpack-loader/Makefile
+++ b/lang/python/django-webpack-loader/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-webpack-loader
PKG_VERSION:=0.6.0
-PKG_RELEASE:=6
+PKG_RELEASE:=7
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520
@@ -46,9 +46,8 @@ define Package/python3-django-webpack-loader
$(call Package/django-webpack-loader/Default)
DEPENDS:= \
+PACKAGE_python3-django-webpack-loader:python3 \
- python3-django
+ +PACKAGE_python3-django-webpack-loader:python3-django1
VARIANT:=python3
- MDEPENDS:=python3-django
endef
define Package/python3-django-webpack-loader/description