[Python-modules-commits] r2707 - in /packages/pyinotify/trunk/debian: changelog python-pyinotify-doc.docs rules

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

Author: dottedmag-guest
Date: Wed Jul 11 17:45:31 2007
New Revision: 2707

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2707
Log:
* Slightly tweaked "build _inotify.so for each Python version" to be more concise
* epydoc documentation moved to html/ subdir.

Modified:
    packages/pyinotify/trunk/debian/changelog
    packages/pyinotify/trunk/debian/python-pyinotify-doc.docs
    packages/pyinotify/trunk/debian/rules

Modified: packages/pyinotify/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/changelog?rev=2707&op=diff
==============================================================================
--- packages/pyinotify/trunk/debian/changelog (original)
+++ packages/pyinotify/trunk/debian/changelog Wed Jul 11 17:45:31 2007
@@ -1,10 +1,17 @@
 pyinotify (0.7.0-3) unstable; urgency=low
 
-  * Rebuild _inotify.so for each python version
-  * Suggest python-pyinotify instead of python2.*-pyinotify for 
-    python-pyinotify-doc 
+  [Mikhail Gusarov]
 
--- Scott Kitterman <scott at kitterman.com>  Tue, 03 Jul 2007 16:28:31 -0400
+  * Fixed compilation of _inotify.so for several Python versions (thanks
+    to Christopher Halse Rogers) (Closes: #430891).
+  * epydoc documentation moved to html/ subdir.
+
+  [Scott Kitterman]
+
+  * Suggest python-pyinotify instead of python2.*-pyinotify for
+    python-pyinotify-doc.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net>  Wed, 04 Jul 2007 14:24:40 +0700
 
 pyinotify (0.7.0-2) unstable; urgency=low
 

Modified: packages/pyinotify/trunk/debian/python-pyinotify-doc.docs
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/python-pyinotify-doc.docs?rev=2707&op=diff
==============================================================================
--- packages/pyinotify/trunk/debian/python-pyinotify-doc.docs (original)
+++ packages/pyinotify/trunk/debian/python-pyinotify-doc.docs Wed Jul 11 17:45:31 2007
@@ -2,7 +2,5 @@
 NEWS
 README
 TODO
-doc/*.html
-doc/*.css
-doc/private
-doc/public
+html
+

Modified: packages/pyinotify/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/rules?rev=2707&op=diff
==============================================================================
--- packages/pyinotify/trunk/debian/rules (original)
+++ packages/pyinotify/trunk/debian/rules Wed Jul 11 17:45:31 2007
@@ -13,27 +13,19 @@
 configure-stamp: patch
 	dh_testdir
 	for python in $(PYVERS); do \
-		"$${python}" setup.py config; \
+	    "$${python}" setup.py config; \
 	done
 	touch $@
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-#Since setup.py doesn't segregate _inotify.so by the python version it's built
-#against, we need to build and install in one go for each python version.
-	#for python in $(PYVERS); do \
-		"$${python}" setup.py build; \
-	done
-	touch $@
+build:
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f configure-stamp
 
 	for python in $(PYVERS); do \
-		"$${python}" setup.py clean --all; \
+	    "$${python}" setup.py clean --all; \
 	done
 	$(MAKE) clean
 
@@ -44,12 +36,18 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-#setup.py does not segregate the _inotify.so based on python build version
-#We therefore need to rebuild it before installing for each version.
+
+# Since setup.py doesn't segregate _inotify.so by the python version it's built
+# against, we need to build and install in one go for each python version.
+# (Bug #85705)
+
 	for python in $(PYVERS); do \
-		$$python setup.py build --force ; \
-		$$python setup.py install --root=$(CURDIR)/debian/python-pyinotify; \
+	    $$python setup.py build --force; \
+	    $$python setup.py install --root=$(CURDIR)/debian/python-pyinotify; \
 	done
+
+# Installing documentation in html/ subdirectory.
+	mv doc html
 
 # Build architecture-independent files here.
 binary-indep: build install