[Python-modules-commits] r10354 - in packages/webhelpers/trunk/debian (changelog patches rules)

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

    Date: Wednesday, November 11, 2009 @ 13:35:38
  Author: jwilk-guest
Revision: 10354

Integrate NMU 0.6.4-1.1

Modified:
  packages/webhelpers/trunk/debian/changelog
  packages/webhelpers/trunk/debian/rules
Deleted:
  packages/webhelpers/trunk/debian/patches/

Modified: packages/webhelpers/trunk/debian/changelog
===================================================================
--- packages/webhelpers/trunk/debian/changelog	2009-11-10 22:54:55 UTC (rev 10353)
+++ packages/webhelpers/trunk/debian/changelog	2009-11-11 13:35:38 UTC (rev 10354)
@@ -1,3 +1,11 @@
+webhelpers (0.6.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "manipulates site-packages/ directly, failing with Python 2.6"
+    Applied and uploaded Kumar's patch, thanks dude! (Closes: #547862)
+
+ -- Bastian Venthur <venthur at debian.org>  Sat, 17 Oct 2009 14:52:35 +0200
+
 webhelpers (0.6.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/webhelpers/trunk/debian/rules
===================================================================
--- packages/webhelpers/trunk/debian/rules	2009-11-10 22:54:55 UTC (rev 10353)
+++ packages/webhelpers/trunk/debian/rules	2009-11-11 13:35:38 UTC (rev 10354)
@@ -6,7 +6,10 @@
 PYDEFAULT=$(shell pyversions -d)
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
 
+SITEDIR = $(call py_sitename, $(PYDEFAULT))
+
 clean: unpatch
 	rm -f build-*
 	dh_testdir
@@ -30,8 +33,8 @@
 	python setup.py install \
 		--no-compile \
 		--single-version-externally-managed \
-		--root $(CURDIR)/debian/$(package)
-	rm -f $(CURDIR)/debian/$(package)/usr/lib/$(PYDEFAULT)/site-packages/webhelpers/rails/javascripts/prototype.js
+		--root $(CURDIR)/debian/$(package) --install-layout=deb
+	rm -f $(CURDIR)/debian/$(package)/usr/lib/$(PYDEFAULT)/$(SITEDIR)/webhelpers/rails/javascripts/prototype.js
 
 binary-indep: build install
 	dh_testdir