[Python-apps-commits] r10517 - in packages/s3cmd/trunk/debian (5 files)

Thu Feb 13 16:24:42 UTC 2014

Date: Thursday, February 13, 2014 @ 16:24:41
  Author: dottedmag
Revision: 10517

New upstream snapshot

Modified:
  packages/s3cmd/trunk/debian/changelog
  packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch
  packages/s3cmd/trunk/debian/patches/series
  packages/s3cmd/trunk/debian/rules
Deleted:
  packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch

Modified: packages/s3cmd/trunk/debian/changelog
===================================================================

--- packages/s3cmd/trunk/debian/changelog	2014-02-13 12:43:02 UTC (rev 10516)
+++ packages/s3cmd/trunk/debian/changelog	2014-02-13 16:24:41 UTC (rev 10517)
@@ -1,3 +1,11 @@
+s3cmd (1.5.0~20140213-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot (targeting experimental):
+    - debian/rules: get-orig-source target.
+    - debian/patches: refreshed, upstream patch dropped.
+
+ -- Mikhail Gusarov <dottedmag at debian.org>  Thu, 13 Feb 2014 16:55:35 +0100
+
 s3cmd (1.1.0~beta3-2) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch	2014-02-13 12:43:02 UTC (rev 10516)
+++ packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch	2014-02-13 16:24:41 UTC (rev 10517)
@@ -1,8 +1,8 @@
 # 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 @@
+--- a/s3cmd.1
++++ b/s3cmd.1
+@@ -79,7 +79,7 @@
  s3cmd \fBaccesslog\fR \fIs3://BUCKET\fR
  Enable/disable bucket access logging
  .TP
@@ -10,17 +10,17 @@
 +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 @@
+ s3cmd \fBsignurl\fR \fIs3://BUCKET/OBJECT expiry_epoch\fR
+@@ -138,7 +138,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
+-use as '\fB--configure\fR s3://some-bucket' to test access
++use as '\fB\-\-configure\fR s3://some-bucket' to test access
  to a specific bucket instead of attempting to list
  them all.
  .TP
-@@ -198,29 +198,29 @@
+@@ -258,29 +258,29 @@
  from sync
  .TP
  \fB\-\-exclude\-from\fR=FILE
@@ -54,12 +54,12 @@
 -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 @@
+ \fB\-\-ignore\-failed\-copy\fR
+ Don't exit unsuccessfully because of missing keys
+@@ -311,9 +311,9 @@
  default is binary/octet-stream.
  .TP
- \fB\-\-guess\-mime\-type\fR
+ \fB\-M\fR, \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
@@ -69,12 +69,13 @@
  .TP
  \fB\-\-no\-guess\-mime\-type\fR
  Don't guess MIME-type and use the default type
- instead.
+@@ -323,13 +323,13 @@
+ Don't use mime magic when guessing MIME-type.
  .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
++Force MIME\-type. Override both \fB\-\-default-mime-type\fR and
 +\fB\-\-guess-mime-type\fR.
  .TP
  \fB\-\-add\-header\fR=NAME:VALUE
@@ -84,13 +85,4 @@
 +\&'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 
+ \fB\-\-server\-side\-encryption\fR

Deleted: packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch	2014-02-13 12:43:02 UTC (rev 10516)
+++ packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch	2014-02-13 16:24:41 UTC (rev 10517)
@@ -1,27 +0,0 @@
-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 <mludvig at logix.net.nz>
-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):

Modified: packages/s3cmd/trunk/debian/patches/series
===================================================================
--- packages/s3cmd/trunk/debian/patches/series	2014-02-13 12:43:02 UTC (rev 10516)
+++ packages/s3cmd/trunk/debian/patches/series	2014-02-13 16:24:41 UTC (rev 10517)
@@ -1,3 +1,2 @@
 do-not-check-elementtree-at-build-time.patch
 fix-manpage-typos.patch
-multipart-upload-elapsed-time.patch

Modified: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules	2014-02-13 12:43:02 UTC (rev 10516)
+++ packages/s3cmd/trunk/debian/rules	2014-02-13 16:24:41 UTC (rev 10517)
@@ -16,3 +16,10 @@
 		 --root $(PACKAGE_DIR) \
 		 --install-lib $(SHARE_DIR) \
 		 --install-scripts $(SHARE_DIR)
+
+O=s3cmd_1.5.0~20140213.orig.tar.gz
+GH=https://github.com/s3tools/s3cmd/tarball
+ID=9d69f990d62a16866c700ccc90d95adef99bef74
+
+get-orig-source:
+	wget -O $(CURDIR)/../$(O) $(GH)/$(ID)


