[Python-modules-commits] r15968 - in packages/kombu/trunk/debian (5 files)

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

    Date: Thursday, March 3, 2011 @ 18:18:25
  Author: fladi-guest
Revision: 15968

Fix issues mentioned in Stefano Riveras review.
 - Clean up after build.
 - Fix lintian warning about python dependencies.
 - Use dh_link for symlink creation.

Added:
  packages/kombu/trunk/debian/python-kombu-doc.links
  packages/kombu/trunk/debian/source/local-options
Modified:
  packages/kombu/trunk/debian/changelog
  packages/kombu/trunk/debian/control
  packages/kombu/trunk/debian/rules

Modified: packages/kombu/trunk/debian/changelog
===================================================================
--- packages/kombu/trunk/debian/changelog	2011-03-03 14:54:20 UTC (rev 15967)
+++ packages/kombu/trunk/debian/changelog	2011-03-03 18:18:25 UTC (rev 15968)
@@ -1,4 +1,4 @@
-kombu (1.0.4-1) unstable; urgency=low
+kombu (1.0.4-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #611809)
 

Modified: packages/kombu/trunk/debian/control
===================================================================
--- packages/kombu/trunk/debian/control	2011-03-03 14:54:20 UTC (rev 15967)
+++ packages/kombu/trunk/debian/control	2011-03-03 18:18:25 UTC (rev 15968)
@@ -4,7 +4,7 @@
 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),
+               python-all (>= 2.6.6-3~),
                python-amqplib (>= 0.6),
                python-anyjson,
                python-nose,
@@ -13,7 +13,7 @@
                python-simplejson,
                python-sphinx,
                python-unittest2
-XS-Python-Version: >= 2.4
+X-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/
@@ -25,6 +25,7 @@
          python-anyjson,
          ${misc:Depends},
          ${python:Depends}
+Breaks: ${python:Breaks}
 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

Added: packages/kombu/trunk/debian/python-kombu-doc.links
===================================================================
--- packages/kombu/trunk/debian/python-kombu-doc.links	                        (rev 0)
+++ packages/kombu/trunk/debian/python-kombu-doc.links	2011-03-03 18:18:25 UTC (rev 15968)
@@ -0,0 +1,2 @@
+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-03-03 14:54:20 UTC (rev 15967)
+++ packages/kombu/trunk/debian/rules	2011-03-03 18:18:25 UTC (rev 15968)
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 $@
+	dh $@ --with python2
 
 .PHONY: override_dh_installdocs
 override_dh_installdocs:
 	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:
@@ -25,3 +22,9 @@
 override_dh_compress:
 	dh_compress -X .js -X .html
 
+.PHONY: override_dh_clean
+override_dh_clean:
+	rm -rf .build
+	rm -rf kombu.egg-info/PKG-INFO
+	dh_clean
+

Added: packages/kombu/trunk/debian/source/local-options
===================================================================
--- packages/kombu/trunk/debian/source/local-options	                        (rev 0)
+++ packages/kombu/trunk/debian/source/local-options	2011-03-03 18:18:25 UTC (rev 15968)
@@ -0,0 +1 @@
+abort-on-upstream-changes