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

Wed Mar 21 18:59:27 UTC 2012

Date: Wednesday, March 21, 2012 @ 18:59:25
  Author: dottedmag
Revision: 8357

  * New upstream release.
  * 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.

Added:
  packages/s3cmd/trunk/debian/s3cmd.links
Modified:
  packages/s3cmd/trunk/debian/changelog
  packages/s3cmd/trunk/debian/control
  packages/s3cmd/trunk/debian/copyright
  packages/s3cmd/trunk/debian/rules

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

--- packages/s3cmd/trunk/debian/changelog	2012-03-21 11:28:42 UTC (rev 8356)
+++ packages/s3cmd/trunk/debian/changelog	2012-03-21 18:59:25 UTC (rev 8357)
@@ -1,9 +1,3 @@
-s3cmd (1.0.0-2) UNRELEASED; urgency=low
-
-  * debian/control: Update my email address.
-
- -- Mikhail Gusarov <dottedmag at debian.org>  Sat, 09 Apr 2011 16:14:37 +0200
-
 s3cmd (1.0.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -12,10 +6,13 @@
     - debian/control: drop quilt from Build-Depends.
     - debian/rules: simplify.
     - debian/README.source: drop.
+  * Switch to use dh(1)
+  * Drop pre-python-2.5 stanza from debian/control.
   * Add debian/patches/fix-mangpage-typos.patch to correct typos catched
     by lintian.
+  * Update debian/copyright to version 1.0 of machine-readable format.
 
- -- Mikhail Gusarov <dottedmag at dottedmag.net>  Mon, 28 Mar 2011 12:09:17 +0200
+ -- Mikhail Gusarov <dottedmag at debian.org>  Wed, 21 Mar 2012 19:46:28 +0100
 
 s3cmd (0.9.9.91-1) unstable; urgency=low
 

Modified: packages/s3cmd/trunk/debian/control
===================================================================
--- packages/s3cmd/trunk/debian/control	2012-03-21 11:28:42 UTC (rev 8356)
+++ packages/s3cmd/trunk/debian/control	2012-03-21 18:59:25 UTC (rev 8357)
@@ -3,16 +3,15 @@
 Priority: optional
 Maintainer: Mikhail Gusarov <dottedmag at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), python
-Build-Depends-Indep: python-support (>= 0.6.4)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), python
+Standards-Version: 3.9.3
 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
 
 Package: s3cmd
 Architecture: all
-Depends: python (>= 2.5) | python-elementtree, ${python:Depends}, ${misc:Depends}
+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:

Modified: packages/s3cmd/trunk/debian/copyright
===================================================================
--- packages/s3cmd/trunk/debian/copyright	2012-03-21 11:28:42 UTC (rev 8356)
+++ packages/s3cmd/trunk/debian/copyright	2012-03-21 18:59:25 UTC (rev 8357)
@@ -1,25 +1,28 @@
-This package was first debianized by Mikhail Gusarov <dottedmag at dottedmag.net> on
-Mon,  4 Jun 2007 11:00:00 +0600
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: s3cmd
+Upstream-Contact: Michal Ludvig <michal at logix.cz>
+Source:http://s3tools.logix.cz/s3cmd
 
-It was downloaded from http://s3tools.logix.cz/s3cmd
+Files: *
+Copyright: 2007-2011 Michal Ludvig <michal at logix.cz>
+License: GPL-2
 
-Copyright Holders: Michal Ludvig <michal at logix.cz>
+Files: debian/*
+Copyright: 2007-2012 Mikhail Gusarov <dottedmag at debian.org>
+License: GPL-2
 
-    s3cmd - Amazon S3 manager
-    Copyright (C) 2007 Michal Ludvig
-
-    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.
+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.

Modified: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules	2012-03-21 11:28:42 UTC (rev 8356)
+++ packages/s3cmd/trunk/debian/rules	2012-03-21 18:59:25 UTC (rev 8357)
@@ -1,48 +1,18 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 PACKAGE_NAME=s3cmd
 PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
+SHARE_DIR=/usr/share/$(PACKAGE_NAME)
 
-SHARE_DIR=/usr/share/s3cmd
+%:
+	dh $@ --with python2
 
-clean:
-	dh_testdir
-	dh_testroot
-
+override_dh_auto_clean:
 	S3CMD_PACKAGING=1 python setup.py clean
 	-rm -f S3/*.pyc
 
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
+override_dh_auto_install:
 	S3CMD_PACKAGING=1 python setup.py install --no-compile \
 		 --root $(PACKAGE_DIR) \
 		 --install-lib $(SHARE_DIR) \
 		 --install-scripts $(SHARE_DIR)
-	rm -rf $(PACKAGE_DIR)/usr/share/s3cmd/*.egg-info
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs NEWS
-	dh_installdocs
-	dh_installman
-	dh_link $(SHARE_DIR)/s3cmd /usr/bin/s3cmd
-	dh_pysupport
-	dh_compress -X.py
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Added: packages/s3cmd/trunk/debian/s3cmd.links
===================================================================
--- packages/s3cmd/trunk/debian/s3cmd.links	                        (rev 0)
+++ packages/s3cmd/trunk/debian/s3cmd.links	2012-03-21 18:59:25 UTC (rev 8357)
@@ -0,0 +1 @@
+/usr/share/s3cmd/s3cmd /usr/bin/s3cmd


