[Python-apps-commits] r8791 - in packages/s3cmd/tags (9 files)
dottedmag at users.alioth.debian.org
dottedmag at users.alioth.debian.org
Mon May 28 16:22:43 UTC 2012
Date: Monday, May 28, 2012 @ 16:22:40
Author: dottedmag
Revision: 8791
[svn-buildpackage] Tagging s3cmd 1.1.0~beta3-1
Added:
packages/s3cmd/tags/1.1.0~beta3-1/
packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog
(from rev 8790, packages/s3cmd/trunk/debian/changelog)
packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch
(from rev 8790, packages/s3cmd/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch)
packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch
(from rev 8790, packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch)
packages/s3cmd/tags/1.1.0~beta3-1/debian/watch
(from rev 8790, packages/s3cmd/trunk/debian/watch)
Deleted:
packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog
packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch
packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch
packages/s3cmd/tags/1.1.0~beta3-1/debian/watch
Deleted: packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog 2012-05-28 11:21:40 UTC (rev 8789)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog 2012-05-28 16:22:40 UTC (rev 8791)
@@ -1,152 +0,0 @@
-s3cmd (1.0.0-3) unstable; urgency=low
-
- * Do not FTBFS if built twice in a row (Closes: #671219).
-
- -- Mikhail Gusarov <dottedmag at debian.org> Fri, 04 May 2012 00:01:18 +0200
-
-s3cmd (1.0.0-2) unstable; urgency=low
-
- * debian/control: Bump Standards-Version, no changes required.
- * Switch to use dh(1).
- * Drop pre-python-2.5 stanza from debian/control.
- * Update debian/copyright to version 1.0 of machine-readable format.
- * Post-Squeeze removal of s3cmd.preinst.
-
- -- Mikhail Gusarov <dottedmag at debian.org> Thu, 22 Mar 2012 23:04:45 +0100
-
-s3cmd (1.0.0-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: Bump Standards-Version, no changes required.
- * Switch package format to 3.0 (quilt):
- - debian/control: drop quilt from Build-Depends.
- - debian/rules: simplify.
- - debian/README.source: drop.
- * Add debian/patches/fix-mangpage-typos.patch to correct typos catched
- by lintian.
-
- -- Mikhail Gusarov <dottedmag at debian.org> Mon, 28 Mar 2011 12:09:17 +0200
-
-s3cmd (0.9.9.91-1) unstable; urgency=low
-
- * New upstream release.
- * Bump Standards-Version, no changes required.
- * Drop XS-Python-Version: Debian does not have Python < 2.4 anymore.
- * Drop unused XB-Python-Version.
- * Fix preinst script: it errorneously contained 0.14-1 as a first
- python-support-managed version, not 0.9.9-2.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 20 Oct 2009 01:53:35 +0700
-
-s3cmd (0.9.9-2) unstable; urgency=low
-
- * Switched to python-support.
- - added preinst script to de-register from pycentral.
- * Standards-Version bumped to 3.8.1, no changes needed.
- * Private python modules were moved to /usr/share/s3cmd:
- - debian/s3cmd.dirs
- - debian/rules changed accordingly
- * debian/rules cleanup
- * python-all-dev build-dependency relaxed to python, as no binary
- modules are built.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Mon, 13 Apr 2009 05:08:02 +0700
-
-s3cmd (0.9.9-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 17 Feb 2009 12:21:03 +0600
-
-s3cmd (0.9.9~rc3-1) unstable; urgency=low
-
- [ Mikhail Gusarov ]
- * New upstream release.
- * debian/watch:
- - 0.9.9-rc3-speedup tarball should not be considered.
- * debian/control:
- - package description expanded, as suggested by Lintian.
- * debian/rules:
- - deprecated dh_clean -k replaced with dh_prep.
-
- [ Piotr Ożarowski ]
- * debian/watch file updated to handle -rc and -pre versions correctly
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 17 Feb 2009 01:27:27 +0600
-
-s3cmd (0.9.8.4-1) unstable; urgency=low
-
- [Mikhail Gusarov]
- * New upstream release.
-
- [Sandro Tosi]
- * debian/control
- - switch Vcs-Browser field to viewsvn
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 09 Dec 2008 01:56:19 +0600
-
-s3cmd (0.9.8.3-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 06 Sep 2008 19:58:37 +0700
-
-s3cmd (0.9.8.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 05 Jul 2008 14:35:07 +0700
-
-s3cmd (0.9.8.1-1) unstable; urgency=low
-
- * New upstream release.
- * Package is now maintained in PAPT:
- - PAPT added to Uploaders.
- * debian/rules cleaned up:
- - no need to have empty configure target
- - fixed quilt usage
- * debhelper compatibility level bumped to 7:
- - bumped debhelper build-dependency.
- * Section changed to utils.
- * python-elementtree dependency changed to python2.5 |
- python-elementtree to use ElementTree bundled in 2.5
- * Vcs-{Svn,Browser} added.
- * Standards-Version bumped to 3.8.0:
- - debian/README.source added
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 03 May 2008 14:30:29 +0700
-
-s3cmd (0.9.6-1) unstable; urgency=low
-
- * New upstream release (Closes: #471698).
- * Bumped Standards-Version (no changes required).
- * Bumped python-central dependency to >= 0.6 to get rid of empty
- /usr/lib directory.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Mon, 31 Mar 2008 23:52:49 +0700
-
-s3cmd (0.9.5-1) unstable; urgency=low
-
- * New upstream release
- - do-not-check-elementtree-at-build-time.patch refreshed.
-
- * Homepage moved from description to debian/control field.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Wed, 14 Nov 2007 03:04:49 +0600
-
-s3cmd (0.9.4-1) unstable; urgency=low
-
- * New upstream release (Closes: #438933).
- * Do not build for python2.3 as suggested by author (Closes: #432705).
- * No longer ship s3cmd.1 or setup.py in debian/ - upstream ones are ok.
- * Quilt is used to manage patches.
- - do-not-check-elementtree-at-build-time.patch added - ElementTree is
- only runtime dependency, no need to check it at build time.
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Fri, 24 Aug 2007 23:17:27 +0700
-
-s3cmd (0.9.3-1) unstable; urgency=low
-
- * Initial revision. (Closes: #427414)
-
- -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 09 Jun 2007 20:42:11 +0700
Copied: packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog (from rev 8790, packages/s3cmd/trunk/debian/changelog)
===================================================================
--- packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog (rev 0)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/changelog 2012-05-28 16:22:40 UTC (rev 8791)
@@ -0,0 +1,159 @@
+s3cmd (1.1.0~beta3-1) unstable; urgency=low
+
+ * New upstream release:
+ - debian/patches: refresh.
+
+ -- Mikhail Gusarov <dottedmag at debian.org> Mon, 28 May 2012 17:56:55 +0200
+
+s3cmd (1.0.0-3) unstable; urgency=low
+
+ * Do not FTBFS if built twice in a row (Closes: #671219).
+
+ -- Mikhail Gusarov <dottedmag at debian.org> Fri, 04 May 2012 00:01:18 +0200
+
+s3cmd (1.0.0-2) unstable; urgency=low
+
+ * debian/control: Bump Standards-Version, no changes required.
+ * Switch to use dh(1).
+ * Drop pre-python-2.5 stanza from debian/control.
+ * Update debian/copyright to version 1.0 of machine-readable format.
+ * Post-Squeeze removal of s3cmd.preinst.
+
+ -- Mikhail Gusarov <dottedmag at debian.org> Thu, 22 Mar 2012 23:04:45 +0100
+
+s3cmd (1.0.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: Bump Standards-Version, no changes required.
+ * Switch package format to 3.0 (quilt):
+ - debian/control: drop quilt from Build-Depends.
+ - debian/rules: simplify.
+ - debian/README.source: drop.
+ * Add debian/patches/fix-mangpage-typos.patch to correct typos catched
+ by lintian.
+
+ -- Mikhail Gusarov <dottedmag at debian.org> Mon, 28 Mar 2011 12:09:17 +0200
+
+s3cmd (0.9.9.91-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump Standards-Version, no changes required.
+ * Drop XS-Python-Version: Debian does not have Python < 2.4 anymore.
+ * Drop unused XB-Python-Version.
+ * Fix preinst script: it errorneously contained 0.14-1 as a first
+ python-support-managed version, not 0.9.9-2.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 20 Oct 2009 01:53:35 +0700
+
+s3cmd (0.9.9-2) unstable; urgency=low
+
+ * Switched to python-support.
+ - added preinst script to de-register from pycentral.
+ * Standards-Version bumped to 3.8.1, no changes needed.
+ * Private python modules were moved to /usr/share/s3cmd:
+ - debian/s3cmd.dirs
+ - debian/rules changed accordingly
+ * debian/rules cleanup
+ * python-all-dev build-dependency relaxed to python, as no binary
+ modules are built.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Mon, 13 Apr 2009 05:08:02 +0700
+
+s3cmd (0.9.9-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 17 Feb 2009 12:21:03 +0600
+
+s3cmd (0.9.9~rc3-1) unstable; urgency=low
+
+ [ Mikhail Gusarov ]
+ * New upstream release.
+ * debian/watch:
+ - 0.9.9-rc3-speedup tarball should not be considered.
+ * debian/control:
+ - package description expanded, as suggested by Lintian.
+ * debian/rules:
+ - deprecated dh_clean -k replaced with dh_prep.
+
+ [ Piotr Ożarowski ]
+ * debian/watch file updated to handle -rc and -pre versions correctly
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 17 Feb 2009 01:27:27 +0600
+
+s3cmd (0.9.8.4-1) unstable; urgency=low
+
+ [Mikhail Gusarov]
+ * New upstream release.
+
+ [Sandro Tosi]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Tue, 09 Dec 2008 01:56:19 +0600
+
+s3cmd (0.9.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 06 Sep 2008 19:58:37 +0700
+
+s3cmd (0.9.8.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 05 Jul 2008 14:35:07 +0700
+
+s3cmd (0.9.8.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Package is now maintained in PAPT:
+ - PAPT added to Uploaders.
+ * debian/rules cleaned up:
+ - no need to have empty configure target
+ - fixed quilt usage
+ * debhelper compatibility level bumped to 7:
+ - bumped debhelper build-dependency.
+ * Section changed to utils.
+ * python-elementtree dependency changed to python2.5 |
+ python-elementtree to use ElementTree bundled in 2.5
+ * Vcs-{Svn,Browser} added.
+ * Standards-Version bumped to 3.8.0:
+ - debian/README.source added
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 03 May 2008 14:30:29 +0700
+
+s3cmd (0.9.6-1) unstable; urgency=low
+
+ * New upstream release (Closes: #471698).
+ * Bumped Standards-Version (no changes required).
+ * Bumped python-central dependency to >= 0.6 to get rid of empty
+ /usr/lib directory.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Mon, 31 Mar 2008 23:52:49 +0700
+
+s3cmd (0.9.5-1) unstable; urgency=low
+
+ * New upstream release
+ - do-not-check-elementtree-at-build-time.patch refreshed.
+
+ * Homepage moved from description to debian/control field.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Wed, 14 Nov 2007 03:04:49 +0600
+
+s3cmd (0.9.4-1) unstable; urgency=low
+
+ * New upstream release (Closes: #438933).
+ * Do not build for python2.3 as suggested by author (Closes: #432705).
+ * No longer ship s3cmd.1 or setup.py in debian/ - upstream ones are ok.
+ * Quilt is used to manage patches.
+ - do-not-check-elementtree-at-build-time.patch added - ElementTree is
+ only runtime dependency, no need to check it at build time.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Fri, 24 Aug 2007 23:17:27 +0700
+
+s3cmd (0.9.3-1) unstable; urgency=low
+
+ * Initial revision. (Closes: #427414)
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 09 Jun 2007 20:42:11 +0700
Deleted: packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch 2012-05-28 11:21:40 UTC (rev 8789)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch 2012-05-28 16:22:40 UTC (rev 8791)
@@ -1,41 +0,0 @@
-Upstream checks for the presence of ElementTree at the build time. This is
-unnecessary (ET is only used run-time), but he prefers it this way, so let's
-just ignore this check.
-
-Index: s3cmd-0.9.5/setup.py
-===================================================================
---- s3cmd-0.9.5.orig/setup.py 2007-08-25 07:46:25.000000000 +0700
-+++ s3cmd-0.9.5/setup.py 2007-11-20 03:24:38.000000000 +0600
-@@ -9,19 +9,19 @@
- sys.stderr.write("S3cmd requires Python 2.4 or newer.\n")
- sys.exit(1)
-
--try:
-- import xml.etree.ElementTree as ET
-- print "Using xml.etree.ElementTree for XML processing"
--except ImportError, e:
-- sys.stderr.write(str(e) + "\n")
-- try:
-- import elementtree.ElementTree as ET
-- print "Using elementtree.ElementTree for XML processing"
-- except ImportError, e:
-- sys.stderr.write(str(e) + "\n")
-- sys.stderr.write("Please install ElementTree module from\n")
-- sys.stderr.write("http://effbot.org/zone/element-index.htm\n")
-- sys.exit(1)
-+#try:
-+# import xml.etree.ElementTree as ET
-+# print "Using xml.etree.ElementTree for XML processing"
-+#except ImportError, e:
-+# sys.stderr.write(str(e) + "\n")
-+# try:
-+# import elementtree.ElementTree as ET
-+# print "Using elementtree.ElementTree for XML processing"
-+# except ImportError, e:
-+# sys.stderr.write(str(e) + "\n")
-+# sys.stderr.write("Please install ElementTree module from\n")
-+# sys.stderr.write("http://effbot.org/zone/element-index.htm\n")
-+# sys.exit(1)
-
- try:
- ## Remove 'MANIFEST' file to force
Copied: packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch (from rev 8790, packages/s3cmd/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch)
===================================================================
--- packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch (rev 0)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/do-not-check-elementtree-at-build-time.patch 2012-05-28 16:22:40 UTC (rev 8791)
@@ -0,0 +1,39 @@
+Upstream checks for the presence of ElementTree at the build time. This is
+unnecessary (ET is only used run-time), but he prefers it this way, so let's
+just ignore this check.
+
+--- a/setup.py.orig 2012-01-02 14:16:53.000000000 +0100
++++ a/setup.py 2012-05-28 18:01:54.960661346 +0200
+@@ -9,19 +9,19 @@
+ sys.stderr.write("S3cmd requires Python 2.4 or newer.\n")
+ sys.exit(1)
+
+-try:
+- import xml.etree.ElementTree as ET
+- print "Using xml.etree.ElementTree for XML processing"
+-except ImportError, e:
+- sys.stderr.write(str(e) + "\n")
+- try:
+- import elementtree.ElementTree as ET
+- print "Using elementtree.ElementTree for XML processing"
+- except ImportError, e:
+- sys.stderr.write(str(e) + "\n")
+- sys.stderr.write("Please install ElementTree module from\n")
+- sys.stderr.write("http://effbot.org/zone/element-index.htm\n")
+- sys.exit(1)
++#try:
++# import xml.etree.ElementTree as ET
++# print "Using xml.etree.ElementTree for XML processing"
++#except ImportError, e:
++# sys.stderr.write(str(e) + "\n")
++# try:
++# import elementtree.ElementTree as ET
++# print "Using elementtree.ElementTree for XML processing"
++# except ImportError, e:
++# sys.stderr.write(str(e) + "\n")
++# sys.stderr.write("Please install ElementTree module from\n")
++# sys.stderr.write("http://effbot.org/zone/element-index.htm\n")
++# sys.exit(1)
+
+ try:
+ ## Remove 'MANIFEST' file to force
Deleted: packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch 2012-05-28 11:21:40 UTC (rev 8789)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch 2012-05-28 16:22:40 UTC (rev 8791)
@@ -1,73 +0,0 @@
-# Fix warnings catched by lintian: spelling, bare hyphen, unintended
-# 'Cache-Control' expansion as macro
---- a/s3cmd.1 2011-01-09 10:03:06.000000000 +0100
-+++ b/s3cmd.1 2011-03-28 12:24:06.441185593 +0200
-@@ -60,7 +60,7 @@
- s3cmd \fBaccesslog\fR \fIs3://BUCKET\fR
- Enable/disable bucket access logging
- .TP
--s3cmd \fBsign\fR \fISTRING-TO-SIGN\fR
-+s3cmd \fBsign\fR \fISTRING\-TO\-SIGN\fR
- Sign arbitrary string using the secret key
- .TP
- s3cmd \fBfixbucket\fR \fIs3://BUCKET[/PREFIX]\fR
-@@ -179,14 +179,14 @@
- from sync
- .TP
- \fB\-\-exclude\-from\fR=FILE
--Read --exclude GLOBs from FILE
-+Read \-\-exclude GLOBs from FILE
- .TP
- \fB\-\-rexclude\fR=REGEXP
- Filenames and paths matching REGEXP (regular
- expression) will be excluded from sync
- .TP
- \fB\-\-rexclude\-from\fR=FILE
--Read --rexclude REGEXPs from FILE
-+Read \-\-rexclude REGEXPs from FILE
- .TP
- \fB\-\-include\fR=GLOB
- Filenames and paths matching GLOB will be included
-@@ -195,14 +195,14 @@
- \fB\-\-(r)exclude(\-from)\fR patterns
- .TP
- \fB\-\-include\-from\fR=FILE
--Read --include GLOBs from FILE
-+Read \-\-include GLOBs from FILE
- .TP
- \fB\-\-rinclude\fR=REGEXP
--Same as --include but uses REGEXP (regular expression)
-+Same as \-\-include but uses REGEXP (regular expression)
- instead of GLOB
- .TP
- \fB\-\-rinclude\-from\fR=FILE
--Read --rinclude REGEXPs from FILE
-+Read \-\-rinclude REGEXPs from FILE
- .TP
- \fB\-\-bucket\-location\fR=BUCKET_LOCATION
- Datacentre to create bucket in. As of now the
-@@ -226,13 +226,13 @@
- .TP
- \fB\-M\fR, \fB\-\-guess\-mime\-type\fR
- Guess MIME-type of files by their extension. Falls
--back to default MIME-Type as specified by --mime-type
-+back to default MIME\-Type as specified by \-\-mime-type
- option
- .TP
- \fB\-\-add\-header\fR=NAME:VALUE
- Add a given HTTP header to the upload request. Can be
- used multiple times. For instance set 'Expires' or
--'Cache-Control' headers (or both) using this options
-+\&'Cache-Control' headers (or both) using this options
- if you like.
- .TP
- \fB\-\-encoding\fR=ENCODING
-@@ -386,7 +386,7 @@
- .SH AUTHOR
- Written by Michal Ludvig <mludvig at logix.net.nz> and 15+ contributors
- .SH CONTACT, SUPPORT
--Prefered way to get support is our mailing list:
-+Preferred way to get support is our mailing list:
- .I s3tools\-general at lists.sourceforge.net
- .SH REPORTING BUGS
- Report bugs to
Copied: packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch (from rev 8790, packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch)
===================================================================
--- packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch (rev 0)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/patches/fix-manpage-typos.patch 2012-05-28 16:22:40 UTC (rev 8791)
@@ -0,0 +1,96 @@
+# Fix warnings catched by lintian: spelling, bare hyphen, unintended
+# 'Cache-Control' expansion as macro
+--- s3cmd-1.1.0-beta3/s3cmd.1.orig 2012-05-28 18:06:12.399467659 +0200
++++ s3cmd-1.1.0-beta3/s3cmd.1 2012-05-28 18:11:01.354580791 +0200
+@@ -60,7 +60,7 @@
+ s3cmd \fBaccesslog\fR \fIs3://BUCKET\fR
+ Enable/disable bucket access logging
+ .TP
+-s3cmd \fBsign\fR \fISTRING-TO-SIGN\fR
++s3cmd \fBsign\fR \fISTRING\-TO\-SIGN\fR
+ Sign arbitrary string using the secret key
+ .TP
+ s3cmd \fBfixbucket\fR \fIs3://BUCKET[/PREFIX]\fR
+@@ -116,7 +116,7 @@
+ .TP
+ \fB\-\-configure\fR
+ Invoke interactive (re)configuration tool. Optionally
+-use as '\fB--configure\fR s3://come-bucket' to test access
++use as '\fB\-\-configure\fR s3://come\-bucket' to test access
+ to a specific bucket instead of attempting to list
+ them all.
+ .TP
+@@ -198,29 +198,29 @@
+ from sync
+ .TP
+ \fB\-\-exclude\-from\fR=FILE
+-Read --exclude GLOBs from FILE
++Read \-\-exclude GLOBs from FILE
+ .TP
+ \fB\-\-rexclude\fR=REGEXP
+ Filenames and paths matching REGEXP (regular
+ expression) will be excluded from sync
+ .TP
+ \fB\-\-rexclude\-from\fR=FILE
+-Read --rexclude REGEXPs from FILE
++Read \-\-rexclude REGEXPs from FILE
+ .TP
+ \fB\-\-include\fR=GLOB
+ Filenames and paths matching GLOB will be included
+ even if previously excluded by one of
+-\fB--(r)exclude(-from)\fR patterns
++\fB\-\-(r)exclude(\-from)\fR patterns
+ .TP
+ \fB\-\-include\-from\fR=FILE
+-Read --include GLOBs from FILE
++Read \-\-include GLOBs from FILE
+ .TP
+ \fB\-\-rinclude\fR=REGEXP
+-Same as --include but uses REGEXP (regular expression)
++Same as \-\-include but uses REGEXP (regular expression)
+ instead of GLOB
+ .TP
+ \fB\-\-rinclude\-from\fR=FILE
+-Read --rinclude REGEXPs from FILE
++Read \-\-rinclude REGEXPs from FILE
+ .TP
+ \fB\-\-bucket\-location\fR=BUCKET_LOCATION
+ Datacentre to create bucket in. As of now the
+@@ -244,22 +244,22 @@
+ default is binary/octet-stream.
+ .TP
+ \fB\-\-guess\-mime\-type\fR
+-Guess MIME-type of files by their extension or mime
+-magic. Fall back to default MIME-Type as specified by
+-\fB--default-mime-type\fR option
++Guess MIME\-type of files by their extension or mime
++magic. Fall back to default MIME\-Type as specified by
++\fB\-\-default-mime-type\fR option
+ .TP
+ \fB\-\-no\-guess\-mime\-type\fR
+ Don't guess MIME-type and use the default type
+ instead.
+ .TP
+ \fB\-m\fR MIME/TYPE, \fB\-\-mime\-type\fR=MIME/TYPE
+-Force MIME-type. Override both \fB--default-mime-type\fR and
+-\fB--guess-mime-type\fR.
++Force MIME\-type. Override both \fB\-\-default\-mime\-type\fR and
++\fB\-\-guess-mime-type\fR.
+ .TP
+ \fB\-\-add\-header\fR=NAME:VALUE
+ Add a given HTTP header to the upload request. Can be
+ used multiple times. For instance set 'Expires' or
+-'Cache-Control' headers (or both) using this options
++\&'Cache-Control' headers (or both) using this options
+ if you like.
+ .TP
+ \fB\-\-encoding\fR=ENCODING
+@@ -435,7 +435,7 @@
+ .SH AUTHOR
+ Written by Michal Ludvig <mludvig at logix.net.nz> and 15+ contributors
+ .SH CONTACT, SUPPORT
+-Prefered way to get support is our mailing list:
++Preferred way to get support is our mailing list:
+ .I s3tools\-general at lists.sourceforge.net
+ .SH REPORTING BUGS
+ Report bugs to
Deleted: packages/s3cmd/tags/1.1.0~beta3-1/debian/watch
===================================================================
--- packages/s3cmd/trunk/debian/watch 2012-05-28 11:21:40 UTC (rev 8789)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/watch 2012-05-28 16:22:40 UTC (rev 8791)
@@ -1,2 +0,0 @@
-version=3
-opts=uversionmangle=s/-(pre|rc)/~$1/;s/-(speedup)/~$1/ http://sf.net/s3tools/s3cmd-(.*)\.tar\.gz
Copied: packages/s3cmd/tags/1.1.0~beta3-1/debian/watch (from rev 8790, packages/s3cmd/trunk/debian/watch)
===================================================================
--- packages/s3cmd/tags/1.1.0~beta3-1/debian/watch (rev 0)
+++ packages/s3cmd/tags/1.1.0~beta3-1/debian/watch 2012-05-28 16:22:40 UTC (rev 8791)
@@ -0,0 +1,2 @@
+version=3
+opts=uversionmangle=s/-(beta|pre|rc)/~$1/;s/-(speedup)/~$1/ http://sf.net/s3tools/s3cmd-(.*)\.tar\.gz
More information about the Python-apps-commits
mailing list