Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

django-web-pack-loader: fix changes in merge conflict

Browse source
This commit is contained in:
Josef Schlehofer 2019-10-23 09:15:47 +02:00
parent 0acc2e7a2c
commit c4782e6e8b
No known key found for this signature in database
GPG key ID: B950216FE4329F4C
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lang/python/django-webpack-loader/Makefile
View file

@ -7,28 +7,30 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-webpack-loader PKG_NAME:=django-webpack-loader
PKG_VERSION:=0.6.0 PKG_VERSION:=0.6.0
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/${PKG_NAME} PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/${PKG_NAME}
PKG_HASH:=60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520 PKG_HASH:=60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520
PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../python-package.mk include ../python-package.mk
include ../python3-package.mk
define Package/django-webpack-loader PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
define Package/$(PKG_NAME)/Default
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Transparently use webpack in django TITLE:=Transparently use webpack in django
URL:=https://github.com/owais/django-webpack-loader URL:=https://github.com/owais/django-webpack-loader
<<<<<<< HEAD
DEPENDS:=+python +python-django
=======
endef endef
define Package/python-$(PKG_NAME) define Package/python-$(PKG_NAME)
@ -36,20 +38,14 @@ $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
python-django python-django
>>>>>>> 90527d75a... django: move django* packages under django submenu
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django MDEPENDS:=python-django
endef endef
define Package/django-webpack-loader/description define Package/python-$(PKG_NAME)/description
Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers. Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers.
endef endef
<<<<<<< HEAD
$(eval $(call PyPackage,django-webpack-loader))
$(eval $(call BuildPackage,django-webpack-loader))
$(eval $(call BuildPackage,django-webpack-loader-src))
=======
define Package/python3-$(PKG_NAME) define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
@ -72,4 +68,3 @@ $(eval $(call BuildPackage,python-$(PKG_NAME)-src))
$(eval $(call Py3Package,python3-$(PKG_NAME))) $(eval $(call Py3Package,python3-$(PKG_NAME)))
$(eval $(call BuildPackage,python3-$(PKG_NAME))) $(eval $(call BuildPackage,python3-$(PKG_NAME)))
$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) $(eval $(call BuildPackage,python3-$(PKG_NAME)-src))
>>>>>>> 90527d75a... django: move django* packages under django submenu