From cb12e4d31686d177983da24e9aa42e3275e0eaa4 Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 11 Jul 2014 18:02:04 -0400
Subject: [PATCH] - Add direct build-dep on python-all to replace indirect
build-dep * Bump version to 2.7.8 * Drop ancient Breaks on python-csv,
python-bz2, and python-email
---
debian/changelog | 10 +++++-----
debian/control | 22 +++++++++++-----------
debian/control.in | 4 ++--
debian/rules | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 69b840e..70bd404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,4 @@
-python-defaults (2.7.7-1) UNRELEASED; urgency=medium
-
- [ Matthias Klose ]
- * Bump version to 2.7.7.
+python-defaults (2.7.8-1) unstable; urgency=medium
[ Barry Warsaw ]
* Fix typo in policy doc re: wheel package exception list.
@@ -20,8 +17,11 @@ python-defaults (2.7.7-1) UNRELEASED; urgency=medium
* Stop automatically regenerating static content (dh_python2 man pages and
Python FAQ) and drop build-dep on python-docutils to ease bootstrapping
(Closes: #754060)
+ - Add direct build-dep on python-all to replace indirect build-dep
+ * Bump version to 2.7.8
+ * Drop ancient Breaks on python-csv, python-bz2, and python-email
- -- Matthias Klose <doko@debian.org> Mon, 02 Jun 2014 19:54:25 +0200
+ -- Scott Kitterman <scott@kitterman.com> Fri, 11 Jul 2014 17:10:37 -0400
python-defaults (2.7.6-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index f012deb..6ffd2ef 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ Package: python
Architecture: any
Multi-Arch: allowed
Priority: standard
-Depends: ${misc:Depends}, python2.7 (>= 2.7.7-1~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version})
-Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.7-1~)
+Depends: ${misc:Depends}, python2.7 (>= 2.7.8-1~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version})
+Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.8-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)
+Breaks: update-manager-core (<< 0.200.5-2)
Replaces: python-dev (<< 2.6.5-2)
Provides: python-email, python-ctypes, python-wsgiref, python-importlib, python-profiler
Description: interactive high-level object-oriented language (default version)
@@ -31,7 +31,7 @@ Package: python-minimal
Architecture: any
Multi-Arch: allowed
Priority: standard
-Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.7-1~), dpkg (>= 1.13.20)
+Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.8-1~), dpkg (>= 1.13.20)
Recommends: python
Conflicts: python-central (<< 0.5.5)
Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2)
@@ -44,7 +44,7 @@ Description: minimal subset of the Python language (default version)
Package: python-examples
Architecture: all
-Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.7-1~)
+Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.8-1~)
Description: examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -55,7 +55,7 @@ Description: examples for the Python language (default version)
Package: python-dev
Architecture: any
Multi-Arch: allowed
-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.7-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.8-1~)
Description: header files and a static library for Python (default)
Header files, a static library and development tools for building
Python modules, extending the Python interpreter or embedding Python
@@ -68,7 +68,7 @@ Package: libpython-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libpython2.7-dev (>= 2.7.7-1~), ${misc:Depends}
+Depends: libpython2.7-dev (>= 2.7.8-1~), ${misc:Depends}
Description: header files and a static library for Python (default)
Header files, a static library and development tools for building
Python modules, extending the Python interpreter or embedding Python
@@ -80,7 +80,7 @@ Description: header files and a static library for Python (default)
Package: libpython-stdlib
Architecture: any
Multi-Arch: same
-Depends: libpython2.7-stdlib (>= 2.7.7-1~), ${misc:Depends}
+Depends: libpython2.7-stdlib (>= 2.7.8-1~), ${misc:Depends}
Description: interactive high-level object-oriented language (default python version)
Python, the high-level, interactive object oriented language,
includes an extensive class library with lots of goodies for
@@ -105,7 +105,7 @@ Description: IDE for Python using Tkinter (default version)
Package: python-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, python2.7-doc (>= 2.7.7-1~)
+Depends: ${misc:Depends}, python2.7-doc (>= 2.7.8-1~)
Suggests: python-examples, python (= ${binary:Version})
Breaks: python (<< 2.3.5)
Replaces: python (<< 2.3.5)
@@ -132,7 +132,7 @@ Architecture: any
Multi-Arch: allowed
Section: debug
Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.7-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.8-1~)
Description: debug build of the Python Interpreter (version 2.7)
Python interpreter configured with --pydebug. Dynamically loaded modules are
searched in /usr/lib/python2.7/lib-dynload/debug first.
@@ -142,7 +142,7 @@ Architecture: any
Multi-Arch: same
Section: debug
Priority: extra
-Depends: libpython2.7-dbg (>= 2.7.7-1~), ${misc:Depends}
+Depends: libpython2.7-dbg (>= 2.7.8-1~), ${misc:Depends}
Description: debug build of the Python Interpreter (version 2.7)
Python interpreter configured with --pydebug. Dynamically loaded modules
are searched in /usr/lib/python2.7/lib-dynload/debug first.
diff --git a/debian/control.in b/debian/control.in
index b5f5d66..7bd74f1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: python
Priority: optional
Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>, Barry Warsaw <barry@debian.org>
-Build-Depends: debhelper (>= 8~), debiandoc-sgml
+Build-Depends: debhelper (>= 8~), python-all, debiandoc-sgml
Standards-Version: 3.9.5
Homepage: http://www.python.org/
Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
@@ -16,7 +16,7 @@ Priority: standard
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)
+Breaks: update-manager-core (<< 0.200.5-2)
Replaces: python-dev (<< 2.6.5-2)
Provides: python-email, python-ctypes, python-wsgiref, python-importlib, python-profiler
Description: interactive high-level object-oriented language (default version)
diff --git a/debian/rules b/debian/rules
index e29ab79..496b7f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ export PVER=python2.7
PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
# first version with Multi-Arch: allowed
-PREVVER := 2.7.7-1~
+PREVVER := 2.7.8-1~
# not yet allowed
ma_allowed = yes
--
GitLab