Merge branch '3.1' into 3.2

This commit is contained in:
Danny Rawlins 2015-11-30 20:30:47 +11:00
commit 89473154b9
3 changed files with 10 additions and 10 deletions

View File

@ -42,14 +42,14 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pkg_resources/_vendor/packa
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pkg_resources/_vendor/packaging/version.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pkg_resources/_vendor/packaging/version.pyc
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pkg_resources/_vendor/packaging/version.pyo
drwxr-xr-x root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/top_level.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.4-py2.7.egg-info/zip-safe
drwxr-xr-x root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/top_level.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools-18.6.1-py2.7.egg-info/zip-safe
drwxr-xr-x root/root usr/lib/python2.7/site-packages/setuptools/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/setuptools/__init__.pyc

View File

@ -1 +1 @@
214c6c43bd7035e870c1beab402c48e7 setuptools-18.4.tar.gz
d4797a533b3c7466fd36a791c2de94d2 setuptools-18.6.1.tar.gz

View File

@ -5,7 +5,7 @@
# Depends on: python
name=setuptools
version=18.4
version=18.6.1
release=1
source=(http://pypi.python.org/packages/source/s/$name/$name-$version.tar.gz)