[Python-apps-commits] r10111 - in packages/s3ql/trunk/debian (15 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Sat Oct 19 23:44:52 UTC 2013
Date: Saturday, October 19, 2013 @ 23:44:50
Author: nikratio-guest
Revision: 10111
* Added patch for Sphinx 1.1.3 compatibility.
* New upstream release.
* Fixed autopkgtests (this time a missing PYTHONPATH, LP: #1223514).
Added:
packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
packages/s3ql/trunk/debian/source/format
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/patches/series
packages/s3ql/trunk/debian/rules
packages/s3ql/trunk/debian/s3ql.install
packages/s3ql/trunk/debian/tests/control
packages/s3ql/trunk/debian/tests/upstream-standard
packages/s3ql/trunk/debian/tests/upstream-with-fuse
packages/s3ql/trunk/debian/watch
Deleted:
packages/s3ql/trunk/debian/source/format
packages/s3ql/trunk/debian/source/options
Modified: packages/s3ql/trunk/debian/NEWS
===================================================================
--- packages/s3ql/trunk/debian/NEWS 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/NEWS 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,3 +1,11 @@
+s3ql (2.5-1) UNRELEASED; 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> Sat, 19 Oct 2013 16:34:46 -0700
+
s3ql (1.11-1) unstable; urgency=low
* The file system structure has changed, existing file systems
Modified: packages/s3ql/trunk/debian/README.Debian
===================================================================
--- packages/s3ql/trunk/debian/README.Debian 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/README.Debian 2013-10-19 23:44:50 UTC (rev 10111)
@@ -5,7 +5,8 @@
Q: 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
+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
@@ -14,5 +15,3 @@
The upstart script (s3ql_upstart.conf) and sample backup script
(s3ql_backup.sh) are installed in /usr/share/doc/s3ql/examples.
-
- benchmark.py is installed into /usr/lib/s3ql.
Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/changelog 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,3 +1,11 @@
+s3ql (2.5-1) UNRELEASED; urgency=low
+
+ * Added patch for Sphinx 1.1.3 compatibility.
+ * New upstream release.
+ * Fixed autopkgtests (this time a missing PYTHONPATH, LP: #1223514).
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 27 Aug 2013 20:17:06 -0700
+
s3ql (1.16-2) unstable; urgency=low
* Updated uploader email address.
Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/control 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,29 +1,27 @@
Source: s3ql
Section: misc
Priority: optional
-X-Python-Version: >= 2.7
+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.org>
Build-Depends: debhelper (>= 9),
- python-dev (>= 2.7),
- python-dbg,
- python-setuptools (>= 0.6.14),
- python-apsw (>= 3.7.0),
- libsqlite3-dev (>= 3.7.0),
- python-sphinx (>= 1.0.7+dfsg),
- python (>= 2.7),
- python-unittest2,
- python-llfuse (>= 0.37),
- python-pycryptopp,
- python-lzma (>= 0.5.3),
+ python3 (>= 3.3),
+ python3-dev (>= 3.3),
+ python3-dbg,
+ python3-setuptools (>= 0.6.14),
+ python3-apsw (>= 3.7.0),
+ python3-sphinx (>= 1.1.3),
+ python3-llfuse (>= 0.39),
+ python3-crypto,
+ python3-pytest (>= 2.3.3),
+ cython3 (>= 0.17),
texlive-latex-base,
texlive-latex-recommended,
texlive-latex-extra,
texlive-fonts-recommended,
- cython (>= 0.17),
- python-pytest
+ 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/trunk/
@@ -32,16 +30,12 @@
Package: s3ql
Architecture: any
Depends: ${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
${sphinxdoc:Depends},
- libsqlite3-0 (>= 3.7.0),
fuse [linux-any] | fuse4bsd [kfreebsd-any],
psmisc,
- python-llfuse (>= 0.37),
- python-apsw (>= 3.7.0),
- python-lzma (>= 0.5.3),
- python-pkg-resources
+ python3-pkg-resources
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
@@ -68,13 +62,12 @@
Architecture: any
Section: debug
Priority: extra
-Recommends: python-dbg,
- python-llfuse-dbg,
- python-apsw-dbg,
- python-pycryptopp-dbg,
- python-lzma-dbg
+Recommends: python3-dbg,
+ python3-llfuse-dbg,
+ python3-apsw-dbg,
+ python3-crypto-dbg,
Depends: s3ql (= ${binary:Version}),
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
${misc:Depends}
Description: Full-featured file system for online data storage (debugging symbols)
@@ -100,4 +93,4 @@
with extensive automated test cases.
.
This package contains the debugging symbols as well as the extension
- built for the Python 2 debug interpreter.
+ built for the Python 3 debug interpreter.
Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/patches/series 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1 +1,2 @@
proc_mount.diff
+sphinx-1.1.1-compat.diff
Added: packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff (rev 0)
+++ packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff 2013-10-19 23:44:50 UTC (rev 10111)
@@ -0,0 +1,78 @@
+Description: Monkeypatch for Sphinx 1.1.3 compatibility
+Origin: debian
+Forwarded: no
+Last-Update: <2013-10-19>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+This patch can be dropped as soon as Sphinx 1.2 (or newer)
+arrives in unstable. It works around issues
+
+https://bitbucket.org/birkenfeld/sphinx/issue/1281/
+
+and
+
+https://bitbucket.org/birkenfeld/sphinx/issue/1196/
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,9 +18,15 @@
+ except ImportError:
+ raise SystemExit('Setuptools/distribute package not found. Please install from '
+ 'https://pypi.python.org/pypi/distribute')
+-import setuptools.command.test as setuptools_test
+ from setuptools import Extension
+
++# Work around https://bitbucket.org/birkenfeld/sphinx/issue/1196/
++import locale
++import os
++os.environ['LC_ALL'] = 'C.UTF-8'
++os.environ['LANG'] = 'C.UTF-8'
++locale.setlocale(locale.LC_ALL, '')
++
+ import os
+ import subprocess
+ import logging.handlers
+@@ -66,6 +72,7 @@
+ except ImportError:
+ raise SystemExit('This command requires Sphinx to be installed.') from None
+
++ fix_sphinx_issue_1281()
+ fix_docutils()
+
+ dest_dir = os.path.join(basedir, 'doc')
+@@ -290,6 +297,35 @@
+
+ assert docutils.parsers.get_parser_class('rst') is rst.Parser
+
++def fix_sphinx_issue_1281():
++ '''Monkeypatch for https://bitbucket.org/birkenfeld/sphinx/issue/1281'''
++
++ import sphinx
++
++ sphinx_ver = tuple(sphinx.__version__.split('.'))
++ if sphinx_ver >= ('1', '2'):
++ return
++
++ elif sphinx_ver != ('1', '1', '3'):
++ raise SystemExit('Need Sphinx 1.2 or newer')
++
++ from sphinx.writers import manpage
++ from sphinx.locale import admonitionlabels
++
++ try:
++ del manpage.ManualPageTranslator.visit_admonition
++ except AttributeError:
++ pass
++
++ real_init = manpage.ManualPageTranslator.__init__
++
++ def __init__(self, builder, *args, **kwds):
++ real_init(self, builder, *args, **kwds)
++ # Overwrite admonition label translations with our own
++ for label, translation in admonitionlabels.items():
++ self.language.labels[label] = self.deunicode(translation)
++
++
+
+ if __name__ == '__main__':
+ main()
Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/rules 2013-10-19 23:44:50 UTC (rev 10111)
@@ -3,29 +3,33 @@
#export DH_VERBOSE=1
+
+# NOTE:
+# Anyone willing to convert the package to pure debhelper
+# (i.e., without dh sequencer) is very welcome to do so.
+
%:
- dh $@ --with python2,sphinxdoc
+ dh $@ --with python3,sphinxdoc
override_dh_auto_build: build-stamp
-build-stamp: build_cython build-python build_sphinx
+build-stamp: build_cython build-python build_sphinx
touch $@
build_cython:
dh_testdir
- python setup.py build_cython
+ python3 setup.py build_cython
touch $@
build-python:
dh_testdir
- python-dbg setup.py build -g
- python setup.py build -g
+ python3-dbg setup.py build -g
+ python3 setup.py build -g
touch $@
build_sphinx:
dh_testdir
- python setup.py build_ext --inplace
- python setup.py build_sphinx
+ python3 setup.py build_ext --inplace build_sphinx
touch $@
override_dh_auto_install:
@@ -35,19 +39,20 @@
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 \
+ python3-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 \
+ python3 setup.py install --force --root=debian/tmp \
--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)))
- python setup.py test
+ python3 setup.py build_ext --inplace
+ py.test-3 tests/
endif
override_dh_install:
@@ -63,11 +68,8 @@
-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
-
- # Link all executable files not ending in .py into /usr/bin
+ # 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 \
@@ -77,11 +79,20 @@
"debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
done
+override_dh_link:
+ rm -rf debian/s3ql-dbg/usr/share/doc/s3ql-dbg
+ dh_link
+
+
+# We don't want to call setup.py clean, because this
+# requires a number of (potentially uninstalled) build-dependencies.
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 test.log build doc src/s3ql/*.so src/s3ql/deltadump.c
- rm -rf build-python* build_cython build_sphinx build-stamp
+ rm -rf build doc tests/test.log src/s3ql/deltadump.c contrib/*.1
+ find \( \( -name '*.egg-info' -type d \) \
+ -o \( -name __pycache__ -type d \) \
+ -o \( -name '*.so' -type f \) \
+ \) -prune -exec rm -rf '{}' +
+ rm -rf build-python build_cython build_sphinx build-stamp
override_dh_strip:
ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
Modified: packages/s3ql/trunk/debian/s3ql.install
===================================================================
--- packages/s3ql/trunk/debian/s3ql.install 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/s3ql.install 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,3 +1,4 @@
+usr/
contrib/*.py /usr/lib/s3ql/
contrib/*.1 /usr/share/man/man1/
-usr/
+
Deleted: packages/s3ql/trunk/debian/source/format
===================================================================
--- packages/s3ql/trunk/debian/source/format 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/source/format 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1 +0,0 @@
-3.0 (quilt)
Added: packages/s3ql/trunk/debian/source/format
===================================================================
--- packages/s3ql/trunk/debian/source/format (rev 0)
+++ packages/s3ql/trunk/debian/source/format 2013-10-19 23:44:50 UTC (rev 10111)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: packages/s3ql/trunk/debian/source/options
===================================================================
--- packages/s3ql/trunk/debian/source/options 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/source/options 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,8 +0,0 @@
-compression = "bzip2"
-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"
Modified: packages/s3ql/trunk/debian/tests/control
===================================================================
--- packages/s3ql/trunk/debian/tests/control 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/tests/control 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,10 +1,10 @@
Tests: upstream-standard
-Depends: python-pytest, rsync, s3ql
+Depends: python3-pytest, rsync, s3ql
# This is really the same test suite, but when run with root
# access (or permission to mount fuse file systems), additional
# tests will be run.
Tests: upstream-with-fuse
-Depends: python-pytest, rsync, s3ql
+Depends: python3-pytest, rsync, s3ql
Restrictions: needs-root
Modified: packages/s3ql/trunk/debian/tests/upstream-standard
===================================================================
--- packages/s3ql/trunk/debian/tests/upstream-standard 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/tests/upstream-standard 2013-10-19 23:44:50 UTC (rev 10111)
@@ -4,4 +4,4 @@
# executed because of insufficient priviliges.
export PYTHONPATH="/usr/lib/s3ql:${PYTHONPATH}"
-exec py.test tests/
+exec py.test-3 --installed tests/
Modified: packages/s3ql/trunk/debian/tests/upstream-with-fuse
===================================================================
--- packages/s3ql/trunk/debian/tests/upstream-with-fuse 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/tests/upstream-with-fuse 2013-10-19 23:44:50 UTC (rev 10111)
@@ -1,4 +1,4 @@
#!/bin/sh
export PYTHONPATH="/usr/lib/s3ql:${PYTHONPATH}"
-exec py.test tests/
+exec py.test-3 --installed tests/
Modified: packages/s3ql/trunk/debian/watch
===================================================================
--- packages/s3ql/trunk/debian/watch 2013-10-19 23:30:34 UTC (rev 10110)
+++ packages/s3ql/trunk/debian/watch 2013-10-19 23:44:50 UTC (rev 10111)
@@ -2,5 +2,6 @@
version=3
opts=downloadurlmangle=s/^http:\/\/code.google.com\/\//http:\/\// \
http://code.google.com/p/s3ql/downloads/list \
- (?:.+)/files/s3ql-(1\..+).tar.bz2 \
+ (?:.+)/files/s3ql-(.+).tar.bz2 \
debian
+
More information about the Python-apps-commits
mailing list