From f9e809275bff06f0b950396079c55649408f495c Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 3 Jun 2016 01:33:34 +0200
Subject: [PATCH] * Rebuild to pick up the GNU triplet change on i386 archs.
Addresses: #826128.
---
debian/changelog | 5 +++--
debian/control | 26 +++++++++++++-------------
debian/control.in | 4 ++--
debian/rules | 4 ++--
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1024563..0b4a43c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-defaults (2.7.11-2ubuntu1) UNRELEASED; urgency=medium
+python-defaults (2.7.11-2) UNRELEASED; urgency=medium
[ Scott Kitterman ]
* Python policy updates for Stretch (Many thanks to Ben Finney for all the
@@ -11,8 +11,9 @@ python-defaults (2.7.11-2ubuntu1) UNRELEASED; urgency=medium
[ Matthias Klose ]
* Update valgrind suppression file. Issue #12612. LP: #1512622.
+ * Rebuild to pick up the GNU triplet change on i386 archs. Addresses: #826128.
- -- Matthias Klose <doko@debian.org> Mon, 09 May 2016 14:09:56 +0200
+ -- Matthias Klose <doko@debian.org> Fri, 03 Jun 2016 01:29:55 +0200
python-defaults (2.7.11-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ca69a79..01176d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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~), dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.11-2),
+Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.11-11),
lsb-release,
python-all,
- python2.7 (>= 2.7.11-1~),
+ python2.7 (>= 2.7.11-11~),
debiandoc-sgml,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.python.org/
Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/files
@@ -18,8 +18,8 @@ Architecture: any
Multi-Arch: allowed
Priority: standard
Pre-Depends: python-minimal (= ${binary:Version})
-Depends: ${misc:Depends}, python2.7 (>= 2.7.11-1~), libpython-stdlib (= ${binary:Version})
-Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.11-1~)
+Depends: ${misc:Depends}, python2.7 (>= 2.7.11-11~), libpython-stdlib (= ${binary:Version})
+Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.11-11~)
Conflicts: python-central (<< 0.5.5)
Breaks: update-manager-core (<< 0.200.5-2)
Replaces: python-dev (<< 2.6.5-2)
@@ -36,7 +36,7 @@ Package: python-minimal
Architecture: any
Multi-Arch: allowed
Priority: standard
-Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.11-1~), dpkg (>= 1.13.20)
+Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.11-11~), 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)
@@ -49,7 +49,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.11-1~)
+Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.11-11~)
Description: examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -60,7 +60,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.11-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.11-11~)
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
@@ -73,7 +73,7 @@ Package: libpython-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libpython2.7-dev (>= 2.7.11-1~), ${misc:Depends}
+Depends: libpython2.7-dev (>= 2.7.11-11~), ${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
@@ -86,7 +86,7 @@ Package: libpython-stdlib
Architecture: any
Multi-Arch: same
Priority: standard
-Depends: libpython2.7-stdlib (>= 2.7.11-1~), ${misc:Depends}
+Depends: libpython2.7-stdlib (>= 2.7.11-11~), ${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
@@ -111,7 +111,7 @@ Description: IDE for Python using Tkinter (default version)
Package: python-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, python2.7-doc (>= 2.7.11-1~)
+Depends: ${misc:Depends}, python2.7-doc (>= 2.7.11-11~)
Suggests: python-examples, python (= ${binary:Version})
Breaks: python (<< 2.3.5)
Replaces: python (<< 2.3.5)
@@ -138,7 +138,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.11-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.11-11~)
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.
@@ -148,7 +148,7 @@ Architecture: any
Multi-Arch: same
Section: debug
Priority: extra
-Depends: libpython2.7-dbg (>= 2.7.11-1~), ${misc:Depends}
+Depends: libpython2.7-dbg (>= 2.7.11-11~), ${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 bab2acc..019bc6b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,12 +3,12 @@ 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~), @bd_i586@,
+Build-Depends: debhelper (>= 9~), @bd_i586@,
lsb-release,
python-all,
@PVER@ (>= @PREVVER@),
debiandoc-sgml,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.python.org/
Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/files
diff --git a/debian/rules b/debian/rules
index d2a689a..487d10d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,13 @@ 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.11-1~
+PREVVER := 2.7.11-11~
# not yet allowed
ma_allowed = yes
ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty))
- bd_i586 = dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.11-2)
+ bd_i586 = dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.11-11)
endif
--
GitLab