python-mysql: rename to python-mysqlclient & bump to version 1.4.4

The package on PyPi is named `mysqlclient`.
This should have been named `python-mysqlclient` from the start.
There is a `mysql` package on PyPi already but that's a different
code/package.

Doing this should avoid any future confusion.
There is no good time to do this rename; at least 19.07 has been branched
already and this can go into the next release [in a year or so].

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/lang/python/python-mysql/Makefile b/lang/python/python-mysql/Makefile
deleted file mode 100644 (file)
index 3ad9816..0000000
--- a/lang/python/python-mysql/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2007-2018 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python-mysql
-PKG_VERSION:=1.3.14
-PKG_RELEASE:=2
-PKG_LICENSE:=GPL-2.0
-
-PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/m/mysqlclient
-PKG_HASH:=3981ae9ce545901a36a8b7aed76ed02960a429f75dc53b7ad77fb2f9ab7cd56b
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-mysql-$(PKG_VERSION)
-PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-include ../python-package.mk
-include ../python3-package.mk
-# python-mysql needs iconv
-include $(INCLUDE_DIR)/nls.mk
-
-PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-
-define Package/python-mysql/Default
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  URL:=https://pypi.python.org/project/mysqlclient
-endef
-
-define Package/python-mysql
-  $(call Package/python-mysql/Default)
-  TITLE:=MySQL database adapter for Python
-  DEPENDS:=+PACKAGE_python-mysql:python +libmysqlclient
-  VARIANT:=python
-endef
-
-define Package/python3-mysql
-  $(call Package/python-mysql/Default)
-  TITLE:=MySQL database adapter for Python3
-  DEPENDS:=+PACKAGE_python3-mysql:python3 +libmysqlclient
-  VARIANT:=python3
-endef
-
-define Package/python-mysql/description
- MySQLdb is an thread-compatible interface to the popular MySQL database
- server that provides the Python database API.
-endef
-
-define Package/python3-mysql/description
-$(call Package/python-mysql/description)
-.
-(Variant for Python3)
-endef
-
-$(eval $(call PyPackage,python-mysql))
-$(eval $(call BuildPackage,python-mysql))
-
-$(eval $(call Py3Package,python3-mysql))
-$(eval $(call BuildPackage,python3-mysql))

diff --git a/lang/python/python-mysqlclient/Makefile b/lang/python/python-mysqlclient/Makefile
new file mode 100644 (file)
index 0000000..626c696
--- /dev/null
+++ b/lang/python/python-mysqlclient/Makefile
@@ -0,0 +1,67 @@
+#
+# Copyright (C) 2007-2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-mysqlclient
+PKG_VERSION:=1.4.4
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/m/mysqlclient
+PKG_HASH:=9c737cc55a5dc8dd3583a942d5a9b21be58d16f00f5fefca4e575e7d9682e98c
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-mysqlclient-$(PKG_VERSION)
+PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+include ../python-package.mk
+include ../python3-package.mk
+# python-mysqlclient needs iconv
+include $(INCLUDE_DIR)/nls.mk
+
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/python-mysqlclient/Default
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  URL:=https://mysqlclient.readthedocs.io/
+endef
+
+define Package/python-mysqlclient
+  $(call Package/python-mysqlclient/Default)
+  TITLE:=MySQL database adapter for Python
+  DEPENDS:=+PACKAGE_python-mysqlclient:python +libmysqlclient
+  VARIANT:=python
+endef
+
+define Package/python3-mysqlclient
+  $(call Package/python-mysqlclient/Default)
+  TITLE:=MySQL database adapter for Python3
+  DEPENDS:=+PACKAGE_python3-mysqlclient:python3 +libmysqlclient
+  VARIANT:=python3
+endef
+
+define Package/python-mysqlclient/description
+ MySQLdb is an thread-compatible interface to the popular MySQL database
+ server that provides the Python database API.
+endef
+
+define Package/python3-mysqlclient/description
+$(call Package/python-mysqlclient/description)
+.
+(Variant for Python3)
+endef
+
+$(eval $(call PyPackage,python-mysqlclient))
+$(eval $(call BuildPackage,python-mysqlclient))
+$(eval $(call BuildPackage,python-mysqlclient-src))
+
+$(eval $(call Py3Package,python3-mysqlclient))
+$(eval $(call BuildPackage,python3-mysqlclient))
+$(eval $(call BuildPackage,python3-mysqlclient-src))

diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index d34d7c481fb154c299feb1f34bbbd063939d92ab..aabb4eb07818b95ed60aee96eb193c0214b708f9 100644 (file)
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -39,7 +39,8 @@ define Package/seafile-server
     CATEGORY:=Network
     TITLE:=Seafile server
     URL:=https://seafile.com/
-    DEPENDS:=+libarchive +libopenssl +glib2 +libsearpc +seafile-ccnet +seafile-seahub +sqlite3-cli +python-mysql +python-urllib3 \
+    DEPENDS:=+libarchive +libopenssl +glib2 +libsearpc +seafile-ccnet +seafile-seahub +sqlite3-cli \
+               +python-mysqlclient +python-urllib3 \
                +jansson +libevent2 +libevent2-openssl +zlib +libzdb +libsqlite3 +libmysqlclient +oniguruma \
                +libpthread +libuuid +bash +procps-ng +procps-ng-pkill +SEAFILE_FUSE_SUPPORT:libfuse $(ICONV_DEPENDS)
     MENU:=1