@@ -1,6 +1,8 @@

 2007-04-09  Michal Ludvig  <michal@logix.cz>

 	* s3cmd.1: Added manpage

+	* Updated infrastructure files to create "better"

+	  distribution archives.

 2007-03-26  Michal Ludvig  <michal@logix.cz>

new file mode 100644

@@ -0,0 +1,2 @@

+include INSTALL README NEWS

+include s3cmd.1.gz

@@ -1,5 +1,5 @@

 package = "s3cmd"

-version = "0.9.1"

+version = "0.9.2"

 url = "http://s3tools.logix.cz"

 license = "GPL version 2"

 short_description = "S3cmd is a tool for managing Amazon S3 storage space."

@@ -274,21 +274,24 @@ if __name__ == '__main__':

 	optparser.set_defaults(config=os.getenv("HOME")+"/.s3cfg")

 	optparser.set_defaults(verbosity = default_verbosity)

+	optparser.add_option(      "--configure", dest="run_configure", action="store_true", help="Invoke interactive (re)configuration tool.")

 	optparser.add_option("-c", "--config", dest="config", metavar="FILE", help="Config file name. Defaults to %default")

-	optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form.")

+	optparser.add_option(      "--dump-config", dest="dump_config", action="store_true", help="Dump current configuration after parsing config files and command line options and exit.")

+

 	optparser.add_option("-f", "--force", dest="force", action="store_true", help="Force overwrite and other dangerous operations.")

-	optparser.add_option("-u", "--show-uri", dest="show_uri", action="store_true", help="Show complete S3 URI in listings.")

 	optparser.add_option("-P", "--acl-public", dest="acl_public", action="store_true", help="Store objects with ACL allowing read by anyone.")

+

 	optparser.add_option("-m", "--mime-type", dest="default_mime_type", type="mimetype", metavar="MIME/TYPE", help="Default MIME-type to be set for objects stored.")

 	optparser.add_option("-M", "--guess-mime-type", dest="guess_mime_type", action="store_true", help="Guess MIME-type of files by their extension. Falls back to default MIME-Type as specified by --mime-type option")

-	optparser.add_option(      "--dump-config", dest="dump_config", action="store_true", help="Dump current configuration after parsin config files and command line options and exit.")

-	optparser.add_option(      "--configure", dest="run_configure", action="store_true", help="Invoke interactive (re)configuration tool.")

-	optparser.add_option("-d", "--debug", dest="verbosity", action="store_const", const=logging.DEBUG, help="Enable debug output.")

+

+	optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form.")

+	optparser.add_option("-u", "--show-uri", dest="show_uri", action="store_true", help="Show complete S3 URI in listings.")

 	optparser.add_option("-v", "--verbose", dest="verbosity", action="store_const", const=logging.INFO, help="Enable verbose output.")

+	optparser.add_option("-d", "--debug", dest="verbosity", action="store_const", const=logging.DEBUG, help="Enable debug output.")

 	optparser.add_option(      "--version", dest="show_version", action="store_true", help="Show s3cmd version (%s) and exit." % (S3.PkgInfo.version))

 	optparser.set_usage(optparser.usage + " COMMAND [parameters]")

-	optparser.set_description('S3cmd is a tool to manage objects in '+

+	optparser.set_description('S3cmd is a tool for managing objects in '+

 		'Amazon S3 storage. It allows for making and removing '+

 		'"buckets" and uploading, downloading and removing '+

 		'"objects" from these buckets.')

@@ -1,7 +1,10 @@

 [sdist]

 formats = gztar,zip

+[install]

+prefix = /usr

+

 [bdist_rpm]

 requires = python >= 2.4

 group = Productivity/Archiving

-doc-files = README

+doc-files = README, INSTALL, NEWS

@@ -3,18 +3,28 @@ import os

 import S3.PkgInfo

+## Remove 'MANIFEST' file to force

+## distutils to recreate it

 try:

 	os.unlink("MANIFEST")

 except:

 	pass

+## Compress manpage. It behaves weird 

+## with bdist_rpm when not compressed.

+os.system("gzip s3cmd.1")

+

+## Main distutils info

 setup(

 	## Content description

 	name = S3.PkgInfo.package,

 	version = S3.PkgInfo.version,

 	packages = [ 'S3' ],

 	scripts = ['s3cmd'],

-	data_files = [ ("share/s3cmd", [ "README", "INSTALL", "NEWS" ]), ],

+	data_files = [

+		("share/doc/packages/s3cmd", [ "README", "INSTALL", "NEWS" ]),

+		("share/man/man1", [ "s3cmd.1.gz" ] ),

+	],

 	## Packaging details

 	author = "Michal Ludvig",