[Python-apps-commits] r1026 - in packages/s3cmd/trunk (19 files)
dottedmag-guest at users.alioth.debian.org
dottedmag-guest at users.alioth.debian.org
Sat May 3 07:28:01 UTC 2008
Date: Saturday, May 3, 2008 @ 07:28:00
Author: dottedmag-guest
Revision: 1026
[svn-inject] Applying Debian modifications to trunk
Added:
packages/s3cmd/trunk/.pc/
packages/s3cmd/trunk/.pc/.version
packages/s3cmd/trunk/.pc/applied-patches
packages/s3cmd/trunk/.pc/do-not-check-elementtree-at-build-time.patch/
packages/s3cmd/trunk/.pc/do-not-check-elementtree-at-build-time.patch/setup.py
packages/s3cmd/trunk/debian/
packages/s3cmd/trunk/debian/changelog
packages/s3cmd/trunk/debian/compat
packages/s3cmd/trunk/debian/control
packages/s3cmd/trunk/debian/copyright
packages/s3cmd/trunk/debian/docs
packages/s3cmd/trunk/debian/manpages
packages/s3cmd/trunk/debian/patches/
packages/s3cmd/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch
packages/s3cmd/trunk/debian/patches/series
packages/s3cmd/trunk/debian/pycompat
packages/s3cmd/trunk/debian/rules
packages/s3cmd/trunk/debian/watch
Modified:
packages/s3cmd/trunk/setup.py
Added: packages/s3cmd/trunk/.pc/.version
===================================================================
--- packages/s3cmd/trunk/.pc/.version (rev 0)
+++ packages/s3cmd/trunk/.pc/.version 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+2
Added: packages/s3cmd/trunk/.pc/applied-patches
===================================================================
--- packages/s3cmd/trunk/.pc/applied-patches (rev 0)
+++ packages/s3cmd/trunk/.pc/applied-patches 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+do-not-check-elementtree-at-build-time.patch
Added: packages/s3cmd/trunk/.pc/do-not-check-elementtree-at-build-time.patch/setup.py
===================================================================
--- packages/s3cmd/trunk/.pc/do-not-check-elementtree-at-build-time.patch/setup.py (rev 0)
+++ packages/s3cmd/trunk/.pc/do-not-check-elementtree-at-build-time.patch/setup.py 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,70 @@
+from distutils.core import setup
+import sys
+import os
+
+import S3.PkgInfo
+
+if float("%d.%d" % sys.version_info[:2]) < 2.4:
+ sys.stderr.write("Your Python version %d.%d.%d is not supported.\n" % sys.version_info[:3])
+ 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:
+ ## Remove 'MANIFEST' file to force
+ ## distutils to recreate it.
+ ## Only in "sdist" stage. Otherwise
+ ## it makes life difficult to packagers.
+ if sys.argv[1] == "sdist":
+ os.unlink("MANIFEST")
+except:
+ pass
+
+## Don't install manpages and docs when $S3CMD_PACKAGING is set
+## This was a requirement of Debian package maintainer.
+if not os.getenv("S3CMD_PACKAGING"):
+ man_path = os.getenv("S3CMD_INSTPATH_MAN") or "share/man"
+ doc_path = os.getenv("S3CMD_INSTPATH_DOC") or "share/doc/packages"
+ data_files = [
+ (doc_path+"/s3cmd", [ "README", "INSTALL", "NEWS" ]),
+ (man_path+"/man1", [ "s3cmd.1" ] ),
+ ]
+else:
+ data_files = None
+
+## Main distutils info
+setup(
+ ## Content description
+ name = S3.PkgInfo.package,
+ version = S3.PkgInfo.version,
+ packages = [ 'S3' ],
+ scripts = ['s3cmd'],
+ data_files = data_files,
+
+ ## Packaging details
+ author = "Michal Ludvig",
+ author_email = "michal at logix.cz",
+ url = S3.PkgInfo.url,
+ license = S3.PkgInfo.license,
+ description = S3.PkgInfo.short_description,
+ long_description = """
+%s
+
+Authors:
+--------
+ Michal Ludvig <michal at logix.cz>
+""" % (S3.PkgInfo.long_description)
+ )
Property changes on: packages/s3cmd/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/s3cmd/trunk/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog (rev 0)
+++ packages/s3cmd/trunk/debian/changelog 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,34 @@
+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 <dottedmag at dottedmag.net> 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 <dottedmag at dottedmag.net> 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 <dottedmag at dottedmag.net> Fri, 24 Aug 2007 23:17:27 +0700
+
+s3cmd (0.9.3-1) unstable; urgency=low
+
+ * Initial revision. (Closes: #427414)
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net> Sat, 09 Jun 2007 20:42:11 +0700
Added: packages/s3cmd/trunk/debian/compat
===================================================================
--- packages/s3cmd/trunk/debian/compat (rev 0)
+++ packages/s3cmd/trunk/debian/compat 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+5
Added: packages/s3cmd/trunk/debian/control
===================================================================
--- packages/s3cmd/trunk/debian/control (rev 0)
+++ packages/s3cmd/trunk/debian/control 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,18 @@
+Source: s3cmd
+Section: admin
+Priority: optional
+Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
+Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40), python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep: python-central (>= 0.6)
+Standards-Version: 3.7.3
+Homepage: http://s3tools.logix.cz/s3cmd
+XS-Python-Version: >=2.4
+
+Package: s3cmd
+Architecture: all
+Depends: ${python:Depends}, python-elementtree
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+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.
Added: packages/s3cmd/trunk/debian/copyright
===================================================================
--- packages/s3cmd/trunk/debian/copyright (rev 0)
+++ packages/s3cmd/trunk/debian/copyright 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,25 @@
+This package was first debianized by Mikhail Gusarov <dottedmag at dottedmag.net> on
+Mon, 4 Jun 2007 11:00:00 +0600
+
+It was downloaded from http://s3tools.logix.cz/s3cmd
+
+Copyright Holders: Michal Ludvig <michal at logix.cz>
+
+ 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.
Added: packages/s3cmd/trunk/debian/docs
===================================================================
--- packages/s3cmd/trunk/debian/docs (rev 0)
+++ packages/s3cmd/trunk/debian/docs 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+README
Added: packages/s3cmd/trunk/debian/manpages
===================================================================
--- packages/s3cmd/trunk/debian/manpages (rev 0)
+++ packages/s3cmd/trunk/debian/manpages 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+s3cmd.1
Added: 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 (rev 0)
+++ packages/s3cmd/trunk/debian/patches/do-not-check-elementtree-at-build-time.patch 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,37 @@
+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
+@@ -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
Added: packages/s3cmd/trunk/debian/patches/series
===================================================================
--- packages/s3cmd/trunk/debian/patches/series (rev 0)
+++ packages/s3cmd/trunk/debian/patches/series 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+do-not-check-elementtree-at-build-time.patch
Added: packages/s3cmd/trunk/debian/pycompat
===================================================================
--- packages/s3cmd/trunk/debian/pycompat (rev 0)
+++ packages/s3cmd/trunk/debian/pycompat 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1 @@
+2
Added: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules (rev 0)
+++ packages/s3cmd/trunk/debian/rules 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,50 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/quilt/quilt.make
+
+PACKAGE_NAME=s3cmd
+
+configure: configure-stamp
+configure-stamp: patch
+ dh_testdir
+ touch $@
+
+build: configure
+
+clean: patch
+ dh_testdir
+ dh_testroot
+
+ S3CMD_PACKAGING=1 python setup.py clean
+ -rm -f build-stamp
+ -rm -f S3/*.pyc
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+ S3CMD_PACKAGING=1 python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME)
+ rm -rf debian/$(PACKAGE_NAME)/usr/lib/python*/site-packages/*.egg-info
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs NEWS
+ dh_installdocs
+ dh_installman
+ dh_pycentral
+ dh_compress -X.py
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: packages/s3cmd/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/s3cmd/trunk/debian/watch
===================================================================
--- packages/s3cmd/trunk/debian/watch (rev 0)
+++ packages/s3cmd/trunk/debian/watch 2008-05-03 07:28:00 UTC (rev 1026)
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/s3tools/s3cmd-(.*)\.tar\.gz
Modified: packages/s3cmd/trunk/setup.py
===================================================================
--- packages/s3cmd/trunk/setup.py 2008-05-03 07:27:50 UTC (rev 1025)
+++ packages/s3cmd/trunk/setup.py 2008-05-03 07:28:00 UTC (rev 1026)
@@ -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
More information about the Python-apps-commits
mailing list