[Python-modules-commits] r15955 - in packages/kombu/trunk/debian (4 files)

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

    Date: Wednesday, March 2, 2011 @ 13:47:26
  Author: fladi-guest
Revision: 15955

Fix issues mentioned by Stefano Rivera in his review.

Modified:
  packages/kombu/trunk/debian/control
  packages/kombu/trunk/debian/copyright
  packages/kombu/trunk/debian/python-kombu.docs
  packages/kombu/trunk/debian/rules

Modified: packages/kombu/trunk/debian/control
===================================================================
--- packages/kombu/trunk/debian/control	2011-03-02 13:25:38 UTC (rev 15954)
+++ packages/kombu/trunk/debian/control	2011-03-02 13:47:26 UTC (rev 15955)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~), 
-               python-all (>=2.6), 
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.6),
                python-amqplib (>= 0.6),
                python-anyjson,
                python-nose,
@@ -12,9 +12,8 @@
                python-setuptools,
                python-simplejson,
                python-sphinx,
-               python-support,
                python-unittest2
-XS-Python-Version: >= 2.6
+XS-Python-Version: >= 2.4
 Standards-Version: 3.9.1
 Homepage: http://github.com/ask/kombu/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/kombu/trunk/
@@ -22,13 +21,11 @@
 
 Package: python-kombu
 Architecture: all
-Depends: ${misc:Depends}, 
-         ${python:Depends},
-         python-amqplib (>= 0.6),
+Depends: python-amqplib (>= 0.6),
          python-anyjson,
-         python-simplejson,
-Provides: ${python:Provides}
-Suggests: python-pymongo
+         ${misc:Depends},
+         ${python:Depends}
+Suggests: python-kombu-doc, python-pymongo
 Description: AMQP Messaging Framework for Python
  The aim of Kombu is to make messaging in Python as easy as possible by
  providing an idiomatic high-level interface for the AMQP protocol. It is meant
@@ -36,7 +33,7 @@
  .
  Features:
   * Allows application authors to support several message server solutions by
-    using pluggable transports.
+    using plugable transports.
   * Supports automatic encoding, serialization and compression of message
     payloads.
   * The ability to ensure that an operation is performed by gracefully handling
@@ -45,9 +42,7 @@
 Package: python-kombu-doc
 Section: doc
 Architecture: all
-Depends: ${python:Depends}, 
-         ${misc:Depends}, 
-         python-kombu
+Depends: python-kombu, ${misc:Depends}, ${python:Depends}
 Recommends: libjs-jquery
 Description: AMQP Messaging Framework for Python (Documentation)
  The aim of Kombu is to make messaging in Python as easy as possible by
@@ -56,7 +51,7 @@
  .
  Features:
   * Allows application authors to support several message server solutions by
-    using pluggable transports.
+    using plugable transports.
   * Supports automatic encoding, serialization and compression of message
     payloads.
   * The ability to ensure that an operation is performed by gracefully handling

Modified: packages/kombu/trunk/debian/copyright
===================================================================
--- packages/kombu/trunk/debian/copyright	2011-03-02 13:25:38 UTC (rev 15954)
+++ packages/kombu/trunk/debian/copyright	2011-03-02 13:47:26 UTC (rev 15955)
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright: 2009-2011, Ask Solem and contributors.
-License: BSD
+License: BSD-solem
 
 Files: kombu/utils/functional.py
 Copyright: 2001-2007, Python Software
@@ -13,25 +13,25 @@
 
 Files: docs/_theme/celery/static/celery.css_t
 Copyright: 2010, Armin Ronacher
-License: BSD
+License: BSD-solem
 
 Files: kombu/transport/beanstalk.py
 Copyright: 2010-2011, David Ziegler.
-License: BSD
+License: BSD-solem
 
 Files: kombu/transport/mongodb.py
 Copyright: 2010-2011, Flavio Percoco Premoli
-License: BSD
+License: BSD-solem
 
 Files: kombu/transport/pycouchdb.py
 Copyright: 2010-2011, David Clymer
-License: BSD
+License: BSD-solem
 
 Files: debian/*
-Copyright: 2010, Fladischer Michael
-License: BSD
+Copyright: 2011, Fladischer Michael
+License: BSD-solem
 
-License: BSD
+License: BSD-solem
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -70,7 +70,7 @@
  alone or in any derivative version, provided, however, that PSF's
  License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
  2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version 
+ Reserved" are retained in Python alone or in any derivative version
  prepared by Licensee.
  .
  3. In the event Licensee prepares a derivative work that is based on
@@ -103,4 +103,3 @@
  8. By copying, installing or otherwise using Python, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
-

Modified: packages/kombu/trunk/debian/python-kombu.docs
===================================================================
--- packages/kombu/trunk/debian/python-kombu.docs	2011-03-02 13:25:38 UTC (rev 15954)
+++ packages/kombu/trunk/debian/python-kombu.docs	2011-03-02 13:47:26 UTC (rev 15955)
@@ -1,3 +1,2 @@
 README
-TODO
 FAQ

Modified: packages/kombu/trunk/debian/rules
===================================================================
--- packages/kombu/trunk/debian/rules	2011-03-02 13:25:38 UTC (rev 15954)
+++ packages/kombu/trunk/debian/rules	2011-03-02 13:47:26 UTC (rev 15955)
@@ -1,15 +1,16 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with python2 $@
 
 .PHONY: override_dh_installdocs
 override_dh_installdocs:
-	PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d .build/.doctrees -N docs .build/html
+	PYTHONPATH=. sphinx-build -b html -d .build/.doctrees -N docs .build/html
 	dh_installdocs
 	rm -rf .build
 	rm debian/python-kombu-doc/usr/share/doc/python-kombu-doc/html/_static/jquery.js
 	ln -s ../../../../javascript/jquery/jquery.js debian/python-kombu-doc/usr/share/doc/python-kombu-doc/html/_static/jquery.js
+	ln -s ../html/_sources/ debian/python-kombu-doc/usr/share/doc/python-kombu-doc/rst
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test: