From 674eae51f30c063f565b329b5864c56a661bb158 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 6 Jun 2013 15:36:30 +0200
Subject: [PATCH] * Drop Python 2.6 as a supported Python version. * Fix
some lintian warnings.
---
debian/changelog | 6 ++++--
debian/control | 33 ++++++++++++++++++---------------
debian/control.in | 33 ++++++++++++++++++---------------
debian/idle.desktop | 1 -
debian/idle.lintian-overrides | 2 ++
debian/rules | 12 ++++++------
debian/source.lintian-overrides | 2 ++
debpython/version.py | 2 +-
dh_python2.rst | 3 +++
pyclean.rst | 3 +++
pycompile.rst | 3 +++
11 files changed, 60 insertions(+), 40 deletions(-)
create mode 100644 debian/idle.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index c28223f..e026230 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-defaults (2.7.5-1) UNRELEASED; urgency=low
+python-defaults (2.7.5-1) unstable; urgency=low
[ Matthias Klose ]
* Bump version to 2.7.5.
@@ -6,12 +6,14 @@ python-defaults (2.7.5-1) UNRELEASED; urgency=low
* Bump standards version to 3.9.4.
* Start building the libpython-stdlib, libpython-all-dev, libpython-all-dbg
packages.
+ * Drop Python 2.6 as a supported Python version.
+ * Fix some lintian warnings.
[ Scott Kitterman ]
* When X(S)-Python-Version or debian/pyversions is not present, do not
describe them as missing, just indicate they are not there
- -- Matthias Klose <doko@debian.org> Wed, 15 May 2013 21:55:11 +0200
+ -- Matthias Klose <doko@debian.org> Thu, 06 Jun 2013 14:57:03 +0200
python-defaults (2.7.3-13) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 5ebbe85..8836983 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ 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})
-Suggests: python-doc (= ${binary:Version}), python-tk (= ${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)
Replaces: python-dev (<< 2.6.5-2)
@@ -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.5-1~)
+Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.5-1~)
Description: examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -66,6 +66,7 @@ Description: header files and a static library for Python (default)
Package: libpython-dev
Architecture: any
Multi-Arch: same
+Section: libdevel
Depends: libpython2.7-dev (>= 2.7.5-1~), ${misc:Depends}
Description: header files and a static library for Python (default)
Header files, a static library and development tools for building
@@ -89,7 +90,7 @@ Description: interactive high-level object-oriented language (default python ver
Package: idle
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.7
+Depends: ${misc:Depends}, python (>= ${binary:Version}), python-tk, idle-python2.7
Enhances: python
Replaces: python (<< 2.7.3-1~)
Breaks: python (<< 2.7.3-1~)
@@ -146,42 +147,44 @@ Description: debug build of the Python Interpreter (version 2.7)
Package: python-all
Architecture: any
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.7-3), python2.7 (>= 2.7.2-3)
+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.6 and python2.7, in the future,
+ The package currently depends on python2.7, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
- This package is used as a build dependency for other packages to
- avoid hardcoded dependencies on specific Python runtimes.
+ This package is a dependency package used as a build dependency for other
+ packages to avoid hardcoded dependencies on specific Python runtimes.
Package: python-all-dev
Architecture: any
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${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.6-dev and python2.7-dev, in the
+ The package currently depends on python2.7-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
- This package is used as a build dependency for other packages to
- avoid hardcoded dependencies on specific Python development packages.
+ This package is a dependency package used as a build dependency for other
+ packages to avoid hardcoded dependencies on specific Python development
+ packages.
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.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${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.6-dbg and python2.7-dbg, in the
+ The package currently depends on python2.7-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
- This package is used as a build dependency for other packages to
- avoid hardcoded dependencies on specific Python development packages.
+ This package is a dependency package used as a build dependency for other
+ packages to avoid hardcoded dependencies on specific Python debug packages.
Package: libpython-all-dev
Architecture: any
Multi-Arch: same
+Section: libdevel
Depends: libpython-dev (= ${binary:Version}), ${misc:Depends},
libpython2.7-dev
Description: package depending on all supported Python development packages
diff --git a/debian/control.in b/debian/control.in
index f0943b4..03b026f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,7 +16,7 @@ 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})
-Suggests: python-doc (= ${binary:Version}), python-tk (= ${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)
Replaces: python-dev (<< 2.6.5-2)
@@ -46,7 +46,7 @@ Description: minimal subset of the Python language (default version)
Package: python-examples
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), @PVER@-examples (>= @PREVVER@)
+Depends: ${misc:Depends}, python (>= ${binary:Version}), @PVER@-examples (>= @PREVVER@)
Description: examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -69,6 +69,7 @@ Description: header files and a static library for Python (default)
Package: libpython-dev
Architecture: any
Multi-Arch: same
+Section: libdevel
Depends: lib@PVER@-dev (>= @PREVVER@), ${misc:Depends}
Description: header files and a static library for Python (default)
Header files, a static library and development tools for building
@@ -92,7 +93,7 @@ Description: interactive high-level object-oriented language (default python ver
Package: idle
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-tk (>= 2.4.3-3), idle-@PVER@
+Depends: ${misc:Depends}, python (>= ${binary:Version}), python-tk, idle-@PVER@
Enhances: python
Replaces: python (<< 2.7.3-1~)
Breaks: python (<< 2.7.3-1~)
@@ -150,42 +151,44 @@ Description: debug build of the Python Interpreter (version @VER@)
Package: python-all
Architecture: any
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.7-3), python2.7 (>= 2.7.2-3)
+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.6 and python2.7, in the future,
+ The package currently depends on python2.7, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
- This package is used as a build dependency for other packages to
- avoid hardcoded dependencies on specific Python runtimes.
+ This package is a dependency package used as a build dependency for other
+ packages to avoid hardcoded dependencies on specific Python runtimes.
Package: python-all-dev
Architecture: any
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${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.6-dev and python2.7-dev, in the
+ The package currently depends on python2.7-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
- This package is used as a build dependency for other packages to
- avoid hardcoded dependencies on specific Python development packages.
+ This package is a dependency package used as a build dependency for other
+ packages to avoid hardcoded dependencies on specific Python development
+ packages.
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.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${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.6-dbg and python2.7-dbg, in the
+ The package currently depends on python2.7-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
- This package is used as a build dependency for other packages to
- avoid hardcoded dependencies on specific Python development packages.
+ This package is a dependency package used as a build dependency for other
+ packages to avoid hardcoded dependencies on specific Python debug packages.
Package: libpython-all-dev
Architecture: any
Multi-Arch: same
+Section: libdevel
Depends: libpython-dev (= ${binary:Version}), ${misc:Depends},
libpython2.7-dev
Description: package depending on all supported Python development packages
diff --git a/debian/idle.desktop b/debian/idle.desktop
index 1f1eb07..c78c1e3 100644
--- a/debian/idle.desktop
+++ b/debian/idle.desktop
@@ -4,7 +4,6 @@ Comment=Integrated Development Environment for Python
Exec=/usr/bin/idle
Icon=/usr/share/pixmaps/idle.xpm
Terminal=false
-MultipleArgs=false
Type=Application
Categories=Application;Development;
StartupNotify=true
diff --git a/debian/idle.lintian-overrides b/debian/idle.lintian-overrides
new file mode 100644
index 0000000..39614fa
--- /dev/null
+++ b/debian/idle.lintian-overrides
@@ -0,0 +1,2 @@
+# icon file available in a dependent package.
+idle binary: menu-icon-missing
diff --git a/debian/rules b/debian/rules
index 3a893d7..588f8ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -156,7 +156,7 @@ stamp-dh_python:
dh_testdir
dh_testroot
dh_installdirs
- make check_versions
+ -make check_versions
DESTDIR=debian/python PREFIX=/usr make install-dev
DESTDIR=debian/python-minimal PREFIX=/usr make install-runtime manpages
# disabled by default, run manually if you want to update it
@@ -291,7 +291,7 @@ binary-arch: build install stamp-doc
ln -sf python$(VER)-config.1.gz \
debian/python-dev/usr/share/man/man1/python-config.1.gz
ln -sf python$(VER)-config.1.gz \
- debian/python-dev/usr/share/man/man1/python-config2.1.gz
+ debian/python-dev/usr/share/man/man1/python2-config.1.gz
: # provide pkgconfig defaults
mkdir -p debian/python-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
@@ -363,10 +363,10 @@ endif
rm -rf debian/$$p/usr/share/doc/$$p; \
ln -sf python debian/$$p/usr/share/doc/$$p; \
done
-# rm -rf debian/libpython-all-dev/usr/share/doc/libpython-all-dev
-# ln -sf libpython-dev debian/libpython-all-dev/usr/share/doc/libpython-all-dev
-# rm -rf debian/libpython-all-dbg/usr/share/doc/libpython-all-dev
-# ln -sf libpython-dbg debian/libpython-all-dbg/usr/share/doc/libpython-all-dbg
+ rm -rf debian/libpython-all-dev/usr/share/doc/libpython-all-dev
+ ln -sf libpython-dev debian/libpython-all-dev/usr/share/doc/libpython-all-dev
+ rm -rf debian/libpython-all-dbg/usr/share/doc/libpython-all-dev
+ ln -sf libpython-dbg debian/libpython-all-dbg/usr/share/doc/libpython-all-dbg
dh_compress -a $(NOPKGS)
dh_fixperms -a $(NOPKGS)
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index a1ec970..3779050 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,6 +1,8 @@
# this source package provides these packages so it cannot depend on them
python-defaults source: dbg-package-missing-depends python-all-dbg
python-defaults source: dbg-package-missing-depends python-dbg
+python-defaults source: dbg-package-missing-depends libpython-all-dbg
+python-defaults source: dbg-package-missing-depends libpython-dbg
# it's upstream software, just splitted out.
python-defaults source: native-package-with-dash-version
diff --git a/debpython/version.py b/debpython/version.py
index 68ba9cd..7f2ab04 100644
--- a/debpython/version.py
+++ b/debpython/version.py
@@ -27,7 +27,7 @@ from os.path import exists, dirname, join
from types import GeneratorType
# will be overriden via debian_defaults file few lines later
-SUPPORTED = [(2, 7)]
+SUPPORTED = [(2, 7),]
DEFAULT = (2, 7)
RANGE_PATTERN = r'(-)?(\d\.\d+)(?:(-)(\d\.\d+)?)?'
diff --git a/dh_python2.rst b/dh_python2.rst
index f02159e..8bdde94 100644
--- a/dh_python2.rst
+++ b/dh_python2.rst
@@ -6,6 +6,9 @@
calculates Python dependencies, adds maintainer scripts to byte compile files, etc.
-----------------------------------------------------------------------------------
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
SYNOPSIS
========
dh_python2 -p PACKAGE [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]
diff --git a/pyclean.rst b/pyclean.rst
index 435ef40..03d5314 100644
--- a/pyclean.rst
+++ b/pyclean.rst
@@ -6,6 +6,9 @@
removes .pyc and .pyo files
---------------------------
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-201
+
SYNOPSIS
========
pyclean [-p PACKAGE | DIR_OR_FILE]
diff --git a/pycompile.rst b/pycompile.rst
index e59fdcf..529cf39 100644
--- a/pycompile.rst
+++ b/pycompile.rst
@@ -6,6 +6,9 @@
byte compile Python source files
--------------------------------
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
SYNOPSIS
========
pycompile [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]
--
GitLab