summaryrefslogtreecommitdiff
path: root/lang/python/django
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2020-04-23 04:24:23 +0800
committerJeffery To <jeffery.to@gmail.com>2020-04-23 04:24:23 +0800
commit78ef6a9d31e07fbf58bf8eea77600033318328b3 (patch)
tree2dd266883c7cef68308d421a3064a020e446f198 /lang/python/django
parent9cbfa032f9cb5f56c16b230ffd3b07d9b496ec54 (diff)
django1: Remove common package
python-django1-common was added to allow both Python 2 and 3 versions of Django 1.11 to be installed at the same time. With the removal of Python 2, this package is no longer necessary. This removes this common package and updates the CONFLICTS value for the django package. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang/python/django')
-rw-r--r--lang/python/django/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/python/django/Makefile b/lang/python/django/Makefile
index b4f9c9b24..cf33354b1 100644
--- a/lang/python/django/Makefile
+++ b/lang/python/django/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django
PKG_VERSION:=3.0.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PYPI_NAME:=Django
PKG_HASH:=d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1
@@ -30,7 +30,7 @@ define Package/python3-django
TITLE:=The web framework for perfectionists with deadlines.
URL:=https://www.djangoproject.com/
DEPENDS:= +python3 +python3-pytz +python3-sqlparse +python3-asgiref
- CONFLICTS:=python3-django1 python-django1-common
+ CONFLICTS:=python3-django1
PROVIDES:=django
endef