From: cshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 18 Jul 2010 15:09:10 +0000 (+0000)
Subject: [packages] lang/python: Fixed duplicate files in python and python-mini packages... 
X-Git-Url: http://git.archive.openwrt.org/?p=packages.git;a=commitdiff_plain;h=b62e75de8fde20ea025061b1c171f5c486d0ed63

[packages] lang/python: Fixed duplicate files in python and python-mini packages by remove files in python-mini from python (since python depends on python mini).  Also added three new module packages.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22278 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/lang/python/Makefile b/lang/python/Makefile
index d441c3de5..efc99a2f5 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -73,12 +73,24 @@ $(call Package/python/Default)
   DEPENDS+=+python-mini +libexpat
 endef
 
+define Package/python-gzip
+$(call Package/python/Default)
+  TITLE:=Python support for gzip
+  DEPENDS+=+python-mini
+endef
+
 define Package/python-openssl
 $(call Package/python/Default)
  TITLE:=Python support for OpenSSL
  DEPENDS+=+python-mini +libopenssl
 endef
 
+define Package/python-shutil
+$(call Package/python/Default)
+  TITLE:=Python support for shutil
+  DEPENDS+=+python-mini
+endef
+
 define Package/python-sqlite3
 $(call Package/python/Default)
  TITLE:=Python support for sqlite3
@@ -224,9 +236,13 @@ define PyPackage/python/filespec
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/grp.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/itertools.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/math.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_md5.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/operator.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_random.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/select.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha256.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha512.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_socket.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/strop.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_struct.so
@@ -366,10 +382,18 @@ define PyPackage/python-expat/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
 endef
 
+define PyPackage/python-gzip/filespec
++|/usr/lib/python$(PYTHON_VERSION)/gzip.py
+endef
+
 define PyPackage/python-openssl/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so
 endef
 
+define PyPackage/python-shutil/filespec
++|/usr/lib/python$(PYTHON_VERSION)/shutil.py
+endef
+
 define PyPackage/python-sqlite3/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/sqlite3
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so
@@ -383,7 +407,9 @@ $(eval $(call PyPackage,python))
 $(eval $(call PyPackage,python-mini))
 $(eval $(call PyPackage,python-doc))
 $(eval $(call PyPackage,python-expat))
+$(eval $(call PyPackage,python-gzip))
 $(eval $(call PyPackage,python-openssl))
+$(eval $(call PyPackage,python-shutil))
 $(eval $(call PyPackage,python-sqlite3))
 $(eval $(call PyPackage,python-gdbm))
 
@@ -391,6 +417,8 @@ $(eval $(call BuildPackage,python))
 $(eval $(call BuildPackage,python-mini))
 $(eval $(call BuildPackage,python-doc))
 $(eval $(call BuildPackage,python-expat))
+$(eval $(call BuildPackage,python-gzip))
 $(eval $(call BuildPackage,python-openssl))
+$(eval $(call BuildPackage,python-shutil))
 $(eval $(call BuildPackage,python-sqlite3))
 $(eval $(call BuildPackage,python-gdbm))