[Python-modules-commits] r18407 - in packages/kombu/trunk/debian (7 files)

Thu Sep 1 19:00:26 UTC 2011

Date: Thursday, September 1, 2011 @ 19:00:24
  Author: fladi-guest
Revision: 18407

Prepare for new upstream release.

Modified:
  packages/kombu/trunk/debian/changelog
  packages/kombu/trunk/debian/control
  packages/kombu/trunk/debian/copyright
  packages/kombu/trunk/debian/patches/remove_nose-cover3.patch
  packages/kombu/trunk/debian/python-kombu-doc.docs
  packages/kombu/trunk/debian/python-kombu-doc.links
  packages/kombu/trunk/debian/rules

Modified: packages/kombu/trunk/debian/changelog
===================================================================

--- packages/kombu/trunk/debian/changelog	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/changelog	2011-09-01 19:00:24 UTC (rev 18407)
@@ -1,4 +1,4 @@
-kombu (1.1.3-1) UNRELEASED; urgency=low
+kombu (1.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Depend on python-anyjson (>=0.3.1), therefor no longer recommend
@@ -7,7 +7,7 @@
   * Bumped Standards-Version to 3.9.2 (no change necessary).
   * Add version to Breaks: python-cjson (<= 1.0.5-4+b1).
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Sun, 08 May 2011 20:42:59 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Tue, 17 May 2011 19:14:28 +0200
 
 kombu (1.0.4-1) unstable; urgency=low
 

Modified: packages/kombu/trunk/debian/control
===================================================================
--- packages/kombu/trunk/debian/control	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/control	2011-09-01 19:00:24 UTC (rev 18407)
@@ -5,7 +5,7 @@
 Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.6.6-3~),
-               python-amqplib (>= 0.6),
+               python-amqplib (>= 1.0),
                python-anyjson (>=0.3.1),
                python-couchdb (>= 0.8),
                python-nose,
@@ -24,7 +24,7 @@
 
 Package: python-kombu
 Architecture: all
-Depends: python-amqplib (>= 0.6),
+Depends: python-amqplib (>= 1.0),
          python-anyjson (>=0.3.1),
          ${misc:Depends},
          ${python:Depends}
@@ -47,8 +47,8 @@
 Package: python-kombu-doc
 Section: doc
 Architecture: all
-Depends: python-kombu, ${misc:Depends}, ${python:Depends}
-Recommends: libjs-jquery
+Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}
+Recommends: python-kombu, libjs-jquery
 Description: AMQP Messaging Framework for Python (Documentation)
  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

Modified: packages/kombu/trunk/debian/copyright
===================================================================
--- packages/kombu/trunk/debian/copyright	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/copyright	2011-09-01 19:00:24 UTC (rev 18407)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
 Upstream-Name: kombu
 Upstream-Contact: Ask Solem <askh at opera.com>
 Source: http://pypi.python.org/pypi/kombu/

Modified: packages/kombu/trunk/debian/patches/remove_nose-cover3.patch
===================================================================
--- packages/kombu/trunk/debian/patches/remove_nose-cover3.patch	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/patches/remove_nose-cover3.patch	2011-09-01 19:00:24 UTC (rev 18407)
@@ -3,17 +3,26 @@
 Last-Update: 2011-02-02
 Forwarded: not-needed
 
-Index: kombu/setup.cfg
-===================================================================
---- kombu.orig/setup.cfg	2011-02-02 09:22:46.293925980 +0100
-+++ kombu/setup.cfg	2011-02-02 09:23:00.526698107 +0100
-@@ -13,20 +13,9 @@
- tag_svn_revision = 0
+--- a/setup.py
++++ b/setup.py
+@@ -5,7 +5,7 @@
+ import codecs
  
- [nosetests]
+ extra = {}
+-tests_require = ["nose", "nose-cover3"]
++tests_require = ["nose"]
+ if sys.version_info >= (3, 0):
+     extra.update(use_2to3=True)
+ elif sys.version_info <= (2, 6):
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -2,17 +2,6 @@
+ verbosity = 1
+ detailed-errors = 1
+ where = kombu/tests
 -cover3-branch = 1
+-cover3-html = 1
 -cover3-package = kombu
- verbosity = 1
 -cover3-exclude = kombu
 -	kombu.utils.compat
 -	kombu.utils.functional
@@ -22,22 +31,6 @@
 -	kombu.transport.pycouchdb
 -	kombu.transport.mongodb
 -	kombu.transport.beanstalk
- detailed-errors = 1
- where = kombu/tests
--cover3-html = 1
  
- [upload_sphinx]
- upload-dir = docs/.build/html
-Index: kombu/setup.py
-===================================================================
---- kombu.orig/setup.py	2011-02-02 09:22:29.953039799 +0100
-+++ kombu/setup.py	2011-02-02 09:22:42.953744862 +0100
-@@ -5,7 +5,7 @@
- import codecs
- 
- extra = {}
--tests_require = ["nose", "nose-cover3"]
-+tests_require = ["nose"]
- if sys.version_info >= (3, 0):
-     extra.update(use_2to3=True)
- elif sys.version_info <= (2, 6):
+ [build_sphinx]
+ source-dir = docs/

Modified: packages/kombu/trunk/debian/python-kombu-doc.docs
===================================================================
--- packages/kombu/trunk/debian/python-kombu-doc.docs	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/python-kombu-doc.docs	2011-09-01 19:00:24 UTC (rev 18407)
@@ -1 +1 @@
-.build/html
+docs/.build/html

Modified: packages/kombu/trunk/debian/python-kombu-doc.links
===================================================================
--- packages/kombu/trunk/debian/python-kombu-doc.links	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/python-kombu-doc.links	2011-09-01 19:00:24 UTC (rev 18407)
@@ -1,2 +1 @@
 usr/share/doc/python-kombu-doc/html/_sources usr/share/doc/python-kombu-doc/rst
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-kombu-doc/html/_static/jquery.js

Modified: packages/kombu/trunk/debian/rules
===================================================================
--- packages/kombu/trunk/debian/rules	2011-09-01 11:41:05 UTC (rev 18406)
+++ packages/kombu/trunk/debian/rules	2011-09-01 19:00:24 UTC (rev 18407)
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,sphinxdoc
 
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
-	PYTHONPATH=. sphinx-build -b html -d .build/.doctrees -N docs .build/html
-	dh_installdocs
-	rm debian/python-kombu-doc/usr/share/doc/python-kombu-doc/html/_static/jquery.js
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs docs/.build/html
+	dh_auto_build
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
@@ -24,7 +23,7 @@
 
 .PHONY: override_dh_clean
 override_dh_clean:
-	rm -rf .build
+	rm -rf docs/.build
 	rm -rf kombu.egg-info/PKG-INFO
 	dh_clean
 


