[Python-apps-commits] r9988 - in packages/s3ql-beta/trunk/debian (17 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Wed Aug 28 03:20:01 UTC 2013
Date: Wednesday, August 28, 2013 @ 03:19:57
Author: nikratio-guest
Revision: 9988
S3QL 2.x is now stable, so switch package name from s3ql-beta to
s3ql. Will replace the current s3ql package (containing the 1.x
release) as soon as Python 3.3 transition is complete.
Added:
packages/s3ql-beta/trunk/debian/README.Debian
packages/s3ql-beta/trunk/debian/s3ql-dbg.links
(from rev 9747, packages/s3ql-beta/trunk/debian/s3ql-beta-dbg.links)
packages/s3ql-beta/trunk/debian/s3ql.doc-base
(from rev 9747, packages/s3ql-beta/trunk/debian/s3ql-beta.doc-base)
packages/s3ql-beta/trunk/debian/s3ql.docs
(from rev 9750, packages/s3ql-beta/trunk/debian/s3ql-beta.docs)
packages/s3ql-beta/trunk/debian/s3ql.examples
packages/s3ql-beta/trunk/debian/s3ql.install
(from rev 9747, packages/s3ql-beta/trunk/debian/s3ql-beta.install)
packages/s3ql-beta/trunk/debian/s3ql.links
Modified:
packages/s3ql-beta/trunk/debian/changelog
packages/s3ql-beta/trunk/debian/control
packages/s3ql-beta/trunk/debian/rules
packages/s3ql-beta/trunk/debian/watch
Deleted:
packages/s3ql-beta/trunk/debian/s3ql-beta-dbg.links
packages/s3ql-beta/trunk/debian/s3ql-beta.doc-base
packages/s3ql-beta/trunk/debian/s3ql-beta.docs
packages/s3ql-beta/trunk/debian/s3ql-beta.install
packages/s3ql-beta/trunk/debian/s3ql-beta.lintian-overrides
packages/s3ql-beta/trunk/debian/source/options
Added: packages/s3ql-beta/trunk/debian/README.Debian
===================================================================
--- packages/s3ql-beta/trunk/debian/README.Debian (rev 0)
+++ packages/s3ql-beta/trunk/debian/README.Debian 2013-08-28 03:19:57 UTC (rev 9988)
@@ -0,0 +1,17 @@
+S3QL for Debian
+---------------
+
+
+Q: Where do I find the contents of the contrib/ directory in the
+ upstream tarball?
+
+A: The Python scripts are installed into /usr/lib/s3ql. The
+ expire_backups.py and pcp.py scripts are additionally linked into
+ /usr/bin as expire_backups and parallel-cp respectively (renaming
+ of pcp was necessary to avoid conflict with the pcp "Performance
+ Co-Pilot" package). 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_upstart.conf) and sample backup script
+ (s3ql_backup.sh) are installed in /usr/share/doc/s3ql/examples.
Modified: packages/s3ql-beta/trunk/debian/changelog
===================================================================
--- packages/s3ql-beta/trunk/debian/changelog 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/changelog 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1,10 +1,11 @@
-s3ql-beta (2.1-1) UNRELEASED; urgency=low
+s3ql (2.4-1) unstable; urgency=low
- * New upstream release from upstream's 2.x development branch. (New source
- package because 1.x branch is still maintained and recommended for
- production systems.)
+ * New upstream release.
+ * Updated uploader email address.
+ * Removed obsolete lintian override.
+ * Updated package description.
- -- Nikolaus Rath <Nikolaus at rath.org> Sat, 15 Jun 2013 12:03:21 -0700
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 27 Aug 2013 20:17:06 -0700
s3ql (1.15-1) unstable; urgency=low
Modified: packages/s3ql-beta/trunk/debian/control
===================================================================
--- packages/s3ql-beta/trunk/debian/control 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/control 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1,11 +1,11 @@
-Source: s3ql-beta
+Source: s3ql
Section: misc
Priority: optional
X-Python-Version: >= 3.3
XS-Testsuite: autopkgtest
Maintainer: Debian Python Apps Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Nikolaus Rath <Nikolaus at rath.org>,
- Laszlo Boszormenyi <gcs at debian.hu>
+ Laszlo Boszormenyi <gcs at debian.org>
Build-Depends: debhelper (>= 9),
python3 (>= 3.3),
python3-dev (>= 3.3),
@@ -24,10 +24,10 @@
libsqlite3-dev (>= 3.7.0)
Standards-Version: 3.9.4
Homepage: http://code.google.com/p/s3ql/
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/s3ql-beta/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/s3ql-beta/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/s3ql/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/s3ql/trunk/
-Package: s3ql-beta
+Package: s3ql
Architecture: any
Depends: ${misc:Depends},
${python3:Depends},
@@ -36,29 +36,29 @@
fuse [linux-any] | fuse4bsd [kfreebsd-any],
psmisc,
python3-pkg-resources
-Description: Full-featured file system for online data storage (beta)
- 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.
+Description: Full-featured file system for online data storage
+ S3QL is a file system that stores all its data online using storage
+ services like Google Storage, Amazon S3 or OpenStack. S3QL
+ effectively provides a hard disk of dynamic, 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 a standard conforming, full featured UNIX file system that is
+ conceptually indistinguishable from any local file
+ system. Furthermore, S3QL has additional features like compression,
+ encryption, data de-duplication, immutable trees and snapshotting
+ which make it especially suitable for online backup and archival.
.
+ In addition to accessing online storage services directoly, S3QL can
+ also store its data underneath a regular mount point. This enables
+ the use of S3QL with e.g. NFS, CIFS or sftp servers.
+ .
S3QL is designed to favor simplicity and elegance over performance
- and feature-richness. Care has been taken to make the source code as
+ and feature-creep. 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.
- .
- This is a development/beta release of S3QL and not recommended for
- production systems. The latest stable release suitable for production
- systems is available in the s3ql package.
+ with extensive automated test cases.
-Package: s3ql-beta-dbg
+Package: s3ql-dbg
Architecture: any
Section: debug
Priority: extra
@@ -66,31 +66,31 @@
python3-llfuse-dbg,
python3-apsw-dbg,
python3-crypto-dbg,
-Depends: s3ql-beta (= ${binary:Version}),
+Depends: s3ql (= ${binary:Version}),
${python3:Depends},
${shlibs:Depends},
${misc:Depends}
Description: Full-featured file system for online data storage (debugging symbols)
- 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 is a file system that stores all its data online using storage
+ services like Google Storage, Amazon S3 or OpenStack. S3QL
+ effectively provides a hard disk of dynamic, 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 a standard conforming, full featured UNIX file system that is
+ conceptually indistinguishable from any local file
+ system. Furthermore, S3QL has additional features like compression,
+ encryption, data de-duplication, immutable trees and snapshotting
+ which make it especially suitable for online backup and archival.
.
+ In addition to accessing online storage services directoly, S3QL can
+ also store its data underneath a regular mount point. This enables
+ the use of S3QL with e.g. NFS, CIFS or sftp servers.
+ .
S3QL is designed to favor simplicity and elegance over performance
- and feature-richness. Care has been taken to make the source code as
+ and feature-creep. 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.
+ with extensive automated test cases.
.
- This is a development/beta release of S3QL and not recommended for
- production systems. The latest stable release suitable for production
- systems is available in the s3ql package.
- .
This package contains the debugging symbols as well as the extension
built for the Python 3 debug interpreter.
Modified: packages/s3ql-beta/trunk/debian/rules
===================================================================
--- packages/s3ql-beta/trunk/debian/rules 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/rules 2013-08-28 03:19:57 UTC (rev 9988)
@@ -29,8 +29,7 @@
build_sphinx:
dh_testdir
- python3 setup.py build_ext --inplace
- python3 setup.py build_sphinx
+ python3 setup.py build_ext --inplace build_sphinx
touch $@
override_dh_auto_install:
@@ -41,46 +40,47 @@
# Note: Install non -dbg last, so that scripts don't get a -dbg interpreter
python3-dbg setup.py install --force --root=debian/tmp \
- --install-lib=/usr/lib/s3ql-beta \
- --install-scripts=/usr/lib/s3ql-beta \
+ --install-lib=/usr/lib/s3ql \
+ --install-scripts=/usr/lib/s3ql \
--no-compile -O0 --install-layout=deb
python3 setup.py install --force --root=debian/tmp \
- --install-lib=/usr/lib/s3ql-beta \
- --install-scripts=/usr/lib/s3ql-beta \
+ --install-lib=/usr/lib/s3ql \
+ --install-scripts=/usr/lib/s3ql \
--no-compile -O0 --install-layout=deb
override_dh_auto_test:
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ python3 setup.py build_ext --inplace
py.test-3 tests/
endif
override_dh_install:
dh_install
+ # Rename to avoid conflict with pcp package
+ (cd debian/s3ql/usr/share/man/man1/; mv pcp.1 parallel-cp.1)
+
# Install debugging extension and remove from regular package
- (cd debian/s3ql-beta; \
+ (cd debian/s3ql; \
find . -name "*_d.so" -or \
-regextype posix-egrep -regex ".+-[a-z0-9]*d[a-z]*.so" \
-printf "%P\0" -delete) \
- | xargs -0 dh_install --autodest -ps3ql-beta-dbg
+ | xargs -0 dh_install --autodest -ps3ql-dbg
- # Link all executable files not ending in .py into /usr/bin with
- # beta suffix, and adjust manpage name
- mkdir -p debian/s3ql-beta/usr/bin/
- for entry in debian/s3ql-beta/usr/lib/s3ql-beta/*; do \
+ # Link all executable files not ending in .py into /usr/bin
+ mkdir -p debian/s3ql/usr/bin/
+ for entry in debian/s3ql/usr/lib/s3ql/*; do \
if [ -d "$$entry" ] || [ ! -x "$$entry" ] \
|| [ "$${entry%.py}" != "$$entry" ]; then \
continue; \
fi; \
- ln -s ../lib/s3ql-beta/`basename "$$entry"` \
- "debian/s3ql-beta/usr/bin/`basename \"$$entry\"`-beta"; \
- mv debian/s3ql-beta/usr/share/man/man1/`basename "$$entry"`.1 \
- debian/s3ql-beta/usr/share/man/man1/`basename "$$entry"`-beta.1; \
+ ln -s ../lib/s3ql/`basename "$$entry"` \
+ "debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
done
override_dh_link:
- rm -rf debian/s3ql-beta-dbg/usr/share/doc/s3ql-beta-dbg
+ rm -rf debian/s3ql-dbg/usr/share/doc/s3ql-dbg
dh_link
@@ -96,5 +96,5 @@
override_dh_strip:
ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- dh_strip -ps3ql-beta --dbg-package=s3ql-beta-dbg
+ dh_strip -ps3ql --dbg-package=s3ql-dbg
endif
Deleted: packages/s3ql-beta/trunk/debian/s3ql-beta-dbg.links
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-beta-dbg.links 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/s3ql-beta-dbg.links 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1 +0,0 @@
-/usr/share/doc/s3ql-beta /usr/share/doc/s3ql-beta-dbg
Deleted: packages/s3ql-beta/trunk/debian/s3ql-beta.doc-base
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-beta.doc-base 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/s3ql-beta.doc-base 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1,11 +0,0 @@
-Document: s3ql-beta
-Title: S3QL User's Guide
-Author: Nikolaus Rath <Nikolaus at rath.org>
-Section: File Management
-
-Format: HTML
-Index: /usr/share/doc/s3ql-beta/html/index.html
-Files: /usr/share/doc/s3ql-beta/html/*.html
-
-Format: PDF
-Files: /usr/share/doc/s3ql-beta/manual.pdf.gz
Deleted: packages/s3ql-beta/trunk/debian/s3ql-beta.docs
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-beta.docs 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/s3ql-beta.docs 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1,4 +0,0 @@
-doc/html/
-contrib/
-doc/manual.pdf
-CREDITS.txt
Deleted: packages/s3ql-beta/trunk/debian/s3ql-beta.install
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-beta.install 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/s3ql-beta.install 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1 +0,0 @@
-usr/
Deleted: packages/s3ql-beta/trunk/debian/s3ql-beta.lintian-overrides
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-beta.lintian-overrides 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/s3ql-beta.lintian-overrides 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1,2 +0,0 @@
-# This is a false positive (cf https://wiki.debian.org/Hardening#Validation)
-s3ql-beta: hardening-no-fortify-functions
Copied: packages/s3ql-beta/trunk/debian/s3ql-dbg.links (from rev 9747, packages/s3ql-beta/trunk/debian/s3ql-beta-dbg.links)
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-dbg.links (rev 0)
+++ packages/s3ql-beta/trunk/debian/s3ql-dbg.links 2013-08-28 03:19:57 UTC (rev 9988)
@@ -0,0 +1 @@
+/usr/share/doc/s3ql /usr/share/doc/s3ql-dbg
Copied: packages/s3ql-beta/trunk/debian/s3ql.doc-base (from rev 9747, packages/s3ql-beta/trunk/debian/s3ql-beta.doc-base)
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql.doc-base (rev 0)
+++ packages/s3ql-beta/trunk/debian/s3ql.doc-base 2013-08-28 03:19:57 UTC (rev 9988)
@@ -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
Copied: packages/s3ql-beta/trunk/debian/s3ql.docs (from rev 9750, packages/s3ql-beta/trunk/debian/s3ql-beta.docs)
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql.docs (rev 0)
+++ packages/s3ql-beta/trunk/debian/s3ql.docs 2013-08-28 03:19:57 UTC (rev 9988)
@@ -0,0 +1,3 @@
+doc/html/
+doc/manual.pdf
+CREDITS.txt
Added: packages/s3ql-beta/trunk/debian/s3ql.examples
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql.examples (rev 0)
+++ packages/s3ql-beta/trunk/debian/s3ql.examples 2013-08-28 03:19:57 UTC (rev 9988)
@@ -0,0 +1,2 @@
+contrib/s3ql_upstart.conf
+contrib/s3ql_backup.sh
Copied: packages/s3ql-beta/trunk/debian/s3ql.install (from rev 9747, packages/s3ql-beta/trunk/debian/s3ql-beta.install)
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql.install (rev 0)
+++ packages/s3ql-beta/trunk/debian/s3ql.install 2013-08-28 03:19:57 UTC (rev 9988)
@@ -0,0 +1,4 @@
+usr/
+contrib/*.py /usr/lib/s3ql/
+contrib/*.1 /usr/share/man/man1/
+
Added: packages/s3ql-beta/trunk/debian/s3ql.links
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql.links (rev 0)
+++ packages/s3ql-beta/trunk/debian/s3ql.links 2013-08-28 03:19:57 UTC (rev 9988)
@@ -0,0 +1,2 @@
+/usr/lib/s3ql/pcp.py /usr/bin/parallel-cp
+/usr/lib/s3ql/expire_backups.py /usr/bin/expire_backups
Deleted: packages/s3ql-beta/trunk/debian/source/options
===================================================================
--- packages/s3ql-beta/trunk/debian/source/options 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/source/options 2013-08-28 03:19:57 UTC (rev 9988)
@@ -1,6 +0,0 @@
-extend-diff-ignore = "\.pyc$"
-extend-diff-ignore = "^doc/"
-extend-diff-ignore = "^src/s3ql/deltadump\.c$"
-extend-diff-ignore = "^contrib/.+\.1$"
-extend-diff-ignore = "^src/.+\.egg-info/"
-tar-ignore = "*.pyc"
Modified: packages/s3ql-beta/trunk/debian/watch
===================================================================
--- packages/s3ql-beta/trunk/debian/watch 2013-08-28 03:15:39 UTC (rev 9987)
+++ packages/s3ql-beta/trunk/debian/watch 2013-08-28 03:19:57 UTC (rev 9988)
@@ -2,6 +2,6 @@
version=3
opts=downloadurlmangle=s/^http:\/\/code.google.com\/\//http:\/\// \
http://code.google.com/p/s3ql/downloads/list \
- (?:.+)/files/s3ql-(2\..+).tar.bz2 \
+ (?:.+)/files/s3ql-(.+).tar.bz2 \
debian
More information about the Python-apps-commits
mailing list