[Python-apps-commits] r7710 - in packages/s3ql/trunk/debian (4 files)

[nikratio-guest at users.alioth.debian.org]

    Date: Monday, October 24, 2011 @ 23:22:04
  Author: nikratio-guest
Revision: 7710

Use dh_sphinxdoc. Upgrade to new upstream version 1.15.

Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/control
  packages/s3ql/trunk/debian/rules
  packages/s3ql/trunk/debian/s3ql.links

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2011-10-23 20:41:27 UTC (rev 7709)
+++ packages/s3ql/trunk/debian/changelog	2011-10-24 23:22:04 UTC (rev 7710)
@@ -1,3 +1,11 @@
+s3ql (1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Don't crash when using Google Storage backend. Closes: #646232.
+  * Use dh_sphinxdoc.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Mon, 24 Oct 2011 19:16:12 -0400
+
 s3ql (1.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control	2011-10-23 20:41:27 UTC (rev 7709)
+++ packages/s3ql/trunk/debian/control	2011-10-24 23:22:04 UTC (rev 7710)
@@ -10,7 +10,7 @@
                python-setuptools (>= 0.6.14),
                python-apsw (>= 3.7.0),
                libsqlite3-0 (>= 3.7.0),
-               python-sphinx,
+               python-sphinx (>= 1.0.7+dfsg),
                python-argparse,
                python-llfuse (>= 0.36),
                python-pycryptopp,
@@ -28,6 +28,7 @@
 Package: s3ql
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
+         ${sphinxdoc:Depends},
          python-apsw (>= 3.7.0),
          libsqlite3-0 (>= 3.7.0),
          python-lzma (>= 0.5.3),
@@ -37,9 +38,7 @@
          fuse | fuse4bsd,
          psmisc,
          python-argparse,
-         python-llfuse (>= 0.36),
-         libjs-underscore,
-         libjs-jquery
+         python-llfuse (>= 0.36)
 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

Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules	2011-10-23 20:41:27 UTC (rev 7709)
+++ packages/s3ql/trunk/debian/rules	2011-10-24 23:22:04 UTC (rev 7710)
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,sphinxdoc
 
 override_dh_installchangelogs:
 	dh_installchangelogs Changes.txt

Modified: packages/s3ql/trunk/debian/s3ql.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql.links	2011-10-23 20:41:27 UTC (rev 7709)
+++ packages/s3ql/trunk/debian/s3ql.links	2011-10-24 23:22:04 UTC (rev 7710)
@@ -1,4 +1,2 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/s3ql/html/_static/jquery.js
-/usr/share/javascript/underscore/underscore.js /usr/share/doc/s3ql/html/_static/underscore.js
 /usr/share/s3ql/pcp.py /usr/bin/parallel-cp
 /usr/share/s3ql/expire_backups.py /usr/bin/expire_backups