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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1fa6f88017b9f045c3e17749a9e1b2b7e1ad9ff6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Apr 14 12:56:02 2010 +0200

    Use CDBS class python-module.mk, and simplify local Python hacks in rules file.

diff --git a/debian/rules b/debian/rules
index 42bc5e8..2f2d952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+DEB_PYTHON_SYSTEM = pycentral
+DEB_PYTHON_MODULE_PACKAGES = python-csound python-csoundac
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/class/scons.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-module.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/csound
@@ -100,12 +103,13 @@ DEB_SCONS_OPTIONS += \
 	buildImageOpcodes=1
 
 # Language Wrappers
+# TODO: build for all Python versions (not only current default one)
 TCLVERSION := $(shell dpkg -l tcl-dev | sed -n 's/.*\(8\.[45]\)\..*/\1/p')
 DEB_SCONS_OPTIONS += \
 	buildInterfaces=1 \
 	buildJavaWrapper=1 \
 	buildPythonWrapper=1 \
-	pythonVersion=$(subst python,,$(PYVERSION)) \
+	pythonVersion=$(cdbs_python_current_version) \
 	buildLuaWrapper=1 \
 	buildTclcsound=1 \
 	tclversion=$(TCLVERSION) \
@@ -126,16 +130,11 @@ ifneq "$(filter amd64 i386, $(DEB_HOST_ARCH_CPU))" ""
 	DEB_SCONS_OPTIONS += gcc4opt=generic
 endif
 
-PYVERSION := $(shell pyversions -d)
-
 # 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.
-# Remove this when 2.6 is default in a stable release
-ifeq "$(PYVERSION)" "python2.5"
-	PYPATH = site-packages
-else
-	PYPATH = dist-packages
-endif
+# 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
 
 CC = $(DEB_HOST_GNU_TYPE)-gcc
 CXX = $(DEB_HOST_GNU_TYPE)-g++
@@ -241,9 +240,9 @@ install/libcsnd-java::
 		$(CURDIR)/debian/tmp/usr/lib/jni
 
 install/python-csound::
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(PYVERSION)/$(PYPATH)
+	mkdir -p $(CURDIR)/debian/$(PYLIBPATH)
 	cp csnd.py _csnd.so \
-		$(CURDIR)/debian/tmp/usr/lib/$(PYVERSION)/$(PYPATH)
+		$(CURDIR)/debian/tmp/$(PYLIBPATH)
 
 install/liblua5.1-luacsnd5.2::
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/lua/5.1/
@@ -266,7 +265,7 @@ install/tclcsound::
 
 install/python-csoundac::
 	cp CsoundAC.py _CsoundAC.so \
-		$(CURDIR)/debian/tmp/usr/lib/$(PYVERSION)/$(PYPATH)
+		$(CURDIR)/debian/tmp/$(PYLIBPATH)
 
 install/libcsoundac-dev::
 	cp -P libCsoundAC.so $(CURDIR)/debian/tmp/usr/lib/
@@ -279,9 +278,6 @@ install/csladspa::
 install/libcsound64-doc::
 	rm -f doc/html/*.md5 doc/html/*.map doc/html/*.dot
 
-binary-install/python-csound binary-install/python-csoundac::
-	dh_pycentral -p$(cdbs_curpkg)
-
 # Don't ship any executable examples, they don't need to be
 # Currently only arch packages carry examples
 common-binary-post-install-arch::
@@ -295,14 +291,14 @@ binary: fail-missing
 fail-missing: binary-arch binary-indep list-missing
 	cat debian/cdbs-package-list | sort | uniq | \
 		grep -v 'DEBIAN' | \
-		grep -v '/usr/lib/$(PYVERSION)/$(PYPATH)' | \
+		grep -v '/$(PYLIBPATH)' | \
 		grep -v '/usr/share/doc' | \
 		grep -v '/usr/share/lintian/overrides' | \
 		grep -v '/usr/share/menu' | \
 		grep -v '/usr/share/pyshared' \
 		> debian/cdbs-reduced-package-list
 	cat debian/cdbs-install-list | sort | uniq | \
-		grep -v '/usr/lib/$(PYVERSION)/$(PYPATH)' | \
+		grep -v '/$(PYLIBPATH)' | \
 		grep -v '/usr/share/pyshared' \
 		> debian/cdbs-reduced-install-list
 	diff -u debian/cdbs-reduced-install-list \
@@ -372,7 +368,3 @@ CDBS_BUILD_DEPENDS += , \
 	doxygen, \
 	graphviz, \
 	ttf-dejavu
-
-# Needed for debian packaging features
-CDBS_BUILD_DEPENDS += , \
-	python-central (>= 0.5.6)

-- 
csound packaging