[SCM] idjc packaging branch, master, updated. upstream/0.8.2-8-g1d0cafd

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Wed Apr 28 08:57:40 UTC 2010


The following commit has been merged in the master branch:
commit ba9377f8f1fcbe13b5e8cff91eeec58c4e2b3943
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Apr 28 10:53:44 2010 +0200

    Drop python26_ready.patch, unnecessary.

diff --git a/debian/patches/python26_ready.patch b/debian/patches/python26_ready.patch
deleted file mode 100644
index b96064a..0000000
--- a/debian/patches/python26_ready.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/patches/series b/debian/patches/series
index 334373b..06f32da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 desktop_file.patch
 idjc_script.patch
-python26_ready.patch
 server_window_size.patch
+configure.patch

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list