[Python-modules-commits] r8183 - in packages/paste/trunk/debian (changelog control rules)

[piotr at users.alioth.debian.org]

    Date: Tuesday, April 7, 2009 @ 21:08:04
  Author: piotr
Revision: 8183

* Link MochiKit before invoking dh_pysupport (Closes: #516320)
  + add libjs-mochikit to Build-Depends-Indep (pysupport's
    movemodules needs it at build time)

Modified:
  packages/paste/trunk/debian/changelog
  packages/paste/trunk/debian/control
  packages/paste/trunk/debian/rules

Modified: packages/paste/trunk/debian/changelog
===================================================================
--- packages/paste/trunk/debian/changelog	2009-04-07 19:54:43 UTC (rev 8182)
+++ packages/paste/trunk/debian/changelog	2009-04-07 21:08:04 UTC (rev 8183)
@@ -1,3 +1,11 @@
+paste (1.7.2-3) UNRELEASED; urgency=low
+
+  * Link MochiKit before invoking dh_pysupport (Closes: #516320)
+    + add libjs-mochikit to Build-Depends-Indep (pysupport's
+      movemodules needs it at build time)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 07 Apr 2009 20:37:13 +0200
+
 paste (1.7.2-2) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/paste/trunk/debian/control
===================================================================
--- packages/paste/trunk/debian/control	2009-04-07 19:54:43 UTC (rev 8182)
+++ packages/paste/trunk/debian/control	2009-04-07 21:08:04 UTC (rev 8183)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3-1~), python-sphinx
+ python-setuptools (>= 0.6b3-1~), python-sphinx, libjs-mochikit
 Standards-Version: 3.8.0
 Homepage: http://pythonpaste.org/
 XS-Python-Version: >= 2.4

Modified: packages/paste/trunk/debian/rules
===================================================================
--- packages/paste/trunk/debian/rules	2009-04-07 19:54:43 UTC (rev 8182)
+++ packages/paste/trunk/debian/rules	2009-04-07 21:08:04 UTC (rev 8183)
@@ -30,9 +30,13 @@
 install-python%:
 	python$* setup.py install \
 		--single-version-externally-managed \
-		--root $(CURDIR)/debian/python-paste
+		--root $(PKGDIR)
 	# pth file is not needed since all paste* packages are installed in same directory
-	rm -f debian/python-paste/usr/lib/python$*/site-packages/Paste-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/Paste-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/evalexception/mochikit/MochiKit.js
+	# don't use dh_link here, dh_pysupport will fail:
+	ln -s /usr/share/javascript/mochikit/MochiKit.js \
+		$(PKGDIR)/usr/lib/python$*/site-packages/paste/evalexception/mochikit/MochiKit.js
 	touch $@
 
 binary-indep: build install
@@ -41,8 +45,6 @@
 	dh_installchangelogs -i docs/news.txt
 	dh_installdocs -i
 	dh_pysupport -i
-	dh_link /usr/share/javascript/mochikit/MochiKit.js \
-		/usr/share/python-support/python-paste/paste/evalexception/mochikit/MochiKit.js
 	# it's not an extra license file
 	echo "python-paste: extra-license-file usr/share/doc/python-paste/docs/_sources/license.txt" \
 		>> $(PKGDIR)/usr/share/lintian/overrides/python-paste