[Python-modules-commits] r9902 - in packages/inotifyx/trunk/debian (5 files)

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

    Date: Tuesday, September 29, 2009 @ 09:31:27
  Author: rrs-guest
Revision: 9902

Merge branch 'master' into local-svn/trunk

Added:
  packages/inotifyx/trunk/debian/python-inotifyx.doc-base
  packages/inotifyx/trunk/debian/python-inotifyx.install
Modified:
  packages/inotifyx/trunk/debian/changelog
  packages/inotifyx/trunk/debian/control
  packages/inotifyx/trunk/debian/rules

Modified: packages/inotifyx/trunk/debian/changelog
===================================================================
--- packages/inotifyx/trunk/debian/changelog	2009-09-28 21:39:05 UTC (rev 9901)
+++ packages/inotifyx/trunk/debian/changelog	2009-09-29 09:31:27 UTC (rev 9902)
@@ -1,3 +1,13 @@
+inotifyx (0.1.0-4) unstable; urgency=low
+
+  * Don't manipulate site-packages/ directly, this fails going forward with
+    Python 2.6. Thanks to Luca Falavigna for the patch
+    (Closes: #547879) 
+  * Add doc-base as Recommends since we are now registering the docs with
+    doc-base
+
+ -- Ritesh Raj Sarraf <rrs at researchut.com>  Tue, 29 Sep 2009 14:56:14 +0530
+
 inotifyx (0.1.0-3) unstable; urgency=low
 
   * Update Standards-Version to 3.8.3 (No changes required)

Modified: packages/inotifyx/trunk/debian/control
===================================================================
--- packages/inotifyx/trunk/debian/control	2009-09-28 21:39:05 UTC (rev 9901)
+++ packages/inotifyx/trunk/debian/control	2009-09-29 09:31:27 UTC (rev 9902)
@@ -13,6 +13,7 @@
 Package: python-inotifyx
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
+Recommends: doc-base
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: simple Python binding to the Linux inotify

Added: packages/inotifyx/trunk/debian/python-inotifyx.doc-base
===================================================================
--- packages/inotifyx/trunk/debian/python-inotifyx.doc-base	                        (rev 0)
+++ packages/inotifyx/trunk/debian/python-inotifyx.doc-base	2009-09-29 09:31:27 UTC (rev 9902)
@@ -0,0 +1,10 @@
+Document: python-inotifyx
+Title: python-inotifyx online documentation
+Author: Forest Bond
+Abstract: This set of document provides more information on
+ the python-inotifyx extension
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-inotifyx/html/index.html
+Files: /usr/share/doc/python-inotifyx/html/*.html

Added: packages/inotifyx/trunk/debian/python-inotifyx.install
===================================================================
--- packages/inotifyx/trunk/debian/python-inotifyx.install	                        (rev 0)
+++ packages/inotifyx/trunk/debian/python-inotifyx.install	2009-09-29 09:31:27 UTC (rev 9902)
@@ -0,0 +1 @@
+usr/share/doc/python-inotifyx/html

Modified: packages/inotifyx/trunk/debian/rules
===================================================================
--- packages/inotifyx/trunk/debian/rules	2009-09-28 21:39:05 UTC (rev 9901)
+++ packages/inotifyx/trunk/debian/rules	2009-09-29 09:31:27 UTC (rev 9902)
@@ -3,6 +3,8 @@
 PKG_NAME=inotifyx
 PKG_VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
+-include /usr/share/python/python.mk
+
 get-orig-source:
 	uscan --force-download --rename --download-version=$(PKG_VER) --destdir=.
 
@@ -26,8 +28,8 @@
 	dh_prep  
 	dh_installdirs
 
-	python setup.py install --root $(CURDIR)/debian/python-inotifyx
-	epydoc $(CURDIR)/debian/python-inotifyx/usr/lib/python2.5/site-packages/inotifyx.py
+	python setup.py install --root $(CURDIR)/debian/python-inotifyx ${py_setup_install_args}
+	epydoc $(CURDIR)/debian/python-inotifyx/usr/lib/python*/*-packages/inotifyx.py
 
 binary-indep: build install