debian/0000755000000000000000000000000012163040235007162 5ustar debian/changelog0000644000000000000000000001252612163027456011054 0ustar s3cmd (1.1.0~beta3-2) unstable; urgency=low [ Jakub Wilk ] * Use canonical URIs for Vcs-* fields. [ Stefano Rivera ] * Team upload. * Fix crash in multi-part uploads (Closes: #683558, LP: #1188160) -- Stefano Rivera Thu, 27 Jun 2013 14:25:05 +0200 s3cmd (1.1.0~beta3-1) unstable; urgency=low * New upstream release: - debian/patches: refresh. -- Mikhail Gusarov 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 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 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 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 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 Mon, 13 Apr 2009 05:08:02 +0700 s3cmd (0.9.9-1) unstable; urgency=low * New upstream release. -- Mikhail Gusarov 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 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 Tue, 09 Dec 2008 01:56:19 +0600 s3cmd (0.9.8.3-1) unstable; urgency=low * New upstream release. -- Mikhail Gusarov Sat, 06 Sep 2008 19:58:37 +0700 s3cmd (0.9.8.2-1) unstable; urgency=low * New upstream release. -- Mikhail Gusarov 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 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 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 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 Fri, 24 Aug 2007 23:17:27 +0700 s3cmd (0.9.3-1) unstable; urgency=low * Initial revision. (Closes: #427414) -- Mikhail Gusarov Sat, 09 Jun 2007 20:42:11 +0700 debian/rules0000755000000000000000000000063711750600176010257 0ustar #!/usr/bin/make -f PACKAGE_NAME=s3cmd PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME) SHARE_DIR=/usr/share/$(PACKAGE_NAME) %: dh $@ --with python2 override_dh_auto_clean: S3CMD_PACKAGING=1 python setup.py clean -rm -rf S3/*.pyc build override_dh_auto_install: S3CMD_PACKAGING=1 python setup.py install --no-compile \ --root $(PACKAGE_DIR) \ --install-lib $(SHARE_DIR) \ --install-scripts $(SHARE_DIR) debian/watch0000644000000000000000000000016111760723067010226 0ustar version=3 opts=uversionmangle=s/-(beta|pre|rc)/~$1/;s/-(speedup)/~$1/ http://sf.net/s3tools/s3cmd-(.*)\.tar\.gz debian/s3cmd.links0000644000000000000000000000004611732422415011242 0ustar /usr/share/s3cmd/s3cmd /usr/bin/s3cmd debian/compat0000644000000000000000000000000211026222220010351 0ustar 7 debian/source/0000755000000000000000000000000012163027476010476 5ustar debian/source/format0000644000000000000000000000001511544070323011674 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000000217111732422415011123 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: s3cmd Upstream-Contact: Michal Ludvig Source:http://s3tools.logix.cz/s3cmd Files: * Copyright: 2007-2011 Michal Ludvig License: GPL-2 Files: debian/* Copyright: 2007-2012 Mikhail Gusarov License: GPL-2 License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. debian/control0000644000000000000000000000175212141504300010564 0ustar Source: s3cmd Section: utils Priority: optional Maintainer: Mikhail Gusarov Uploaders: Python Applications Packaging Team Build-Depends: debhelper (>= 7.0.50~), python Standards-Version: 3.9.3 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/s3cmd/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/s3cmd/trunk/ Homepage: http://s3tools.logix.cz/s3cmd Package: s3cmd Architecture: all Depends: ${python:Depends}, ${misc:Depends} Description: command-line Amazon S3 client Command-line tool to upload, retrieve and manage data in Amazon S3 service (http://www.amazon.com/s3/), designed for use in scripts. Features: - creating and destroying S3 buckets - uploading and downloading files - listing remote files - removing remote files - synchronizing local directories to S3 buckets - getting various information about buckets and disk usage . s3cmd supports both (US and EU) S3 datacentres. debian/manpages0000644000000000000000000000001011007012000010650 0ustar s3cmd.1 debian/patches/0000755000000000000000000000000012163027476010625 5ustar debian/patches/do-not-check-elementtree-at-build-time.patch0000644000000000000000000000271711760723067021073 0ustar 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 debian/patches/multipart-upload-elapsed-time.patch0000644000000000000000000000224412163027402017507 0ustar Description: Compute speed and elapsed time for Multipart uploads Fixes a crash with: s3cmd put /xyz/big-file s3://bucket/ > /dev/null Author: Michal Ludvig Origin: Upstream, https://github.com/s3tools/s3cmd/commit/9c57a3ba2163915deb2cc63cefa885a66ac377ab Bug-Debian: http://bugs.debian.org/683558 Bug-Upstream: https://github.com/s3tools/s3cmd/issues/24 Last-Updated: 2013-06-27 --- a/S3/S3.py +++ b/S3/S3.py @@ -752,11 +752,14 @@ def send_file_multipart(self, file, headers, uri, size): chunk_size = self.config.multipart_chunk_size_mb * 1024 * 1024 + timestamp_start = time.time() upload = MultiPartUpload(self, file, uri, headers) upload.upload_all_parts() response = upload.complete_multipart_upload() - response["speed"] = 0 # XXX + timestamp_end = time.time() + response["elapsed"] = timestamp_end - timestamp_start response["size"] = size + response["speed"] = response["elapsed"] and float(response["size"]) / response["elapsed"] or float(-1) return response def recv_file(self, request, stream, labels, start_position = 0, retries = _max_retries): debian/patches/series0000644000000000000000000000015112163027202012022 0ustar do-not-check-elementtree-at-build-time.patch fix-manpage-typos.patch multipart-upload-elapsed-time.patch debian/patches/fix-manpage-typos.patch0000644000000000000000000000613211760723067015221 0ustar # 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 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@lists.sourceforge.net .SH REPORTING BUGS Report bugs to debian/docs0000644000000000000000000000000711007012000010013 0ustar README