diff --git a/debian/changelog b/debian/changelog
index 697b39a4edb084351582cae9107aa8822ac9befd..bed7929eb2a21768fa6c79caa18fb626c2e1b27f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
python-defaults (2.7.15~rc1-2) UNRELEASED; urgency=medium
+ * Bump version to 2.7.15.
+ * Split out a set of python2 packages, and let the python packages depend on
+ it. No changes for the "-all" packages.
* Update Vcs attributes.
* Remove Barry Warsaw as uploader.
diff --git a/debian/control.in b/debian/control.in
index 5342b9e60db6036db1f6442ad0d2ff7a6f48d552..8ecebd9db065d3a586c154ca7d94541e0ad8848c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,19 +21,19 @@ Architecture: any
Multi-Arch: allowed
Priority: optional
Pre-Depends: python-minimal (= ${binary:Version})
-Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), libpython-stdlib (= ${binary:Version})
+Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), libpython-stdlib (= ${binary:Version}), python2 (= ${binary:Version})
Suggests: python-doc (= ${binary:Version}), python-tk (>= @PREVVER@)
Conflicts: python-central (<< 0.5.5)
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)
- Python, the high-level, interactive object oriented language,
+Description: interactive high-level object-oriented language (Python2 version)
+ Python2, the high-level, interactive object oriented language,
includes an extensive class library with lots of goodies for
network programming, system administration, sounds and graphics.
.
- This package is a dependency package, which depends on Debian's default
- Python version (currently v@VER@).
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
XB-Cnf-Extra-Commands: python
XB-Cnf-Priority-Bonus: 3
@@ -41,12 +41,12 @@ Package: python-minimal
Architecture: any
Multi-Arch: allowed
Priority: optional
-Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20)
+Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20), python2-minimal (= ${binary:Version})
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)
Replaces: python (<= 2.7.3-1~)
-Description: minimal subset of the Python language (default version)
+Description: minimal subset of the Python2 language
This package contains the interpreter and some essential modules. It's used
in the boot process for some basic tasks.
See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules
@@ -56,52 +56,52 @@ Cnf-Visible-Pkgname: python
Package: python-dev
Architecture: any
Multi-Arch: allowed
-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@)
-Description: header files and a static library for Python (default)
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@), python2-dev (= ${binary:Version})
+Description: header files and a static library for Python2
Header files, a static library and development tools for building
- Python modules, extending the Python interpreter or embedding Python
+ Python2 modules, extending the Python2 interpreter or embedding Python2
in applications.
.
- This package is a dependency package, which depends on Debian's default
- Python version (currently v@VER@).
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
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)
+Depends: lib@PVER@-dev (>= @PREVVER@), ${misc:Depends}, libpython2-dev (= ${binary:Version})
+Description: header files and a static library for Python2
Header files, a static library and development tools for building
- Python modules, extending the Python interpreter or embedding Python
+ Python2 modules, extending the Python2 interpreter or embedding Python2
in applications.
.
- This package is a dependency package, which depends on Debian's default
- Python version (currently v@VER@).
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
Package: libpython-stdlib
Architecture: any
Multi-Arch: same
Priority: optional
-Depends: libpython@VER@-stdlib (>= @PREVVER@), ${misc:Depends}
-Description: interactive high-level object-oriented language (default python version)
- Python, the high-level, interactive object oriented language,
+Depends: libpython@VER@-stdlib (>= @PREVVER@), ${misc:Depends}, libpython2-stdlib (= ${binary:Version})
+Description: interactive high-level object-oriented language (Python2)
+ Python2, the high-level, interactive object oriented language,
includes an extensive class library with lots of goodies for
network programming, system administration, sounds and graphics.
.
- This package is a dependency package, which depends on Debian's default
- Python version (currently v@VER@).
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
Package: python-doc
Section: doc
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, python@VER@-doc (>= @PREVVER@)
+Depends: ${misc:Depends}, python@VER@-doc (>= @PREVVER@), python2-doc (= ${binary:Version})
Suggests: python-examples, python (= ${binary:Version})
Breaks: python (<< 2.3.5)
Replaces: python (<< 2.3.5)
-Description: documentation for the high-level object-oriented language Python
+Description: documentation for the high-level object-oriented language Python2
This is the official set of documentation for the interactive high-level
- object-oriented language Python (v@VER@). All documents are provided
+ object-oriented language Python2 (v@VER@). All documents are provided
in HTML format, some in info format. The package consists of nine documents:
.
* Tutorial
@@ -114,50 +114,50 @@ Description: documentation for the high-level object-oriented language Python
* Documenting Python
* Distributing Python Modules
.
- This package is a dependency package, which depends on Debian's default
- Python version (currently v@VER@).
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
Package: python-dbg
Architecture: any
Multi-Arch: allowed
Section: debug
-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
-Description: debug build of the Python Interpreter (version @VER@)
- Python interpreter configured with --pydebug. Dynamically loaded modules are
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@), python2-dbg (= ${binary:Version})
+Description: debug build of the Python Interpreter2 (version @VER@)
+ Python2 interpreter configured with --pydebug. Dynamically loaded modules are
searched in /usr/lib/python@VER@/lib-dynload/debug first.
Package: libpython-dbg
Architecture: any
Multi-Arch: same
Section: debug
-Depends: lib@PVER@-dbg (>= @PREVVER@), ${misc:Depends}
-Description: debug build of the Python Interpreter (version @VER@)
- Python interpreter configured with --pydebug. Dynamically loaded modules
+Depends: lib@PVER@-dbg (>= @PREVVER@), ${misc:Depends}, libpython2-dbg (= ${binary:Version})
+Description: debug build of the Python2 Interpreter (version @VER@)
+ Python2 interpreter configured with --pydebug. Dynamically loaded modules
are searched in /usr/lib/python@VER@/lib-dynload/debug first.
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
+Description: package depending on all supported Python2 runtime versions
The package currently depends on python2.7, in the future,
- dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
+ dependencies on jython (Python2 for a JVM) and ironpython (Python2 for Mono)
may be added.
.
This package is a dependency package used as a build dependency for other
- packages to avoid hardcoded dependencies on specific Python runtimes.
+ packages to avoid hardcoded dependencies on specific Python2 runtimes.
Package: python-all-dev
Architecture: any
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
+Description: package depending on all supported Python2 development packages
The package currently depends on python2.7-dev, in the
- future, dependencies on jython (Python for a JVM) and ironpython (Python
+ future, dependencies on jython (Python2 for a JVM) and ironpython (Python2
for Mono) may be added.
.
This package is a dependency package used as a build dependency for other
- packages to avoid hardcoded dependencies on specific Python development
+ packages to avoid hardcoded dependencies on specific Python2 development
packages.
Package: python-all-dbg
@@ -165,13 +165,13 @@ Architecture: any
Multi-Arch: allowed
Section: debug
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
+Description: package depending on all supported Python2 debugging packages
The package currently depends on python2.7-dbg, in the
- future, dependencies on jython (Python for a JVM) and ironpython (Python
+ future, dependencies on jython (Python for a JVM) and ironpython (Python2
for Mono) may be added.
.
This package is a dependency package used as a build dependency for other
- packages to avoid hardcoded dependencies on specific Python debug packages.
+ packages to avoid hardcoded dependencies on specific Python2 debug packages.
Package: libpython-all-dev
Architecture: any
@@ -179,13 +179,13 @@ Multi-Arch: same
Section: libdevel
Depends: libpython-dev (= ${binary:Version}), ${misc:Depends},
libpython2.7-dev
-Description: package depending on all supported Python development packages
+Description: package depending on all supported Python2 development packages
The package currently depends on libpython2.7-dev, in the
- future, dependencies on jython (Python for a JVM) and ironpython (Python
+ future, dependencies on jython (Python2 for a JVM) and ironpython (Python2
for Mono) may be added.
.
This package is a dependency package used as a build dependency for other
- packages to avoid hardcoded dependencies on specific Python development
+ packages to avoid hardcoded dependencies on specific Python2 development
packages.
Package: libpython-all-dbg
@@ -194,10 +194,139 @@ Multi-Arch: same
Section: debug
Depends: libpython-dbg (= ${binary:Version}), ${misc:Depends},
libpython2.7-dbg
-Description: package depending on all supported Python debugging packages
+Description: package depending on all supported Python2 debugging packages
The package currently depends on libpython2.7-dbg, in the
- future, dependencies on jython (Python for a JVM) and ironpython (Python
+ future, dependencies on jython (Python2 for a JVM) and ironpython (Python2
for Mono) may be added.
.
This package is a dependency package used as a build dependency for other
- packages to avoid hardcoded dependencies on specific Python debug packages.
+ packages to avoid hardcoded dependencies on specific Python2 debug packages.
+
+Package: python2
+Architecture: any
+Multi-Arch: allowed
+Priority: optional
+Pre-Depends: python2-minimal (= ${binary:Version})
+Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), libpython2-stdlib (= ${binary:Version})
+Suggests: python2-doc (= ${binary:Version}), python-tk (>= @PREVVER@)
+Conflicts: python-central (<< 0.5.5)
+Breaks: update-manager-core (<< 0.200.5-2), python (<< 2.7.15-1)
+Replaces: python-dev (<< 2.6.5-2), python (<< 2.7.15-1)
+Provides: python-email, python-ctypes, python-wsgiref, python-importlib, python-profiler
+Description: interactive high-level object-oriented language (Python2 version)
+ Python2, the high-level, interactive object oriented language,
+ includes an extensive class library with lots of goodies for
+ network programming, system administration, sounds and graphics.
+ .
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
+XB-Cnf-Extra-Commands: python2
+XB-Cnf-Priority-Bonus: 3
+
+Package: python2-minimal
+Architecture: any
+Multi-Arch: allowed
+Priority: optional
+Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20)
+Recommends: python2
+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), python-minimal (<< 2.7.15-1)
+Replaces: python (<= 2.7.3-1~), python-minimal (<< 2.7.15-1)
+Description: minimal subset of the Python2 language
+ This package contains the interpreter and some essential modules. It's used
+ in the boot process for some basic tasks.
+ See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules
+ contained in this package.
+Cnf-Visible-Pkgname: python2
+
+Package: python2-dev
+Architecture: any
+Multi-Arch: allowed
+Depends: ${misc:Depends}, python2 (= ${binary:Version}), libpython2-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@)
+Breaks: python-dev (<< 2.7.15-1)
+Replaces: python-dev (<< 2.7.15-1)
+Description: header files and a static library for Python2
+ Header files, a static library and development tools for building
+ Python2 modules, extending the Python2 interpreter or embedding Python2
+ in applications.
+ .
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
+
+Package: libpython2-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: lib@PVER@-dev (>= @PREVVER@), ${misc:Depends}
+Breaks: libpython-dev (<< 2.7.15-1)
+Replaces: libpython-dev (<< 2.7.15-1)
+Description: header files and a static library for Python2
+ Header files, a static library and development tools for building
+ Python2 modules, extending the Python2 interpreter or embedding Python2
+ in applications.
+ .
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
+
+Package: libpython2-stdlib
+Architecture: any
+Multi-Arch: same
+Priority: optional
+Depends: libpython@VER@-stdlib (>= @PREVVER@), ${misc:Depends}
+Breaks: libpython-stdlib (<< 2.7.15-1)
+Replaces: libpython-stdlib (<< 2.7.15-1)
+Description: interactive high-level object-oriented language (Python2)
+ Python2, the high-level, interactive object oriented language,
+ includes an extensive class library with lots of goodies for
+ network programming, system administration, sounds and graphics.
+ .
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
+
+Package: python2-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, python@VER@-doc (>= @PREVVER@)
+Suggests: python2 (= ${binary:Version})
+Breaks: python-doc (<< 2.7.15-1)
+Replaces: python-doc (<< 2.7.15-1)
+Description: documentation for the high-level object-oriented language Python2
+ This is the official set of documentation for the interactive high-level
+ object-oriented language Python2 (v@VER@). All documents are provided
+ in HTML format, some in info format. The package consists of nine documents:
+ .
+ * Tutorial
+ * Python Library Reference
+ * Macintosh Module Reference
+ * Python Language Reference
+ * Extending and Embedding Python
+ * Python/C API Reference
+ * Installing Python Modules
+ * Documenting Python
+ * Distributing Python Modules
+ .
+ This package is a dependency package, which depends on Debian's Python2
+ version (currently v@VER@).
+
+Package: python2-dbg
+Architecture: any
+Multi-Arch: allowed
+Section: debug
+Depends: ${misc:Depends}, python2 (= ${binary:Version}), libpython2-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
+Breaks: python-dbg (<< 2.7.15-1)
+Replaces: python-dbg (<< 2.7.15-1)
+Description: debug build of the Python2 interpreter (version @VER@)
+ Python2 interpreter configured with --pydebug. Dynamically loaded modules are
+ searched in /usr/lib/python@VER@/lib-dynload/debug first.
+
+Package: libpython2-dbg
+Architecture: any
+Multi-Arch: same
+Section: debug
+Depends: lib@PVER@-dbg (>= @PREVVER@), ${misc:Depends}
+Breaks: libpython-dbg (<< 2.7.15-1)
+Replaces: libpython-dbg (<< 2.7.15-1)
+Description: debug build of the Python2 interpreter (version @VER@)
+ Python2 interpreter configured with --pydebug. Dynamically loaded modules
+ are searched in /usr/lib/python@VER@/lib-dynload/debug first.
diff --git a/debian/python.desktop b/debian/python.desktop
index 5f03cdfa23c4f13d04c7a6bc54a5d7f97f443346..3571fe897547be04672ab351c25e1a027b19b6bd 100644
--- a/debian/python.desktop
+++ b/debian/python.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=KonsoleApplication
-Name=Python Interpreter
-Comment=Python
-Exec=/usr/bin/python
-Icon=/usr/share/pixmaps/python.xpm
+Name=Python2 Interpreter
+Comment=Python2
+Exec=/usr/bin/python2
+Icon=/usr/share/pixmaps/python2.xpm
diff --git a/debian/python2-dev.dirs b/debian/python2-dev.dirs
new file mode 100644
index 0000000000000000000000000000000000000000..415f082dd910d68018bafc3092793db6a06ebf68
--- /dev/null
+++ b/debian/python2-dev.dirs
@@ -0,0 +1 @@
+/usr/bin
diff --git a/debian/python-doc.docs b/debian/python2-doc.docs
similarity index 100%
rename from debian/python-doc.docs
rename to debian/python2-doc.docs
diff --git a/debian/python2-minimal.dirs b/debian/python2-minimal.dirs
new file mode 100644
index 0000000000000000000000000000000000000000..415f082dd910d68018bafc3092793db6a06ebf68
--- /dev/null
+++ b/debian/python2-minimal.dirs
@@ -0,0 +1 @@
+/usr/bin
diff --git a/debian/python2-minimal.manpages b/debian/python2-minimal.manpages
new file mode 100644
index 0000000000000000000000000000000000000000..242b1011cae00d72350071e4219d2c21200a3207
--- /dev/null
+++ b/debian/python2-minimal.manpages
@@ -0,0 +1,2 @@
+pyclean.1
+pycompile.1
diff --git a/debian/python-minimal.postinst.in b/debian/python2-minimal.postinst.in
similarity index 100%
rename from debian/python-minimal.postinst.in
rename to debian/python2-minimal.postinst.in
diff --git a/debian/python-minimal.prerm b/debian/python2-minimal.prerm
similarity index 100%
rename from debian/python-minimal.prerm
rename to debian/python2-minimal.prerm
diff --git a/debian/python2.desktop b/debian/python2.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..3571fe897547be04672ab351c25e1a027b19b6bd
--- /dev/null
+++ b/debian/python2.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=KonsoleApplication
+Name=Python2 Interpreter
+Comment=Python2
+Exec=/usr/bin/python2
+Icon=/usr/share/pixmaps/python2.xpm
diff --git a/debian/python.doc-base.python-policy b/debian/python2.doc-base.python-policy
similarity index 100%
rename from debian/python.doc-base.python-policy
rename to debian/python2.doc-base.python-policy
diff --git a/debian/python.install b/debian/python2.install
similarity index 100%
rename from debian/python.install
rename to debian/python2.install
diff --git a/debian/python2.lintian-overrides b/debian/python2.lintian-overrides
new file mode 100644
index 0000000000000000000000000000000000000000..343e859655db48f7675541b57f51c9db5689b17c
--- /dev/null
+++ b/debian/python2.lintian-overrides
@@ -0,0 +1,5 @@
+# this is the only package that can depend on it
+python binary: depends-on-python-minimal
+
+# we rely on our patched python library, don't pick up a local version
+python binary: command-with-path-in-maintainer-script
diff --git a/debian/python2.manpages b/debian/python2.manpages
new file mode 100644
index 0000000000000000000000000000000000000000..47df0aaaa6de7ed6d7d79af6c31e985436b240cd
--- /dev/null
+++ b/debian/python2.manpages
@@ -0,0 +1 @@
+dh_python2.1
diff --git a/debian/rules b/debian/rules
index 47fdc336f145d1ee39871303be02fe2efd8e3f33..304b6ba31c929acbb2b0d371ecce8f88ed2f1c3d 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.15~rc1-1~
+PREVVER := 2.7.15-1~
# 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:any (>= 2.7.11-11)
+ bd_i586 = dpkg-dev (>= 1.17.11), python2.7:any (>= 2.7.15-1)
endif
@@ -165,17 +165,22 @@ install: build stamp-dh_python stamp-install
stamp-install: stamp-build control-file stamp-control
dh_testdir
dh_testroot
- dh_installdirs usr/share/doc/python/faq
+ dh_installdirs -ppython2 usr/share/doc/python2/faq
+ dh_installdirs -ppython usr/share/doc/python
dh_install
set -e; \
cd faq && \
for p in *.ht; do \
p=`basename $$p .ht`; \
- cp $$p.html ../debian/python/usr/share/doc/python/faq/; \
+ cp $$p.html ../debian/python2/usr/share/doc/python2/faq/; \
done
- mv debian/python/usr/share/doc/python/faq/FAQ.html \
- debian/python/usr/share/doc/python/
+ mv debian/python2/usr/share/doc/python2/faq/FAQ.html \
+ debian/python2/usr/share/doc/python2/
+ ln -sf ../python2/faq \
+ debian/python/usr/share/doc/python/faq
+ ln -sf ../python2/FAQ.html \
+ debian/python/usr/share/doc/python/FAQ.html
touch stamp-install
@@ -184,8 +189,8 @@ stamp-dh_python:
dh_testroot
dh_installdirs
-make check_versions
- DESTDIR=debian/python PREFIX=/usr make install-dev
- DESTDIR=debian/python-minimal PREFIX=/usr make install-runtime
+ DESTDIR=debian/python2 PREFIX=/usr make install-dev
+ DESTDIR=debian/python2-minimal PREFIX=/usr make install-runtime
# disabled by default, run manually if you want to update it
# (requires apt-file and network connection)
#make -C pydist dist_fallback
@@ -198,14 +203,21 @@ binary-indep: build install stamp-doc
dh_installman -i
ifeq ($(with_doc),yes)
- dh_installdocs -ppython-doc debian/README.Debian
- dh_installchangelogs -ppython-doc
+ dh_installdocs -ppython-doc -ppython2-doc debian/README.Debian
+ dh_installchangelogs -ppython-doc -ppython2-doc
mkdir -p debian/python-doc/usr/share/doc/python
ln -sf ../python$(VER)-doc/html \
debian/python-doc/usr/share/doc/python/html
mkdir -p debian/python-doc/usr/share/doc/python-doc
ln -sf ../python$(VER)-doc/html \
debian/python-doc/usr/share/doc/python-doc/html
+
+ mkdir -p debian/python2-doc/usr/share/doc/python2
+ ln -sf ../python$(VER)-doc/html \
+ debian/python2-doc/usr/share/doc/python2/html
+ mkdir -p debian/python2-doc/usr/share/doc/python2-doc
+ ln -sf ../python$(VER)-doc/html \
+ debian/python2-doc/usr/share/doc/python2-doc/html
endif
# dh_installdebconf -i $(NOPKGS)
@@ -226,26 +238,30 @@ binary-arch: build install stamp-doc
dh_testroot -a
dh_installman -a
+ : # provide the python2 and python2.1 defaults
+ mkdir -p debian/python2-minimal/usr/bin
+ ln -sf python$(VER) debian/python2-minimal/usr/bin/python2
+ mkdir -p debian/python2-minimal/usr/share/man/man1
+ ln -sf python$(VER).1.gz \
+ debian/python2-minimal/usr/share/man/man1/python2.1.gz
+
: # 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
+ ln -sf python2 debian/python-minimal/usr/bin/python
mkdir -p debian/python-minimal/usr/share/man/man1
- ln -sf python$(VER).1.gz \
+ ln -sf python2.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
+ mkdir -p debian/python2-minimal/usr/share/python
cp -p debian/debian_defaults \
- debian/python-minimal/usr/share/python/
+ debian/python2-minimal/usr/share/python/
install -m 755 debian/pyversions.py \
- debian/python-minimal/usr/share/python/
+ debian/python2-minimal/usr/share/python/
install -m 644 debian/pyversions.1 \
- debian/python-minimal/usr/share/man/man1/
- dh_link -ppython-minimal /usr/share/python/pyversions.py /usr/bin/pyversions
+ debian/python2-minimal/usr/share/man/man1/
+ dh_link -ppython2-minimal /usr/share/python/pyversions.py /usr/bin/pyversions
# install -m 755 debian/pycompile \
# debian/python-minimal/usr/bin/
@@ -255,26 +271,42 @@ binary-arch: build install stamp-doc
# mkdir debian/python-minimal/usr/share/python-central
# cp -p debian/python.pycentral debian/python-minimal/usr/share/python-central/
+ mkdir -p debian/python2/usr/bin
+ ln -sf pydoc$(VER) debian/python2/usr/bin/pydoc2
+ ln -sf pygettext$(VER) debian/python2/usr/bin/pygettext2
+ ln -sf pdb$(VER) debian/python2/usr/bin/pdb2
+
mkdir -p debian/python/usr/bin
- ln -sf pydoc$(VER) debian/python/usr/bin/pydoc
- ln -sf pygettext$(VER) debian/python/usr/bin/pygettext
- ln -sf pdb$(VER) debian/python/usr/bin/pdb
+ ln -sf pydoc2 debian/python/usr/bin/pydoc
+ ln -sf pygettext2 debian/python/usr/bin/pygettext
+ ln -sf pdb2 debian/python/usr/bin/pdb
- mkdir -p debian/python/usr/share/python
+ mkdir -p debian/python2/usr/share/python
install -m 644 debian/python.mk \
- debian/python/usr/share/python/
+ debian/python2/usr/share/python/
- mkdir -p debian/python/usr/share/man/man1
+ mkdir -p debian/python2/usr/share/man/man1
ln -sf pydoc$(VER).1.gz \
- debian/python/usr/share/man/man1/pydoc.1.gz
+ debian/python2/usr/share/man/man1/pydoc2.1.gz
ln -sf pygettext$(VER).1.gz \
- debian/python/usr/share/man/man1/pygettext.1.gz
+ debian/python2/usr/share/man/man1/pygettext2.1.gz
ln -sf pdb$(VER).1.gz \
+ debian/python2/usr/share/man/man1/pdb2.1.gz
+
+ mkdir -p debian/python/usr/share/man/man1
+ ln -sf pydoc2.1.gz \
+ debian/python/usr/share/man/man1/pydoc.1.gz
+ ln -sf pygettext2.1.gz \
+ debian/python/usr/share/man/man1/pygettext.1.gz
+ ln -sf pdb2.1.gz \
debian/python/usr/share/man/man1/pdb.1.gz
- mkdir -p debian/python/usr/share/doc/python
+ mkdir -p debian/python2/usr/share/doc/python2
cp -a debian/python-policy.{html,dbk,txt} \
- debian/python/usr/share/doc/python/
+ debian/python2/usr/share/doc/python2/
+
+ mkdir -p debian/python2/usr/share/pixmaps
+ ln -sf python$(VER).xpm debian/python2/usr/share/pixmaps/python2.xpm
mkdir -p debian/python/usr/share/pixmaps
ln -sf python$(VER).xpm debian/python/usr/share/pixmaps/python.xpm
@@ -285,77 +317,131 @@ binary-arch: build install stamp-doc
ln -sf ../python/python-policy.$$ext \
debian/python/usr/share/doc/python$(VER)/python-policy.$$ext; \
done
+ mkdir -p debian/python2/usr/share/doc/python$(VER)
+ for ext in html dbk.gz txt.gz; do \
+ ln -sf ../python2/python-policy.$$ext \
+ debian/python2/usr/share/doc/python$(VER)/python-policy.$$ext; \
+ done
+
+ mkdir -p debian/python2/usr/share/apps/konsole
+ cp -p debian/python2.desktop debian/python2/usr/share/apps/konsole/
mkdir -p debian/python/usr/share/apps/konsole
cp -p debian/python.desktop debian/python/usr/share/apps/konsole/
+ : # provide the python2-config default
+ mkdir -p debian/python2-dev/usr/bin
+ ln -sf python$(VER)-config debian/python2-dev/usr/bin/python2-config
+ mkdir -p debian/python2-dev/usr/share/man/man1
+ ln -sf python$(VER)-config.1.gz \
+ debian/python2-dev/usr/share/man/man1/python2-config.1.gz
+
: # provide the python-config default
mkdir -p debian/python-dev/usr/bin
- ln -sf python$(VER)-config debian/python-dev/usr/bin/python-config
- ln -sf python$(VER)-config debian/python-dev/usr/bin/python2-config
+ ln -sf python2-config debian/python-dev/usr/bin/python-config
mkdir -p debian/python-dev/usr/share/man/man1
- ln -sf python$(VER)-config.1.gz \
+ ln -sf python2-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/python2-config.1.gz
: # provide pkgconfig defaults
+ mkdir -p debian/python2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+ ln -sf python-$(VER).pc debian/python2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python2.pc
+ mkdir -p debian/python2-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+ ln -sf python-$(VER)-dbg.pc debian/python2-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python2-dbg.pc
+
mkdir -p debian/python-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
- ln -sf python-$(VER).pc debian/python-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python.pc
- ln -sf python.pc debian/python-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python2.pc
+ ln -sf python2.pc debian/python-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python.pc
mkdir -p debian/python-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
- ln -sf python-$(VER)-dbg.pc debian/python-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-dbg.pc
- ln -sf python-dbg.pc debian/python-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python2-dbg.pc
+ ln -sf python2-dbg.pc debian/python-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-dbg.pc
+
+ : # provide the python2-dbg and python2-dbg.1 defaults
+ mkdir -p debian/python2-dbg/usr/bin
+ ln -sf python$(VER)-dbg debian/python2-dbg/usr/bin/python2-dbg
+ ln -sf python$(VER)-dbg-config debian/python2-dbg/usr/bin/python2-dbg-config
+ mkdir -p debian/python2-dbg/usr/share/man/man1
+ ln -sf python$(VER)-dbg.1.gz \
+ debian/python2-dbg/usr/share/man/man1/python2-dbg.1.gz
+ ln -sf python$(VER)-dbg-config.1.gz \
+ debian/python2-dbg/usr/share/man/man1/python2-dbg-config.1.gz
+ mkdir -p debian/python2-dbg/usr/share/doc/python2
+ ln -sf ../python$(VER)/SpecialBuilds.txt.gz \
+ debian/python2-dbg/usr/share/doc/python2/SpecialBuilds.txt.gz
+ ln -sf ../python$(VER)/README.debug \
+ debian/python2-dbg/usr/share/doc/python2/README.debug
: # provide the python-dbg and python-dbg.1 defaults
mkdir -p debian/python-dbg/usr/bin
- ln -sf python$(VER)-dbg debian/python-dbg/usr/bin/python-dbg
- ln -sf python$(VER)-dbg debian/python-dbg/usr/bin/python2-dbg
- ln -sf python$(VER)-dbg-config debian/python-dbg/usr/bin/python-dbg-config
- ln -sf python$(VER)-dbg-config debian/python-dbg/usr/bin/python2-dbg-config
+ ln -sf python2-dbg debian/python-dbg/usr/bin/python-dbg
+ ln -sf python2-dbg-config debian/python-dbg/usr/bin/python-dbg-config
mkdir -p debian/python-dbg/usr/share/man/man1
- ln -sf python$(VER)-dbg.1.gz \
+ ln -sf python2-dbg.1.gz \
debian/python-dbg/usr/share/man/man1/python-dbg.1.gz
- ln -sf python$(VER)-dbg.1.gz \
- debian/python-dbg/usr/share/man/man1/python2-dbg.1.gz
- ln -sf python$(VER)-dbg-config.1.gz \
+ ln -sf python2-dbg-config.1.gz \
debian/python-dbg/usr/share/man/man1/python-dbg-config.1.gz
- ln -sf python$(VER)-dbg-config.1.gz \
- debian/python-dbg/usr/share/man/man1/python2-dbg-config.1.gz
mkdir -p debian/python-dbg/usr/share/doc/python
- ln -sf ../python$(VER)/SpecialBuilds.txt.gz \
+ ln -sf ../python2/SpecialBuilds.txt.gz \
debian/python-dbg/usr/share/doc/python/SpecialBuilds.txt.gz
- ln -sf ../python$(VER)/README.debug \
+ ln -sf ../python2/README.debug \
debian/python-dbg/usr/share/doc/python/README.debug
- mkdir -p debian/python/usr/lib/valgrind
+ mkdir -p debian/python2/usr/lib/valgrind
cp -p debian/valgrind-python.supp \
+ debian/python2/usr/lib/valgrind/python2.supp
+ mkdir -p debian/python/usr/lib/valgrind
+ ln -sf python2.supp \
debian/python/usr/lib/valgrind/python.supp
+ : # provide the DEB_HOST_GNU_TYPE/DEB_HOST_MULTIRACH python2-config defaults
+ mkdir -p debian/libpython2-dev/usr/bin
+ ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-config \
+ debian/libpython2-dev/usr/bin/$(DEB_HOST_MULTIARCH)-python2-config
+ mkdir -p debian/libpython2-dev/usr/share/man/man1
+ ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-config.1.gz \
+ debian/libpython2-dev/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-python2-config.1.gz
+ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE))
+ ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-config \
+ debian/libpython2-dev/usr/bin/$(DEB_HOST_GNU_TYPE)-python2-config
+ ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-config.1.gz \
+ debian/libpython2-dev/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-python2-config.1.gz
+endif
+
+ mkdir -p debian/libpython2-dbg/usr/bin
+ ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-dbg-config \
+ debian/libpython2-dbg/usr/bin/$(DEB_HOST_MULTIARCH)-python2-dbg-config
+ mkdir -p debian/libpython2-dbg/usr/share/man/man1
+ ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-dbg-config.1.gz \
+ debian/libpython2-dbg/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-python2-dbg-config.1.gz
+ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE))
+ ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-dbg-config \
+ debian/libpython2-dbg/usr/bin/$(DEB_HOST_GNU_TYPE)-python2-dbg-config
+ ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-dbg-config.1.gz \
+ debian/libpython2-dbg/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-python2-dbg-config.1.gz
+endif
+
: # provide the DEB_HOST_GNU_TYPE/DEB_HOST_MULTIRACH python-config defaults
mkdir -p debian/libpython-dev/usr/bin
- ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-config \
+ ln -sf $(DEB_HOST_MULTIARCH)-python2-config \
debian/libpython-dev/usr/bin/$(DEB_HOST_MULTIARCH)-python-config
mkdir -p debian/libpython-dev/usr/share/man/man1
- ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-config.1.gz \
+ ln -sf $(DEB_HOST_MULTIARCH)-python2-config.1.gz \
debian/libpython-dev/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-python-config.1.gz
ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE))
- ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-config \
+ ln -sf $(DEB_HOST_GNU_TYPE)-python2-config \
debian/libpython-dev/usr/bin/$(DEB_HOST_GNU_TYPE)-python-config
- ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-config.1.gz \
+ ln -sf $(DEB_HOST_GNU_TYPE)-python2-config.1.gz \
debian/libpython-dev/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-python-config.1.gz
endif
mkdir -p debian/libpython-dbg/usr/bin
- ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-dbg-config \
+ ln -sf $(DEB_HOST_MULTIARCH)-python2-dbg-config \
debian/libpython-dbg/usr/bin/$(DEB_HOST_MULTIARCH)-python-dbg-config
mkdir -p debian/libpython-dbg/usr/share/man/man1
- ln -sf $(DEB_HOST_MULTIARCH)-python$(VER)-dbg-config.1.gz \
+ ln -sf $(DEB_HOST_MULTIARCH)-python2-dbg-config.1.gz \
debian/libpython-dbg/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-python-dbg-config.1.gz
ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE))
- ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-dbg-config \
+ ln -sf $(DEB_HOST_GNU_TYPE)-python2-dbg-config \
debian/libpython-dbg/usr/bin/$(DEB_HOST_GNU_TYPE)-python-dbg-config
- ln -sf $(DEB_HOST_GNU_TYPE)-python$(VER)-dbg-config.1.gz \
+ ln -sf $(DEB_HOST_GNU_TYPE)-python2-dbg-config.1.gz \
debian/libpython-dbg/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-python-dbg-config.1.gz
endif
@@ -363,6 +449,11 @@ endif
dh_installdocs -a $(NOPKGS) --all debian/README.Debian
dh_installchangelogs -a $(NOPKGS)
+ for p in dbg dev; do \
+ p=python2-$$p; \
+ rm -rf debian/$$p/usr/share/doc/$$p; \
+ ln -sf python2 debian/$$p/usr/share/doc/$$p; \
+ done
for p in all all-dev all-dbg dbg dev; do \
p=python-$$p; \
rm -rf debian/$$p/usr/share/doc/$$p; \