[Python-apps-commits] r8790 - in packages/s3cmd/trunk/debian (4 files)

dottedmag at users.alioth.debian.org dottedmag at users.alioth.debian.org
Mon May 28 16:22:19 UTC 2012 

    Date: Monday, May 28, 2012 @ 16:22:15
  Author: dottedmag
Revision: 8790

New upstream version

Modified:
  packages/s3cmd/trunk/debian/changelog
  packages/s3cmd/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch
  packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch
  packages/s3cmd/trunk/debian/watch

Modified: packages/s3cmd/trunk/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog	2012-05-28 11:21:40 UTC (rev 8789)
+++ packages/s3cmd/trunk/debian/changelog	2012-05-28 16:22:15 UTC (rev 8790)
@@ -1,3 +1,10 @@
+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).

Modified: packages/s3cmd/trunk/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/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch	2012-05-28 16:22:15 UTC (rev 8790)
@@ -2,40 +2,38 @@
 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
+--- 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)
+     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"
+-    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)
+-    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"
++#    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)
++#    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
+     ## Remove 'MANIFEST' file to force

Modified: packages/s3cmd/trunk/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/trunk/debian/patches/fix-manpage-typos.patch	2012-05-28 16:22:15 UTC (rev 8790)
@@ -1,7 +1,7 @@
 # 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
+--- 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
@@ -11,7 +11,16 @@
  Sign arbitrary string using the secret key
  .TP
  s3cmd \fBfixbucket\fR \fIs3://BUCKET[/PREFIX]\fR
-@@ -179,14 +179,14 @@
+@@ -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
@@ -28,8 +37,9 @@
  .TP
  \fB\-\-include\fR=GLOB
  Filenames and paths matching GLOB will be included
-@@ -195,14 +195,14 @@
- \fB\-\-(r)exclude(\-from)\fR patterns
+ 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
@@ -46,14 +56,27 @@
  .TP
  \fB\-\-bucket\-location\fR=BUCKET_LOCATION
  Datacentre to create bucket in. As of now the
-@@ -226,13 +226,13 @@
+@@ -244,22 +244,22 @@
+ default is binary/octet-stream.
  .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
+ \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
@@ -62,7 +85,7 @@
  if you like.
  .TP
  \fB\-\-encoding\fR=ENCODING
-@@ -386,7 +386,7 @@
+@@ -435,7 +435,7 @@
  .SH AUTHOR
  Written by Michal Ludvig <mludvig at logix.net.nz> and 15+ contributors
  .SH CONTACT, SUPPORT

Modified: packages/s3cmd/trunk/debian/watch
===================================================================
--- packages/s3cmd/trunk/debian/watch	2012-05-28 11:21:40 UTC (rev 8789)
+++ packages/s3cmd/trunk/debian/watch	2012-05-28 16:22:15 UTC (rev 8790)
@@ -1,2 +1,2 @@
 version=3
-opts=uversionmangle=s/-(pre|rc)/~$1/;s/-(speedup)/~$1/  http://sf.net/s3tools/s3cmd-(.*)\.tar\.gz
+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