Fixing setup.py and MANIFEST to make a clean release with setup.py sd…

…ist and bumping version number to avoid confusion.

MANIFEST.in

@@ -1 +1,12 @@
 include boto/cacerts/cacerts.txt
+include README.markdown
+include Changelog.rst
+include boto/file/README
+include .gitignore
+include pylintrc
+include boto/pyami/copybot.cfg
+include boto/services/sonofmmm.cfg
+include boto/mturk/test/*.doctest
+include boto/mturk/test/.gitignore
+include tests/s3/other_cacerts.txt
+recursive-include docs *

README.markdown

@@ -1,6 +1,6 @@
 # boto
-boto 2.2.0
-31-Jan-2012
+boto 2.2.1
+01-Feb-2012
 
 ## Introduction
 

boto/__init__.py

@@ -31,7 +31,7 @@
 import urlparse
 from boto.exception import InvalidUriError
 
-__version__ = '2.2.0-dev'
+__version__ = '2.2.1'
 Version = __version__ # for backware compatibility
 
 UserAgent = 'Boto/%s (%s)' % (__version__, sys.platform)

setup.py

@@ -50,15 +50,22 @@
                  "bin/list_instances", "bin/taskadmin", "bin/kill_instance",
                  "bin/bundle_image", "bin/pyami_sendmail", "bin/lss3",
                  "bin/cq", "bin/route53", "bin/s3multiput", "bin/cwutil",
-                 "bin/instance_events"],
+                 "bin/instance_events", "bin/asadmin"],
       url = "http://code.google.com/p/boto/",
       packages = ["boto", "boto.sqs", "boto.s3", "boto.gs", "boto.file",
                   "boto.ec2", "boto.ec2.cloudwatch", "boto.ec2.autoscale",
                   "boto.ec2.elb", "boto.sdb", "boto.cacerts",
-                  "boto.sdb.db", "boto.sdb.db.manager", "boto.mturk",
-                  "boto.pyami", "boto.mashups", "boto.contrib", "boto.manage",
-                  "boto.services", "boto.cloudfront", "boto.roboto",
-                  "boto.rds", "boto.vpc", "boto.fps", "boto.emr", "boto.sns",
+                  "boto.sdb.db", "boto.sdb.db.manager",
+                  "boto.mturk", "boto.mturk.test", "boto.pyami",
+                  "boto.pyami.installers", "boto.pyami.installers.ubuntu",
+                  "boto.mashups", "boto.contrib", "boto.manage",
+                  "tests", "tests.autoscale", "tests.cloudfront",
+                  "tests.devpay", "tests.db", "tests.dynamodb",
+                  "tests.ec2", "tests.ec2.cloudwatch", "tests.ec2.elb",
+                  "tests.s3", "tests.sdb", "tests.sqs", "tests.sts",
+                  "tests.utils", "boto.services", "boto.cloudfront",
+                  "boto.roboto", "boto.rds", "boto.vpc", "boto.fps",
+                  "boto.fps.test", "boto.emr", "boto.emr.tests", "boto.sns",
                   "boto.ecs", "boto.iam", "boto.route53", "boto.ses",
                   "boto.cloudformation", "boto.sts", "boto.dynamodb"],
       package_data = {"boto.cacerts": ["cacerts.txt"]},