django-statici18n: fix changes in merge

diff --git a/lang/python/django-statici18n/Makefile b/lang/python/django-statici18n/Makefile
index c1666b165a126d2d20a256f1b1a0e06d0943fbf8..37f0735348146b36b6f9b407bf67496d7b44e0fa 100644 (file)
--- a/lang/python/django-statici18n/Makefile
+++ b/lang/python/django-statici18n/Makefile
@@ -9,26 +9,28 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-statici18n
 PKG_VERSION:=1.8.2
-PKG_RELEASE:=3
-PKG_LICENSE:=BSD-3-Clause
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/django-statici18n
 PKG_HASH:=ba9eeb3c4517027922645999359f8335fbb9fea04c457123cfbd6b4a36cbeda4
+
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
+include ../python3-package.mk
+
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
 
-define Package/django-statici18n
+define Package/$(PKG_NAME)/Default
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-<<<<<<< HEAD
-  TITLE:=A Django app that provides helper for generating JavaScript catalog to static files.
-  URL:=https://django-statici18n.readthedocs.org/
-  DEPENDS:=+python +python-django
-=======
   TITLE:=Helper for generating JavaScript catalog to static files
   URL:=https://$(PKG_NAME).readthedocs.io
 endef
@@ -40,17 +42,12 @@ $(call Package/$(PKG_NAME)/Default)
        python-django
   VARIANT:=python
   MDEPENDS:=python-django
->>>>>>> 90527d75a... django: move django* packages under django submenu
 endef
 
-define Package/django-statici18n/description
+define Package/python-$(PKG_NAME)/description
   A Django app that provides helper for generating JavaScript catalog to static files.
 endef
 
-<<<<<<< HEAD
-define Build/Compile
-       $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
-=======
 define Package/python3-$(PKG_NAME)
 $(call Package/$(PKG_NAME)/Default)
   DEPENDS:= \
@@ -58,14 +55,18 @@ $(call Package/$(PKG_NAME)/Default)
        python3-django
   VARIANT:=python3
   MDEPENDS:=python3-django
->>>>>>> 90527d75a... django: move django* packages under django submenu
 endef
 
-define Package/django-statici18n/install
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) \
-           $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-           $(1)$(PYTHON_PKG_DIR)
+define Package/python3-$(PKG_NAME)/description
+$(call define Package/python-$(PKG_NAME)/description)
+.
+(Variant for Python3)
 endef
 
-$(eval $(call BuildPackage,django-statici18n))
+$(eval $(call PyPackage,python-$(PKG_NAME)))
+$(eval $(call BuildPackage,python-$(PKG_NAME)))
+$(eval $(call BuildPackage,python-$(PKG_NAME)-src))
+
+$(eval $(call Py3Package,python3-$(PKG_NAME)))
+$(eval $(call BuildPackage,python3-$(PKG_NAME)))
+$(eval $(call BuildPackage,python3-$(PKG_NAME)-src))