[SCM] idjc packaging branch, master, updated. debian/0.7.14-2

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jul 11 07:10:55 UTC 2009


The following commit has been merged in the master branch:
commit b8335156042afd17a0e4c8750123231cb063e5fa
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 11 08:11:26 2009 +0200

    support python 2.6
    
    patch taken from Alessio Treglia <quadrispro at ubuntu.com>

diff --git a/debian/patches/python26_ready.patch b/debian/patches/python26_ready.patch
new file mode 100644
index 0000000..b96064a
--- /dev/null
+++ b/debian/patches/python26_ready.patch
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' idjc-0.7.14/configure idjc-0.7.14.new/configure
+--- idjc-0.7.14/configure	2009-04-22 16:24:49.000000000 +0200
++++ idjc-0.7.14.new/configure	2009-05-02 16:45:42.501619842 +0200
+@@ -2592,7 +2592,7 @@
+ if test "${am_cv_python_pythondir+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
+      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+@@ -2609,7 +2609,7 @@
+ if test "${am_cv_python_pyexecdir+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
++  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
+      echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
diff --git a/debian/rules b/debian/rules
index 947f6c4..950e782 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ install/idjc::
 	# Delete auto-installed docs in wrong dir (rather than patching Makefiles)
 	rm -rf $(DEB_DESTDIR)/usr/share/doc/idjc-*
 	# Fix permission problem
-	-chmod u+x $(DEB_DESTDIR)/usr/lib/python*/site-packages/idjc/IDJCmultitagger.py
+	-chmod u+x $(DEB_DESTDIR)/usr/lib/python*/*-packages/idjc/IDJCmultitagger.py
 
 binary-install/idjc::
 #	dh_pycentral -pidjc

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list