[Python-apps-commits] r7247 - in packages/s3ql/trunk (17 files)

nikratio-guest at users.alioth.debian.org nikratio-guest at users.alioth.debian.org
Wed Jun 29 12:37:21 UTC 2011


    Date: Wednesday, June 29, 2011 @ 12:37:19
  Author: nikratio-guest
Revision: 7247

[svn-inject] Applying Debian modifications (1.0.1-1) to trunk

Added:
  packages/s3ql/trunk/debian/
  packages/s3ql/trunk/debian/README.Debian
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/compat
  packages/s3ql/trunk/debian/control
  packages/s3ql/trunk/debian/copyright
  packages/s3ql/trunk/debian/patches/
  packages/s3ql/trunk/debian/patches/fix-sys-path.patch
  packages/s3ql/trunk/debian/patches/series
  packages/s3ql/trunk/debian/rules
  packages/s3ql/trunk/debian/s3ql.doc-base
  packages/s3ql/trunk/debian/s3ql.docs
  packages/s3ql/trunk/debian/s3ql.links
  packages/s3ql/trunk/debian/source/
  packages/s3ql/trunk/debian/source/format
  packages/s3ql/trunk/debian/source/options
  packages/s3ql/trunk/debian/watch


Property changes on: packages/s3ql/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages/s3ql/trunk/debian/README.Debian
===================================================================
--- packages/s3ql/trunk/debian/README.Debian	                        (rev 0)
+++ packages/s3ql/trunk/debian/README.Debian	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,9 @@
+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

Added: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	                        (rev 0)
+++ packages/s3ql/trunk/debian/changelog	2011-06-29 12:37:19 UTC (rev 7247)
@@ -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, 17 Jun 2011 21:30:09 -0400

Added: packages/s3ql/trunk/debian/compat
===================================================================
--- packages/s3ql/trunk/debian/compat	                        (rev 0)
+++ packages/s3ql/trunk/debian/compat	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1 @@
+8

Added: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control	                        (rev 0)
+++ packages/s3ql/trunk/debian/control	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,56 @@
+Source: s3ql
+Section: misc
+X-Python-Version: >= 2.6
+Priority: optional
+Maintainer: Nikolaus Rath <Nikolaus at rath.org>
+Build-Depends: debhelper (>= 8),
+               python (>= 2.6.6-3~),
+               python-setuptools (>= 0.6.14),
+               python-apsw (>= 3.7.0),
+               libsqlite3-0 (>= 3.7.0),
+               python-sphinx,
+               python-argparse,
+               python-llfuse (>= 0.31),
+               python-pycryptopp,
+               python-paramiko,
+               python-lzma (>= 0.5.3),
+               texlive-latex-base,
+               texlive-latex-recommended,
+               texlive-latex-extra,
+               texlive-fonts-recommended
+Standards-Version: 3.9.2
+Homepage: http://code.google.com/p/s3ql/
+Vcs-Browser: http://code.google.com/p/s3ql/source/browse?repo=debian
+Vcs-Hg: https://debian.s3ql.googlecode.com/hg/
+
+Package: s3ql
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends},
+         python-apsw (>= 3.7.0),
+         libsqlite3-0 (>= 3.7.0),
+         python-lzma (>= 0.5.3),
+         python-paramiko,
+         python-pycryptopp,
+         python-setuptools,
+         fuse-utils,
+         psmisc,
+         python-argparse,
+         python-llfuse (>= 0.31),
+         libjs-jquery
+Description: Full-featured file system for online data storage
+ S3QL is a file system that stores all its data online. It supports
+ online storage services like Amazon S3 as well as arbitrary FTP or
+ SFTP servers. It effectively provides you with a hard disk of
+ infinite capacity that can be accessed from any computer with
+ internet access.
+ .
+ S3QL has been designed mainly for backup and archival purposes and
+ many of its features are especially geared towards this. However,
+ since S3QL is providing a standard UNIX file system, it can in
+ principle be used for any other application as well.
+ .
+ S3QL is designed to favor simplicity and elegance over performance
+ and feature-richness. Care has been taken to make the source code as
+ readable and serviceable as possible. Solid error detection and error
+ handling have been included from the very first line, and S3QL comes
+ with extensive automated test cases for all its components.

Added: packages/s3ql/trunk/debian/copyright
===================================================================
--- packages/s3ql/trunk/debian/copyright	                        (rev 0)
+++ packages/s3ql/trunk/debian/copyright	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,19 @@
+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.

Added: packages/s3ql/trunk/debian/patches/fix-sys-path.patch
===================================================================
--- packages/s3ql/trunk/debian/patches/fix-sys-path.patch	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/fix-sys-path.patch	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,85 @@
+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:])

Added: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/series	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1 @@
+fix-sys-path.patch

Added: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules	                        (rev 0)
+++ packages/s3ql/trunk/debian/rules	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,43 @@
+#!/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


Property changes on: packages/s3ql/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/s3ql/trunk/debian/s3ql.doc-base
===================================================================
--- packages/s3ql/trunk/debian/s3ql.doc-base	                        (rev 0)
+++ packages/s3ql/trunk/debian/s3ql.doc-base	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,11 @@
+Document: s3ql
+Title: S3QL User's Guide
+Author: Nikolaus Rath <Nikolaus at rath.org>
+Section: File Management
+
+Format: HTML
+Index: /usr/share/doc/s3ql/html/index.html
+Files: /usr/share/doc/s3ql/html/*.html
+
+Format: PDF
+Files: /usr/share/doc/s3ql/manual.pdf.gz

Added: packages/s3ql/trunk/debian/s3ql.docs
===================================================================
--- packages/s3ql/trunk/debian/s3ql.docs	                        (rev 0)
+++ packages/s3ql/trunk/debian/s3ql.docs	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,3 @@
+doc/html/
+doc/manual.pdf
+contrib/

Added: packages/s3ql/trunk/debian/s3ql.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql.links	                        (rev 0)
+++ packages/s3ql/trunk/debian/s3ql.links	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,5 @@
+/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

Added: packages/s3ql/trunk/debian/source/format
===================================================================
--- packages/s3ql/trunk/debian/source/format	                        (rev 0)
+++ packages/s3ql/trunk/debian/source/format	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/s3ql/trunk/debian/source/options
===================================================================
--- packages/s3ql/trunk/debian/source/options	                        (rev 0)
+++ packages/s3ql/trunk/debian/source/options	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,7 @@
+compression = "bzip2"
+compression-level = 9
+extend-diff-ignore = "\.pyc$"
+extend-diff-ignore = "^doc/"
+extend-diff-ignore = "^contrib/.+\.1$"
+extend-diff-ignore = "^src/.+\.egg-info/"
+tar-ignore = "*.pyc"

Added: packages/s3ql/trunk/debian/watch
===================================================================
--- packages/s3ql/trunk/debian/watch	                        (rev 0)
+++ packages/s3ql/trunk/debian/watch	2011-06-29 12:37:19 UTC (rev 7247)
@@ -0,0 +1,7 @@
+# watch control file for uscan
+version=3
+opts=downloadurlmangle=s/^http:\/\/code.google.com\/\//http:\/\// \
+  http://code.google.com/p/s3ql/downloads/list \
+  (?:.+)/files/s3ql-(.+).tar.bz2 \
+  debian uupdate
+




More information about the Python-apps-commits mailing list