[Python-apps-commits] r7272 - in packages/s3ql/tags (18 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Sun Jul 3 14:43:29 UTC 2011
Date: Sunday, July 3, 2011 @ 14:43:28
Author: nikratio-guest
Revision: 7272
[svn-buildpackage] Tagging s3ql 1.0.1-1
Added:
packages/s3ql/tags/1.0.1-1/
packages/s3ql/tags/1.0.1-1/debian/README.Debian
(from rev 7253, packages/s3ql/trunk/debian/README.Debian)
packages/s3ql/tags/1.0.1-1/debian/changelog
(from rev 7270, packages/s3ql/trunk/debian/changelog)
packages/s3ql/tags/1.0.1-1/debian/copyright
(from rev 7263, packages/s3ql/trunk/debian/copyright)
packages/s3ql/tags/1.0.1-1/debian/patches/series
(from rev 7253, packages/s3ql/trunk/debian/patches/series)
packages/s3ql/tags/1.0.1-1/debian/rules
(from rev 7253, packages/s3ql/trunk/debian/rules)
packages/s3ql/tags/1.0.1-1/debian/s3ql.docs
(from rev 7253, packages/s3ql/trunk/debian/s3ql.docs)
packages/s3ql/tags/1.0.1-1/debian/s3ql.examples
(from rev 7253, packages/s3ql/trunk/debian/s3ql.examples)
packages/s3ql/tags/1.0.1-1/debian/s3ql.install
(from rev 7253, packages/s3ql/trunk/debian/s3ql.install)
packages/s3ql/tags/1.0.1-1/debian/s3ql.links
(from rev 7253, packages/s3ql/trunk/debian/s3ql.links)
Deleted:
packages/s3ql/tags/1.0.1-1/debian/README.Debian
packages/s3ql/tags/1.0.1-1/debian/changelog
packages/s3ql/tags/1.0.1-1/debian/copyright
packages/s3ql/tags/1.0.1-1/debian/patches/fix-sys-path.patch
packages/s3ql/tags/1.0.1-1/debian/patches/series
packages/s3ql/tags/1.0.1-1/debian/rules
packages/s3ql/tags/1.0.1-1/debian/s3ql.docs
packages/s3ql/tags/1.0.1-1/debian/s3ql.links
Deleted: packages/s3ql/tags/1.0.1-1/debian/README.Debian
===================================================================
--- packages/s3ql/trunk/debian/README.Debian 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/README.Debian 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,9 +0,0 @@
-S3QL for Debian
----------------
-
-Note that the debian package installs links to pcp.py and
-expire_backups.py (from the contrib directory of the upstream tarball)
-in /usr/bin.
-
-
- -- Nikolaus Rath <Nikolaus at rath.org> Wed, 15 Jun 2011 21:16:18 -0400
Copied: packages/s3ql/tags/1.0.1-1/debian/README.Debian (from rev 7253, packages/s3ql/trunk/debian/README.Debian)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/README.Debian (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/README.Debian 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,17 @@
+S3QL for Debian
+---------------
+
+
+F: Where do I find the contents of the contrib/ directory in the
+ upstream tarball?
+
+A: The expire_backups.py and pcp.py scripts are installed into
+ /usr/bin as expire_backups and pcp respectively. Their manpages
+ have been placed in the proper system directory (/usr/man/man1) and
+ can be viewed with the standard `man` command.
+
+ The upstart script (s3ql.conf) and sample backup script
+ (s3ql_backup.sh) are installed in /usr/share/doc/s3ql/examples.
+
+ benchmark.py and make_dummy.py are installed into /usr/share/s3ql.
+
Deleted: packages/s3ql/tags/1.0.1-1/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/changelog 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,5 +0,0 @@
-s3ql (1.0.1-1) unstable; urgency=low
-
- * First official debian release. Closes: #626651
-
- -- Nikolaus Rath <Nikolaus at rath.org> Fri, 17 Jun 2011 21:30:09 -0400
Copied: packages/s3ql/tags/1.0.1-1/debian/changelog (from rev 7270, packages/s3ql/trunk/debian/changelog)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/changelog (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/changelog 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,5 @@
+s3ql (1.0.1-1) unstable; urgency=low
+
+ * First official debian release. Closes: #626651
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 01 Jul 2011 14:02:17 -0400
Deleted: packages/s3ql/tags/1.0.1-1/debian/copyright
===================================================================
--- packages/s3ql/trunk/debian/copyright 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/copyright 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,19 +0,0 @@
-Format: http://dep.debian.net/deps/dep5/
-Name: s3ql
-Source: http://code.google.com/p/s3ql/
-
-Files: *
-Copyright: Copyright 2008 Nikolaus Rath <Nikolaus at rath.org>
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License Version 3 as
- published by the Free Software Foundation.
- .
- 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.
- .
- On Debian systems the full text of the GNU General Public License
- Version 3 can be found in the `/usr/share/common-licenses/GPL-3'
- file.
Copied: packages/s3ql/tags/1.0.1-1/debian/copyright (from rev 7263, packages/s3ql/trunk/debian/copyright)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/copyright (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/copyright 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,59 @@
+Format: http://dep.debian.net/deps/dep5/
+Name: s3ql
+Source: http://code.google.com/p/s3ql/
+
+Files: *
+Copyright: Copyright 2008 Nikolaus Rath <Nikolaus at rath.org>
+Comment:
+ Comments in file headers specify LGPL rather than GPLv3 as the
+ license. Upstream has confirmed that this is a type that will
+ be fixed in the next release.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License Version 3 as
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems the full text of the GNU General Public License
+ Version 3 can be found in the `/usr/share/common-licenses/GPL-3'
+ file.
+
+Files: src/s3ql/backends/boto/*
+Copyright: Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
+ Copyright (c) 2008 rPath, Inc.
+ Copyright (c) 2009 The Echo Nest Corporation
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish, dis-
+ tribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the fol-
+ lowing conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
+ .
+ Parts of this code were copied or derived from sample code supplied by AWS.
+ The following notice applies to that code.
+ .
+ This software code is made available "AS IS" without warranties of any
+ kind. You may copy, display, modify and redistribute the software
+ code either by itself or as incorporated into your code; provided that
+ you do not remove any proprietary notices. Your use of this software
+ code is at your own risk and you waive any claim against Amazon
+ Digital Services, Inc. or its affiliates with respect to your use of
+ this software code. (c) 2006 Amazon Digital Services, Inc. or its
+ affiliates.
Deleted: packages/s3ql/tags/1.0.1-1/debian/patches/fix-sys-path.patch
===================================================================
--- packages/s3ql/trunk/debian/patches/fix-sys-path.patch 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/patches/fix-sys-path.patch 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,85 +0,0 @@
-Description: Add /usr/share/s3ql to module load path.
- Since the debian package installs S3QL's modules into
- /usr/share/s3ql, which is not in the standard Python
- module search path, the scripts in contrib/ need to be
- updated to manually add this directory to sys.path.
-Author: Nikolaus Rath <Nikolaus at rath.org>
-Forwarded: not-needed
-Last-Update: 2011-06-17
---- a/contrib/benchmark.py
-+++ b/contrib/benchmark.py
-@@ -21,7 +21,10 @@
- import zlib
- import bz2
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
---- a/contrib/expire_backups.py
-+++ b/contrib/expire_backups.py
-@@ -20,13 +20,16 @@
- from datetime import datetime, timedelta
- from collections import defaultdict
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
- os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
- sys.path = [os.path.join(basedir, 'src')] + sys.path
--
-+
- from s3ql.common import setup_logging, QuietError
- from s3ql.parse_args import ArgumentParser
- from s3ql.cli.remove import main as s3qlrm
-@@ -283,4 +286,4 @@
-
- if __name__ == '__main__':
- #simulate(sys.argv[1:])
-- main(sys.argv[1:])
-\ No newline at end of file
-+ main(sys.argv[1:])
---- a/contrib/make_dummy.py
-+++ b/contrib/make_dummy.py
-@@ -20,7 +20,10 @@
- import logging
- import tempfile
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
---- a/contrib/pcp.py
-+++ b/contrib/pcp.py
-@@ -17,7 +17,10 @@
- import logging
- import subprocess
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
-@@ -97,4 +100,4 @@
-
-
- if __name__ == '__main__':
-- main(sys.argv[1:])
-\ No newline at end of file
-+ main(sys.argv[1:])
Deleted: packages/s3ql/tags/1.0.1-1/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/patches/series 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1 +0,0 @@
-fix-sys-path.patch
Copied: packages/s3ql/tags/1.0.1-1/debian/patches/series (from rev 7253, packages/s3ql/trunk/debian/patches/series)
===================================================================
Deleted: packages/s3ql/tags/1.0.1-1/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/rules 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,43 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-#export DH_VERBOSE=1
-
-%:
- dh $@ --with python2
-
-override_dh_installchangelogs:
- dh_installchangelogs Changes.txt
-
-override_dh_compress:
- dh_compress -X.txt -X.py
-
- # Force compression of manpages
- gzip debian/s3ql/usr/share/doc/s3ql/contrib/*.1
-
-override_dh_auto_build:
- python setup.py build_sphinx
-
-override_dh_auto_install:
- python setup.py install --root=debian/s3ql --install-layout=deb \
- --install-lib=/usr/share/s3ql --install-scripts=/usr/share/s3ql
-
-override_dh_fixperms:
- dh_fixperms
- chmod +x debian/s3ql/usr/share/doc/s3ql/contrib/*.py \
- debian/s3ql/usr/share/doc/s3ql/contrib/*.sh
-
-override_dh_link:
- dh_link
- for entry in debian/s3ql/usr/share/s3ql/*; do \
- if [ -d "$$entry" ] || [ ! -x "$$entry" ]; then \
- continue; \
- fi; \
- ln -s ../share/s3ql/`basename "$$entry"` \
- "debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
- done
-
-override_dh_auto_clean:
- # We don't want to call setup.py clean, because this
- # requires a number of (potentially uninstalled) build-dependencies.
- rm -rf dist setup.log build doc
Copied: packages/s3ql/tags/1.0.1-1/debian/rules (from rev 7253, packages/s3ql/trunk/debian/rules)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/rules (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/rules 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with python2
+
+override_dh_installchangelogs:
+ dh_installchangelogs Changes.txt
+
+override_dh_auto_build:
+ python setup.py build_sphinx build
+
+override_dh_auto_install:
+ python setup.py install --root=debian/s3ql --install-layout=deb \
+ --install-lib=/usr/share/s3ql --install-scripts=/usr/share/s3ql
+
+override_dh_link:
+ dh_link
+ # Don't link scripts ending in .py
+ for entry in debian/s3ql/usr/share/s3ql/*; do \
+ if [ -d "$$entry" ] || [ ! -x "$$entry" ] \
+ || [ "$${entry%.py}" != "$$entry" ]; then \
+ continue; \
+ fi; \
+ ln -s ../share/s3ql/`basename "$$entry"` \
+ "debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
+ done
+
+override_dh_auto_clean:
+ # We don't want to call setup.py clean, because this
+ # requires a number of (potentially uninstalled) build-dependencies.
+ rm -rf dist setup.log build doc
Deleted: packages/s3ql/tags/1.0.1-1/debian/s3ql.docs
===================================================================
--- packages/s3ql/trunk/debian/s3ql.docs 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/s3ql.docs 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,3 +0,0 @@
-doc/html/
-doc/manual.pdf
-contrib/
Copied: packages/s3ql/tags/1.0.1-1/debian/s3ql.docs (from rev 7253, packages/s3ql/trunk/debian/s3ql.docs)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/s3ql.docs (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/s3ql.docs 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,2 @@
+doc/html/
+doc/manual.pdf
Copied: packages/s3ql/tags/1.0.1-1/debian/s3ql.examples (from rev 7253, packages/s3ql/trunk/debian/s3ql.examples)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/s3ql.examples (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/s3ql.examples 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,2 @@
+contrib/s3ql.conf
+contrib/s3ql_backup.sh
Copied: packages/s3ql/tags/1.0.1-1/debian/s3ql.install (from rev 7253, packages/s3ql/trunk/debian/s3ql.install)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/s3ql.install (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/s3ql.install 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,2 @@
+contrib/*.py /usr/share/s3ql/
+contrib/*.1 /usr/share/man/man1/
Deleted: packages/s3ql/tags/1.0.1-1/debian/s3ql.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql.links 2011-06-30 00:11:30 UTC (rev 7251)
+++ packages/s3ql/tags/1.0.1-1/debian/s3ql.links 2011-07-03 14:43:28 UTC (rev 7272)
@@ -1,5 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/s3ql/html/_static/jquery.js
-/usr/share/doc/s3ql/contrib/pcp.py /usr/bin/pcp
-/usr/share/doc/s3ql/contrib/expire_backups.py /usr/bin/expire_backups
-/usr/share/doc/s3ql/contrib/pcp.1.gz /usr/share/man/man1/pcp.1.gz
-/usr/share/doc/s3ql/contrib/expire_backups.1.gz /usr/share/man/man1/expire_backups.1.gz
Copied: packages/s3ql/tags/1.0.1-1/debian/s3ql.links (from rev 7253, packages/s3ql/trunk/debian/s3ql.links)
===================================================================
--- packages/s3ql/tags/1.0.1-1/debian/s3ql.links (rev 0)
+++ packages/s3ql/tags/1.0.1-1/debian/s3ql.links 2011-07-03 14:43:28 UTC (rev 7272)
@@ -0,0 +1,3 @@
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/s3ql/html/_static/jquery.js
+/usr/share/s3ql/pcp.py /usr/bin/pcp
+/usr/share/s3ql/expire_backups.py /usr/bin/expire_backups
More information about the Python-apps-commits
mailing list