From 0d5dee5868905085c9105509b4c86392c9e8b22e Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Tue, 5 Jun 2012 22:34:23 -0400
Subject: [PATCH] Revert providing /usr/bin/python2 symlink from python-minimal
instead of python2.7-minimal since python2.7 is not updated yet.
---
debian/changelog | 2 --
debian/control.in | 4 ++--
debian/rules | 5 +----
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ffcf1b9..b888a2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,6 @@ python-defaults (2.7.2-11) UNRELEASED; urgency=low
- Update description of functionality related to X-Python-Version for
Wheezy
- Update X/XS-Python-Versions to also include X-Python-Version examples
- * Provide /usr/bin/python2 symlink from python-minimal instead of
- python2.7-minimal
- Add appropriage Breaks/Replaces
[ Piotr Ożarowski ]
diff --git a/debian/control.in b/debian/control.in
index fca7d1f..b7541a4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,8 +33,8 @@ Priority: standard
Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), 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), python2.7-minimal (<< 2.7.3)
-Replaces: python (<= 2.4-1), python2.7-minimal (<< 2.7.3)
+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)
+Replaces: python (<= 2.4-1)
Description: minimal subset of the Python language (default version)
This package contains the interpreter and some essential modules. It's used
in the boot process for some basic tasks.
diff --git a/debian/rules b/debian/rules
index b5c4b86..1f94f9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,13 +166,10 @@ 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 debian/python-minimal/usr/bin/python \
- 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 debian/python-minimal/usr/share/man/man1/python.1.gz \
- debian/python-minimal/usr/share/man/man1/python2.1.gz
+
: #
mkdir -p debian/python-minimal/usr/share/python
cp -p debian/debian_defaults \
--
GitLab