diff --git a/debian/changelog b/debian/changelog index e0262307fce224ce492644d59851272df1638858..ae7d507d95b6fb060e5a8904d9f0894df5c4fe5f 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 883698356f73511a107e317c4167324086c70056..ba8b35e14fda1bcea1d35ea786746767411c75cf 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 03b026fd87050f35fa1ed16143e8d52de792e33e..3bc5729d46108047e8c3ad3ea1ca7d12bb6bd004 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