diff --git a/debian/changelog b/debian/changelog
index faeaf98d724842035709adabe2ad8b8022232129..9df4190027ca328a81919eef652e601e0c7556b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-defaults (2.7.2-3) UNRELEASED; urgency=low
+python-defaults (2.7.2-4) UNRELEASED; urgency=low
[ Piotr Ożarowski ]
* dh_python2:
@@ -7,6 +7,16 @@ python-defaults (2.7.2-3) UNRELEASED; urgency=low
-- Piotr Ożarowski <piotr@debian.org> Tue, 26 Jul 2011 19:58:48 +0200
+python-defaults (2.7.2-3) experimental; urgency=low
+
+ * python: Provide python profiler.
+ * Provide a python2 symlink according to PEP 394.
+ * Bump standards version.
+ * Fix some lintian warnings.
+ * Add 2to3.1 manual page symlink.
+
+ -- Matthias Klose <doko@debian.org> Sun, 10 Jul 2011 20:57:27 +0200
+
python-defaults (2.7.2-2) experimental; urgency=low
[ Piotr Ożarowski ]
diff --git a/debian/control b/debian/control
index c560a7c2d143e3611f0cf4362f981aa983fe6a67..90fb9c31d6bfab9f8f7102b72cd519a84ef39ed2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>
Build-Depends: debhelper (>= 6.0.7~)
Build-Depends-Indep: libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
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
@@ -13,12 +13,12 @@ Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-
Package: python
Architecture: all
Priority: standard
-Depends: ${misc:Depends}, python2.7 (>= 2.7.1-1~), python-minimal (= ${binary:Version})
-Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}), python-profiler (= ${binary:Version})
+Depends: ${misc:Depends}, python2.7 (>= 2.7.2-3~), python-minimal (= ${binary:Version})
+Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
Conflicts: python-central (<< 0.5.5)
Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3)
Replaces: python-dev (<< 2.6.5-2)
-Provides: python-email, python-ctypes, python-wsgiref, python-importlib
+Provides: python-email, python-ctypes, python-wsgiref, python-importlib, python-profiler
Description: interactive high-level object-oriented language (default version)
Python, the high-level, interactive object oriented language,
includes an extensive class library with lots of goodies for
@@ -30,7 +30,7 @@ Description: interactive high-level object-oriented language (default version)
Package: python-minimal
Architecture: all
Priority: standard
-Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.1-1~), dpkg (>= 1.13.20)
+Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.2-3~), dpkg (>= 1.13.20)
Recommends: python
Conflicts: python-central (<< 0.5.5)
Breaks: python (<= 2.4-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)
@@ -43,7 +43,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.1-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-examples (>= 2.7.2-3~)
Description: examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -53,7 +53,7 @@ Description: examples for the Python language (default version)
Package: python-dev
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dev (>= 2.7.1-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dev (>= 2.7.2-3~)
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
@@ -76,7 +76,7 @@ Description: IDE for Python using Tkinter (default version)
Package: python-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, python2.7-doc (>= 2.7.1-1~)
+Depends: ${misc:Depends}, python2.7-doc (>= 2.7.2-3~)
Suggests: python-examples, python (= ${binary:Version})
Breaks: python (<< 2.3.5)
Replaces: python (<< 2.3.5)
@@ -102,7 +102,7 @@ Package: python-dbg
Architecture: all
Section: debug
Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dbg (>= 2.7.1-1~)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dbg (>= 2.7.2-3~)
Provides: python-gdbm-dbg, python-tk-dbg
Description: debug build of the Python Interpreter (version 2.7)
Python interpreter configured with --pydebug. Dynamically loaded modules are
@@ -110,7 +110,7 @@ Description: debug build of the Python Interpreter (version 2.7)
Package: python-all
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.5-2), python2.7 (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.7-3), python2.7 (>= 2.7.2-3)
Description: package depending on all supported Python runtime versions
The package currently depends on python2.6 and python2.7, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
diff --git a/debian/control.in b/debian/control.in
index abecddb1d02087beebed01e22d53dcaa022de536..de3ad3c98470ffdf520f3ab21c60956b91c6dc68 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>
Build-Depends: debhelper (>= 6.0.7~)
Build-Depends-Indep: libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
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
@@ -14,11 +14,11 @@ Package: python
Architecture: all
Priority: standard
Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version})
-Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}), python-profiler (= ${binary:Version})
+Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
Conflicts: python-central (<< 0.5.5)
Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3)
Replaces: python-dev (<< 2.6.5-2)
-Provides: python-email, python-ctypes, python-wsgiref, python-importlib
+Provides: python-email, python-ctypes, python-wsgiref, python-importlib, python-profiler
Description: interactive high-level object-oriented language (default version)
Python, the high-level, interactive object oriented language,
includes an extensive class library with lots of goodies for
@@ -110,7 +110,7 @@ Description: debug build of the Python Interpreter (version @VER@)
Package: python-all
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.5-2), python2.7 (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.7-3), python2.7 (>= 2.7.2-3)
Description: package depending on all supported Python runtime versions
The package currently depends on python2.6 and python2.7, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
diff --git a/debian/rules b/debian/rules
index be60abad5e3661a188dcbe1baeda2ea5e86ed522..6c23972004acde6b2c41d183d7119350e2ee15d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ export NVER=2.8
export PVER=python2.7
PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
-PREVVER := 2.7.1-1~
+PREVVER := 2.7.2-3~
PWD := $(shell pwd)
@@ -37,6 +37,8 @@ ifneq ($(with_doc),yes)
endif
build: stamp-build
+build-arch: stamp-build
+build-indep: stamp-build
stamp-build:
touch stamp-build
@@ -164,9 +166,12 @@ binary-indep: build install stamp-doc
: # provide the python and python.1 defaults
mkdir -p debian/python-minimal/usr/bin
ln -sf python$(VER) debian/python-minimal/usr/bin/python
+ ln -sf python$(VER) debian/python-minimal/usr/bin/python2
mkdir -p debian/python-minimal/usr/share/man/man1
ln -sf python$(VER).1.gz \
debian/python-minimal/usr/share/man/man1/python.1.gz
+ ln -sf python$(VER).1.gz \
+ debian/python-minimal/usr/share/man/man1/python2.1.gz
: #
mkdir -p debian/python-minimal/usr/share/python
@@ -204,6 +209,8 @@ binary-indep: build install stamp-doc
debian/python/usr/share/man/man1/pygettext.1.gz
ln -sf pdb$(VER).1.gz \
debian/python/usr/share/man/man1/pdb.1.gz
+ ln -sf 2to3-$(VER).1.gz \
+ debian/python/usr/share/man/man1/2to3.1.gz
mkdir -p debian/python/usr/share/doc/python
cp -a debian/python-policy.{html,sgml,txt} \
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 9c8fc5c362ae5a8709ccefccd7c5732f1bdd5b4d..a1ec9705ec2e23911099b8270cb4761b1b605055 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,3 +1,6 @@
# this source package provides these packages so it cannot depend on them
-dbg-package-missing-depends python-all-dbg
-dbg-package-missing-depends python-dbg
+python-defaults source: dbg-package-missing-depends python-all-dbg
+python-defaults source: dbg-package-missing-depends python-dbg
+
+# it's upstream software, just splitted out.
+python-defaults source: native-package-with-dash-version