[SCM] csound packaging branch, master, updated. debian/5.11.1.dfsg-4-44-g2cb7c04

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2cb7c040f5ed60769e6826b48f1d415786261fb4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Apr 14 15:14:18 2010 +0200

    Fix PYLIBPATH handling in rules file.

diff --git a/debian/rules b/debian/rules
index 0c56cfa..47eecbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,8 +131,8 @@ endif
 # Python >= 2.6 should install to dist-packages instead of site-packages
 # Since 2.5 is the only version < 2.6 we support, we test for that.
 # TODO: Use simpler second form when 2.6 is default in a stable release
-PYLIBPATH = /usr/lib/$(cdbs_python_current_binary)/$(if $(call cdbs_streq,$(cdbs_python_current_version),2.5),site-packages,dist-packages)
-#PYLIBPATH = /usr/lib/$(cdbs_python_current_binary)/dist-packages
+PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/$(if $(call cdbs_streq,$(cdbs_python_current_version),2.5),site-packages,dist-packages)
+#PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/dist-packages
 
 CC = $(DEB_HOST_GNU_TYPE)-gcc
 CXX = $(DEB_HOST_GNU_TYPE)-g++
@@ -238,7 +238,7 @@ install/libcsnd-java::
 		$(CURDIR)/debian/tmp/usr/lib/jni
 
 install/python-csound::
-	mkdir -p $(CURDIR)/debian/$(PYLIBPATH)
+	mkdir -p $(CURDIR)/debian/tmp/$(PYLIBPATH)
 	cp csnd.py _csnd.so \
 		$(CURDIR)/debian/tmp/$(PYLIBPATH)
 

-- 
csound packaging