Merge pull request #2 from matplotlib/master

merge changes from master

Author: Jeff Whitaker

setup.py

@@ -109,17 +109,18 @@ def checkversion(GEOS_dir):
 datafiles = [os.path.join('data',os.path.basename(f)) for f in datafiles]
 package_data = {'mpl_toolkits.basemap':datafiles}
 
+__version__ = "1.0.8"
 setup(
   name              = "basemap",
-  version           = "1.0.8",
+  version           = __version__,
   description       = "Plot data on map projections with matplotlib",
   long_description  = """
   An add-on toolkit for matplotlib that lets you plot data
   on map projections with coastlines, lakes, rivers and political boundaries.
   See http://www.scipy.org/wikis/topical_software/Maps for an
   example of what it can do.""",
   url               = "http://matplotlib.sourceforge.net/toolkits.html",
-  download_url      = "http://sourceforge.net/projects/matplotlib",
+  download_url      = "https://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-{0}/basemap-{0}.tar.gz".format(__version__),
   author            = "Jeff Whitaker",
   author_email      = "jeffrey.s.whitaker@noaa.gov",
   platforms         = ["any"],