[SCM] csound/master: Drop conditions for old python versions.

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Mon Nov 30 13:48:35 UTC 2015


The following commit has been merged in the master branch:
commit 3be1ed8b4193e8af290590ec8dd7bcf45dc635cd
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Nov 30 10:38:24 2015 -0300

    Drop conditions for old python versions.
    
    OldOldstable (wheezy) already has 2.6

diff --git a/debian/rules b/debian/rules
index fd1d781..9270e10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,13 +147,9 @@ ifneq "$(filter amd64 i386, $(DEB_HOST_ARCH_CPU))" ""
 	MTUNE = ON
 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)/dist-packages
 # Path with PREFIX removed
-PYLIBPATH2 = lib/$(cdbs_python_current_binary)/$(if $(call cdbs_streq,$(cdbs_python_current_version),2.5),site-packages,dist-packages)
+PYLIBPATH2 = lib/$(cdbs_python_current_binary)/dist-packages
 
 CC = $(DEB_HOST_GNU_TYPE)-gcc
 CXX = $(DEB_HOST_GNU_TYPE)-g++

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list