[Python-apps-commits] r7865 - in packages/s3ql/trunk/debian (9 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Sun Nov 27 21:49:42 UTC 2011
Date: Sunday, November 27, 2011 @ 21:49:40
Author: nikratio-guest
Revision: 7865
Updated to new upstream release 1.7.
Added:
packages/s3ql/trunk/debian/s3ql-dbg.links
Modified:
packages/s3ql/trunk/debian/NEWS
packages/s3ql/trunk/debian/README.Debian
packages/s3ql/trunk/debian/changelog
packages/s3ql/trunk/debian/control
packages/s3ql/trunk/debian/rules
packages/s3ql/trunk/debian/s3ql.install
packages/s3ql/trunk/debian/s3ql.links
packages/s3ql/trunk/debian/source/options
Modified: packages/s3ql/trunk/debian/NEWS
===================================================================
--- packages/s3ql/trunk/debian/NEWS 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/NEWS 2011-11-27 21:49:40 UTC (rev 7865)
@@ -1,3 +1,11 @@
+s3ql (1.7-1) unstable; urgency=low
+
+ * The file system structure has changed, existing file systems
+ need to be upgraded using "s3qladm upgrade" before they can
+ be used.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 27 Nov 2011 16:43:06 -0500
+
s3ql (1.4-1) unstable; urgency=low
Notes for upgrading from version 1.0 or earlier:
Modified: packages/s3ql/trunk/debian/README.Debian
===================================================================
--- packages/s3ql/trunk/debian/README.Debian 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/README.Debian 2011-11-27 21:49:40 UTC (rev 7865)
@@ -15,5 +15,5 @@
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.
+ benchmark.py and make_dummy.py are installed into /usr/lib/s3ql.
Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/changelog 2011-11-27 21:49:40 UTC (rev 7865)
@@ -1,3 +1,9 @@
+s3ql (1.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 27 Nov 2011 14:40:58 -0500
+
s3ql (1.6-1) unstable; urgency=low
* New upstream release.
Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/control 2011-11-27 21:49:40 UTC (rev 7865)
@@ -1,17 +1,19 @@
Source: s3ql
Section: misc
-X-Python-Version: >= 2.6.6
Priority: optional
+X-Python-Version: >= 2.6
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>
Build-Depends: debhelper (>= 8),
- python (>= 2.6.6-3~),
+ python-dev (>= 2.6.6-3~),
+ python-dbg,
python-setuptools (>= 0.6.14),
python-apsw (>= 3.7.0),
- libsqlite3-0 (>= 3.7.0),
+ libsqlite3-dev (>= 3.7.0),
python-sphinx (>= 1.0.7+dfsg),
python-argparse,
+ python-unittest2,
python-llfuse (>= 0.36),
python-pycryptopp,
python-paramiko,
@@ -19,15 +21,18 @@
texlive-latex-base,
texlive-latex-recommended,
texlive-latex-extra,
- texlive-fonts-recommended
+ texlive-fonts-recommended,
+ cython (>= 0.15.1)
Standards-Version: 3.9.2
Homepage: http://code.google.com/p/s3ql/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/s3ql/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/s3ql/trunk/
Package: s3ql
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
+Architecture: any
+Depends: ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends},
${sphinxdoc:Depends},
python-apsw (>= 3.7.0),
libsqlite3-0 (>= 3.7.0),
@@ -35,7 +40,7 @@
python-paramiko,
python-pycryptopp,
python-setuptools,
- fuse | fuse4bsd,
+ fuse [linux-any] | fuse4bsd [kfreebsd-any],
psmisc,
python-argparse,
python-llfuse (>= 0.36)
@@ -56,3 +61,33 @@
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.
+
+Package: s3ql-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Recommends: python-dbg
+Depends: s3ql (= ${binary:Version}),
+ ${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 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.
+ .
+ This package contains the debugging symbols as well as the extension
+ built for the Python 2 debug interpreter.
+
Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/rules 2011-11-27 21:49:40 UTC (rev 7865)
@@ -6,34 +6,88 @@
%:
dh $@ --with python2,sphinxdoc
-override_dh_installchangelogs:
- dh_installchangelogs Changes.txt
+override_dh_auto_build: build-stamp
-override_dh_auto_build:
- python setup.py build_sphinx build
+build-stamp: build_cython build-python build_sphinx
+ touch $@
-override_dh_auto_install:
- python setup.py install --root=debian/s3ql --install-layout=deb \
- --install-lib=/usr/share/s3ql --install-scripts=/usr/share/s3ql
+build_cython:
+ dh_testdir
+ python setup.py build_cython
+ touch $@
+build-python:
+ dh_testdir
+ python-dbg setup.py build -g
+ python setup.py build -g
+ python setup.py test
+ touch $@
+
+build_sphinx:
+ dh_testdir
+ python setup.py build_ext --inplace
+ python setup.py build_sphinx
+ touch $@
+
+override_dh_auto_install:
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ # Note: Install non -dbg last, so that scripts don't get a -dbg interpreter
+ python-dbg setup.py install --force --root=debian/tmp \
+ --install-lib=/usr/lib/s3ql \
+ --install-scripts=/usr/lib/s3ql \
+ --no-compile -O0 --install-layout=deb
+
+ python setup.py install --force --root=debian/tmp \
+ --install-lib=/usr/lib/s3ql \
+ --install-scripts=/usr/lib/s3ql \
+ --no-compile -O0 --install-layout=deb
+
+ # It would be nicer to install in /usr/share/s3ql and just move
+ # the arch-dependent .so to /usr/lib, but then python doesn't
+ # find them. If we install symlinks instead (which the code below
+ # does), gdb does not find the corresponding debugging extensions
+ # because they end up in /usr/lib/debug/usr/lib/.
+ #find debian/tmp/usr/share/ -name "*.so" -printf "%P\n" | \
+ #while read file; do \
+ # mkdir -p `dirname "debian/tmp/usr/lib/$${file}"`; \
+ # mv "debian/tmp/usr/share/$${file}" "debian/tmp/usr/lib/$${file}"; \
+ # dh_link -ptmp "/usr/lib/$${file}" "/usr/share/$${file}"; \
+ #done
+
+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; \
+ find . -name "*_d.so" -printf "%P\0" -delete) \
+ | xargs -0 dh_install --autodest -ps3ql-dbg
+
override_dh_link:
+ rm -rf debian/s3ql-dbg/usr/share/doc/s3ql-dbg
dh_link
- # Don't link scripts ending in .py
- for entry in debian/s3ql/usr/share/s3ql/*; do \
+
+ # Link all executable files not ending in .py into /usr/bin
+ for entry in debian/s3ql/usr/lib/s3ql/*; do \
if [ -d "$$entry" ] || [ ! -x "$$entry" ] \
|| [ "$${entry%.py}" != "$$entry" ]; then \
continue; \
fi; \
- ln -s ../share/s3ql/`basename "$$entry"` \
+ ln -s ../lib/s3ql/`basename "$$entry"` \
"debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
done
-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)
-
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
+ rm -rf dist setup.log build doc src/s3ql/*.so
+ rm -rf build-python* build_cython build_sphinx build-stamp
+
+override_dh_strip:
+ dh_strip -ps3ql --dbg-package=s3ql-dbg
Added: packages/s3ql/trunk/debian/s3ql-dbg.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql-dbg.links (rev 0)
+++ packages/s3ql/trunk/debian/s3ql-dbg.links 2011-11-27 21:49:40 UTC (rev 7865)
@@ -0,0 +1 @@
+/usr/share/doc/s3ql /usr/share/doc/s3ql-dbg
Modified: packages/s3ql/trunk/debian/s3ql.install
===================================================================
--- packages/s3ql/trunk/debian/s3ql.install 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/s3ql.install 2011-11-27 21:49:40 UTC (rev 7865)
@@ -1,2 +1,3 @@
-contrib/*.py /usr/share/s3ql/
+contrib/*.py /usr/lib/s3ql/
contrib/*.1 /usr/share/man/man1/
+usr/
Modified: packages/s3ql/trunk/debian/s3ql.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql.links 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/s3ql.links 2011-11-27 21:49:40 UTC (rev 7865)
@@ -1,2 +1,2 @@
-/usr/share/s3ql/pcp.py /usr/bin/parallel-cp
-/usr/share/s3ql/expire_backups.py /usr/bin/expire_backups
+/usr/lib/s3ql/pcp.py /usr/bin/parallel-cp
+/usr/lib/s3ql/expire_backups.py /usr/bin/expire_backups
Modified: packages/s3ql/trunk/debian/source/options
===================================================================
--- packages/s3ql/trunk/debian/source/options 2011-11-27 14:41:27 UTC (rev 7864)
+++ packages/s3ql/trunk/debian/source/options 2011-11-27 21:49:40 UTC (rev 7865)
@@ -2,6 +2,7 @@
compression-level = 9
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"
More information about the Python-apps-commits
mailing list