Merge pull request pycassa#232 from sbadia/debian

Update for debian release

debian/changelog

@@ -1,10 +1,10 @@
-pycassa (1.11.0) unstable; urgency=low
+pycassa (1.11.0-1) unstable; urgency=low
 
-  * Non-maintainer upload.
   * Return timestamp from remove() in stub ColumnFamily
   * Upgrade Thrift (adds LOCAL_ONE and populate_io_cache_on_flush)
+  * Initial release (Closes: #744164)
 
- -- Sebastien Badia <seb@sebian.fr>  Mon, 07 Apr 2014 14:51:27 +0200
+ -- Sebastien Badia <seb@sebian.fr>  Fri, 11 Apr 2014 01:07:55 +0200
 
 pycassa (1.10.0) unstable; urgency=low
 

debian/control

@@ -2,16 +2,21 @@ Source: pycassa
 Section: python
 Priority: optional
 Maintainer: Paul Cannon <paul@datastax.com>
-Uploaders: Tyler Hobbs <tyler@datastax.com>
-Build-Depends: debhelper (>= 7.0.50~), python-all, python-support, python-sphinx, python-thrift (>= 0.5.0), python-setuptools
+Uploaders: Tyler Hobbs <tyler@datastax.com>, Sebastien Badia <seb@sebian.fr>
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all,
+               python-setuptools,
+               python-sphinx,
+               python-support,
+               python-thrift (>= 0.5.0)
 Homepage: http://pycassa.github.io/pycassa/
 Vcs-Git: git://github.com/pycassa/pycassa.git
 Vcs-Browser: https://github.com/pycassa/pycassa/
 Standards-Version: 3.9.5
 
 Package: python-pycassa
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-thrift (>= 0.5.0)
+Depends: python-thrift (>= 0.5.0), ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Suggests: ipython
 Description: Client library for Apache Cassandra
@@ -29,7 +34,7 @@ Description: Client library for Apache Cassandra
 Package: pycassa-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery (>= 1.4.2), ${misc:Depends}
+Depends: libjs-jquery (>= 1.4.2), libjs-underscore (>= 1.1.6), ${misc:Depends}
 Suggests: python-pycassa
 Description: Documentation for the Pycassa library
  Pycassa is a client library for Apache Cassandra with the following

debian/pycassa-doc.doc-base

@@ -0,0 +1,12 @@
+Document: pycassa
+Title: Pycassa Documentation
+Section: Programming/Python
+Abstract: pycassa is a Thrift-based Python client library
+ for Apache Cassandra with the following features: Automatic
+ failover and operation retries; Connection pooling; Multithreading
+ support; A batch interface; A class for mapping classes to Cassandra
+ column families.
+
+Format: HTML
+Index: /usr/share/doc/pycassa-doc/manual/index.html
+Files: /usr/share/doc/pycassa-doc/manual/*.html

debian/pycassa-doc.links

@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js usr/share/doc/pycassa-doc/manual/_static/jquery.js
+/usr/share/javascript/underscore/underscore.js usr/share/doc/pycassa-doc/manual/_static/underscore.js

debian/rules

@@ -10,6 +10,7 @@ override_dh_auto_build:
 override_dh_install:
 	dh_install
 	rm debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/_static/jquery.js
+	rm debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/_static/underscore.js
 	ln -s /usr/share/javascript/jquery/jquery.js debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/_static/
 
 override_dh_auto_install: