From 09aca0f095878fef2e063a0d72c4a93508edae99 Mon Sep 17 00:00:00 2001 From: Matthias Klose <doko@ubuntu.com> Date: Thu, 6 Jun 2013 17:51:20 +0200 Subject: [PATCH] * Add dependencies on the new libpython-{stdlib,all-dev,all-dbg} packages. --- debian/changelog | 6 ++++++ debian/control | 7 +++---- debian/control.in | 10 ++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index e026230..ae7d507 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-defaults (2.7.5-2) UNRELEASED; urgency=low + + * Add dependencies on the new libpython-{stdlib,all-dev,all-dbg} packages. + + -- Matthias Klose <doko@debian.org> Thu, 06 Jun 2013 17:49:32 +0200 + python-defaults (2.7.5-1) unstable; urgency=low [ Matthias Klose ] diff --git a/debian/control b/debian/control index 8836983..ba8b35e 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,7 @@ Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults- Package: python Architecture: any Priority: standard -Depends: ${misc:Depends}, python2.7 (>= 2.7.5-1~), python-minimal (= ${binary:Version}) -#Depends: ${misc:Depends}, python2.7 (>= 2.7.5-1~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version}) +Depends: ${misc:Depends}, python2.7 (>= 2.7.5-1~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version}) Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.5-1~) Conflicts: python-central (<< 0.5.5) Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3), update-manager-core (<< 0.200.5-2) @@ -158,7 +157,7 @@ Description: package depending on all supported Python runtime versions Package: python-all-dev Architecture: any -Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.7-dev (>= 2.7-7) +Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), libpython-all-dev (= ${binary:Version}), python-dev (= ${binary:Version}), python2.7-dev (>= 2.7-7) Description: package depending on all supported Python development packages The package currently depends on python2.7-dev, in the future, dependencies on jython (Python for a JVM) and ironpython (Python @@ -172,7 +171,7 @@ Package: python-all-dbg Architecture: any Section: debug Priority: extra -Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7-7) +Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), libpython-all-dbg (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7-7) Description: package depending on all supported Python debugging packages The package currently depends on python2.7-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 03b026f..3bc5729 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,8 +14,7 @@ Package: python Architecture: any Multi-Arch: allowed Priority: standard -Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version}) -#Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version}) +Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version}) Suggests: python-doc (= ${binary:Version}), python-tk (>= @PREVVER@) Conflicts: python-central (<< 0.5.5) Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3), update-manager-core (<< 0.200.5-2) @@ -151,6 +150,7 @@ Description: debug build of the Python Interpreter (version @VER@) Package: python-all Architecture: any +Multi-Arch: allowed Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7 (>= 2.7.2-3) Description: package depending on all supported Python runtime versions The package currently depends on python2.7, in the future, @@ -162,7 +162,8 @@ Description: package depending on all supported Python runtime versions Package: python-all-dev Architecture: any -Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.7-dev (>= 2.7-7) +Multi-Arch: allowed +Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), libpython-all-dev (= ${binary:Version}), python-dev (= ${binary:Version}), python2.7-dev (>= 2.7-7) Description: package depending on all supported Python development packages The package currently depends on python2.7-dev, in the future, dependencies on jython (Python for a JVM) and ironpython (Python @@ -174,9 +175,10 @@ Description: package depending on all supported Python development packages Package: python-all-dbg Architecture: any +Multi-Arch: allowed Section: debug Priority: extra -Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7-7) +Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), libpython-all-dbg (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7-7) Description: package depending on all supported Python debugging packages The package currently depends on python2.7-dbg, in the future, dependencies on jython (Python for a JVM) and ironpython (Python -- GitLab