[Python-apps-commits] r6835 - in packages/s3cmd/trunk/debian (7 files)

Mon Mar 28 11:28:30 UTC 2011

Date: Monday, March 28, 2011 @ 11:28:19
  Author: dottedmag
Revision: 6835

Update package to 1.0.0

Added:
  packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch
Modified:
  packages/s3cmd/trunk/debian/changelog
  packages/s3cmd/trunk/debian/control
  packages/s3cmd/trunk/debian/patches/series
  packages/s3cmd/trunk/debian/rules
  packages/s3cmd/trunk/debian/source/format
Deleted:
  packages/s3cmd/trunk/debian/README.source

Deleted: packages/s3cmd/trunk/debian/README.source
===================================================================

--- packages/s3cmd/trunk/debian/README.source	2011-03-28 10:40:06 UTC (rev 6834)
+++ packages/s3cmd/trunk/debian/README.source	2011-03-28 11:28:19 UTC (rev 6835)
@@ -1,5 +0,0 @@
-This package uses quilt packaging system, and patches may be (de)applied by
-using (un)patch debian/rules targets.
-
-S3CMD_PACKAGING quirk disables installing documentation and manpages by means of
-upstream setup.py - upstream likes it this way.

Modified: packages/s3cmd/trunk/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog	2011-03-28 10:40:06 UTC (rev 6834)
+++ packages/s3cmd/trunk/debian/changelog	2011-03-28 11:28:19 UTC (rev 6835)
@@ -1,3 +1,16 @@
+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 dottedmag.net>  Mon, 28 Mar 2011 12:09:17 +0200
+
 s3cmd (0.9.9.91-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/s3cmd/trunk/debian/control
===================================================================
--- packages/s3cmd/trunk/debian/control	2011-03-28 10:40:06 UTC (rev 6834)
+++ packages/s3cmd/trunk/debian/control	2011-03-28 11:28:19 UTC (rev 6835)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), python
+Build-Depends: debhelper (>= 7), python
 Build-Depends-Indep: python-support (>= 0.6.4)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/s3cmd/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/s3cmd/trunk/
 Homepage: http://s3tools.logix.cz/s3cmd

Added: packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch	                        (rev 0)
+++ packages/s3cmd/trunk/debian/patches/fix-manpage-typos.patch	2011-03-28 11:28:19 UTC (rev 6835)
@@ -0,0 +1,73 @@
+# 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 

Modified: packages/s3cmd/trunk/debian/patches/series
===================================================================
--- packages/s3cmd/trunk/debian/patches/series	2011-03-28 10:40:06 UTC (rev 6834)
+++ packages/s3cmd/trunk/debian/patches/series	2011-03-28 11:28:19 UTC (rev 6835)
@@ -1 +1,2 @@
 do-not-check-elementtree-at-build-time.patch
+fix-manpage-typos.patch

Modified: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules	2011-03-28 10:40:06 UTC (rev 6834)
+++ packages/s3cmd/trunk/debian/rules	2011-03-28 11:28:19 UTC (rev 6835)
@@ -1,33 +1,23 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
-
 PACKAGE_NAME=s3cmd
 PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
 
 SHARE_DIR=/usr/share/s3cmd
 
-clean: clean-patched unpatch
+clean:
 	dh_testdir
 	dh_testroot
 
+	S3CMD_PACKAGING=1 python setup.py clean
 	-rm -f S3/*.pyc
 
 	dh_clean
 
-#
-# We have to run patched setup.py, as it checks for the elementtree
-#
-clean-patched: patch
+install:
 	dh_testdir
 	dh_testroot
-
-	S3CMD_PACKAGING=1 python setup.py clean
-
-install: patch
-	dh_testdir
-	dh_testroot
 	dh_prep
 	dh_installdirs
 

Modified: packages/s3cmd/trunk/debian/source/format
===================================================================
--- packages/s3cmd/trunk/debian/source/format	2011-03-28 10:40:06 UTC (rev 6834)
+++ packages/s3cmd/trunk/debian/source/format	2011-03-28 11:28:19 UTC (rev 6835)
@@ -1 +1,2 @@
-1.0
+3.0 (quilt)
+


