From 44f130e9d247aede53001c48f0e191df5a295cae Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@timbuktu>
Date: Mon, 17 May 2010 12:59:46 +0200
Subject: [PATCH] package version python-defaults-2.5.4-2

---
 debian/changelog  | 6 ++++++
 debian/control    | 6 +++---
 debian/control.in | 6 +++---
 debian/python.mk  | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9f8db2..ac74caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-defaults (2.5.4-2) unstable; urgency=high
+
+  * python-all*: Tighten the dependencies on the python-* packages.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 26 Feb 2009 12:44:47 +0000
+
 python-defaults (2.5.4-1) unstable; urgency=medium
 
   * Depend on python2.5-2.5.4.
diff --git a/debian/control b/debian/control
index aa704d6..83672c8 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,7 @@ Description: Debug Build of the Python Interpreter (version 2.5)
 Package: python-all
 Architecture: all
 Priority: optional
-Depends: python (= ${Source-Version}), python2.4 (>= 2.4.4-4), python2.5 (>= 2.5.1-1)
+Depends: python (= ${Source-Version}), python2.4 (>= 2.4.6-2), python2.5 (>= 2.5.4-1)
 Description: Package depending on all supported Python runtime versions
  The package currently depends on python2.4 and python2.5, in the future,
  dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
@@ -118,7 +118,7 @@ Description: Package depending on all supported Python runtime versions
 Package: python-all-dev
 Architecture: all
 Priority: optional
-Depends: python-all (= ${Source-Version}), python-dev (= ${Source-Version}), python2.4-dev (>= 2.4.4-4), python2.5-dev (>= 2.5.1-1)
+Depends: python-all (= ${Source-Version}), python-dev (= ${Source-Version}), python2.4-dev (>= 2.4.6-2), python2.5-dev (>= 2.5.4-1)
 Description: Package depending on all supported Python development packages
  The package currently depends on python2.4-dev and python2.5-dev, in the
  future, dependencies on jython (Python for a JVM) and ironpython (Python
@@ -130,7 +130,7 @@ Description: Package depending on all supported Python development packages
 Package: python-all-dbg
 Architecture: all
 Priority: optional
-Depends: python-all (= ${Source-Version}), python-dbg (= ${Source-Version}), python2.4-dbg (>= 2.4.4-4), python2.5-dbg (>= 2.5.1-1)
+Depends: python-all (= ${Source-Version}), python-dbg (= ${Source-Version}), python2.4-dbg (>= 2.4.6-2), python2.5-dbg (>= 2.5.4-1)
 Description: Package depending on all supported Python debugging packages
  The package currently depends on python2.4-dbg and python2.5-dbg, in the
  future, dependencies on jython (Python for a JVM) and ironpython (Python
diff --git a/debian/control.in b/debian/control.in
index 4387732..ad0e451 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -106,7 +106,7 @@ Description: Debug Build of the Python Interpreter (version @VER@)
 Package: python-all
 Architecture: all
 Priority: optional
-Depends: python (= ${Source-Version}), python2.4 (>= 2.4.4-4), python2.5 (>= 2.5.1-1)
+Depends: python (= ${Source-Version}), python2.4 (>= 2.4.6-2), python2.5 (>= 2.5.4-1)
 Description: Package depending on all supported Python runtime versions
  The package currently depends on python2.4 and python2.5, in the future,
  dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
@@ -118,7 +118,7 @@ Description: Package depending on all supported Python runtime versions
 Package: python-all-dev
 Architecture: all
 Priority: optional
-Depends: python-all (= ${Source-Version}), python-dev (= ${Source-Version}), python2.4-dev (>= 2.4.4-4), python2.5-dev (>= 2.5.1-1)
+Depends: python-all (= ${Source-Version}), python-dev (= ${Source-Version}), python2.4-dev (>= 2.4.6-2), python2.5-dev (>= 2.5.4-1)
 Description: Package depending on all supported Python development packages
  The package currently depends on python2.4-dev and python2.5-dev, in the
  future, dependencies on jython (Python for a JVM) and ironpython (Python
@@ -130,7 +130,7 @@ Description: Package depending on all supported Python development packages
 Package: python-all-dbg
 Architecture: all
 Priority: optional
-Depends: python-all (= ${Source-Version}), python-dbg (= ${Source-Version}), python2.4-dbg (>= 2.4.4-4), python2.5-dbg (>= 2.5.1-1)
+Depends: python-all (= ${Source-Version}), python-dbg (= ${Source-Version}), python2.4-dbg (>= 2.4.6-2), python2.5-dbg (>= 2.5.4-1)
 Description: Package depending on all supported Python debugging packages
  The package currently depends on python2.4-dbg and python2.5-dbg, in the
  future, dependencies on jython (Python for a JVM) and ironpython (Python
diff --git a/debian/python.mk b/debian/python.mk
index ea58b9c..94e1a05 100644
--- a/debian/python.mk
+++ b/debian/python.mk
@@ -26,11 +26,11 @@ py_sitename = $(if $(filter $(subst python,,$(1)), 2.3 2.4 2.5),site,dist)-packa
 py_libdir = /usr/lib/python$(subst python,,$(1))/$(py_sitename)
 
 
-# The same macros for use in shell snippets
+# The same macros for use inside loops in shell snippets
 
-py_sitename_sh = $$(basename $$(python$(subst python,,$(1)) -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'))
+py_sitename_sh = $$(basename $$(_py_=$(strip $(1)); python$${_py_\#python*} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'))
 
-py_libdir_sh = $$(python$(subst python,,$(1)) -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+py_libdir_sh = $$(_py_=$(strip $(1)); python$${_py_\#python*} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
 
 # Arguments to pass to setup.py install
 py_setup_install_args = --install-layout=deb
-- 
GitLab