From 7f9d22b5ad9e46bea642abad42d9b3e89936f4de Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 20 Feb 2020 21:29:16 +0800 Subject: [PATCH] django-jsonfield: Change packaged project Previously, this packaged "django-jsonfield" on PyPI. The only (in-tree) package that depends on this package is django-postoffice. django-post-office actually depends on "jsonfield" on PyPI.[1][2] This changes the packaged project from "django-jsonfield" to "jsonfield". The version packaged here is not the latest available update, but the last version compatible with Django 1.11 / Python 2. [1]: https://github.com/ui/django-post_office/blob/v3.2.1/setup.py#L45 [2]: https://github.com/ui/django-post_office/issues/182 Signed-off-by: Jeffery To --- lang/python/django-jsonfield/Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lang/python/django-jsonfield/Makefile b/lang/python/django-jsonfield/Makefile index 305ab6f68..2ed18e8a5 100644 --- a/lang/python/django-jsonfield/Makefile +++ b/lang/python/django-jsonfield/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-jsonfield -PKG_VERSION:=1.0.1 -PKG_RELEASE:=6 +PKG_VERSION:=2.1.1 +PKG_RELEASE:=1 -PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=6c0afd5554739365b55d86e285cf966cc3a45682fff963463364ea1f6511ca3e +PYPI_NAME:=jsonfield +PKG_HASH:=ed7c5e1829e9453e24a8bebef1e702ffe402e6def6b326f0e0b88764c59a6dc7 PKG_MAINTAINER:=Alexandru Ardelean -PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include ../pypi.mk @@ -27,28 +27,31 @@ define Package/django-jsonfield/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=JSONField for django models - URL:=https://github.com/adamchainz/django-jsonfield + TITLE:=A reusable Django field to store validated JSON in models + URL:=https://github.com/rpkilby/jsonfield endef define Package/python-django-jsonfield $(call Package/django-jsonfield/Default) DEPENDS:= \ +PACKAGE_python-django-jsonfield:python \ - python-django1 + python-django1 \ + +PACKAGE_python-django-jsonfield:python-six VARIANT:=python MDEPENDS:=python-django1 endef define Package/python-django-jsonfield/description - JSONField for django models + jsonfield is a reusable model field that allows you to store validated + JSON, automatically handling serialization to and from the database. endef define Package/python3-django-jsonfield $(call Package/django-jsonfield/Default) DEPENDS:= \ +PACKAGE_python3-django-jsonfield:python3 \ - +PACKAGE_python3-django-jsonfield:python3-django1 + +PACKAGE_python3-django-jsonfield:python3-django1 \ + +PACKAGE_python3-django-jsonfield:python3-six VARIANT:=python3 endef