diff --git a/debian/changelog b/debian/changelog index b7c5bb4213d1e0de93bbdcd1b9c896c1ef86d0e8..2c1493ada10b2a1bc9f0fcf6866a92c3fa1ba03e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,11 @@ 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 - -- Scott Kitterman <scott@kitterman.com> Wed, 16 May 2012 14:19:29 -0400 + -- Scott Kitterman <scott@kitterman.com> Wed, 16 May 2012 14:58:09 -0400 python-defaults (2.7.2-10) unstable; urgency=low diff --git a/debian/control.in b/debian/control.in index b7541a4adc9cb89c192adb548df6839ab08a821e..fca7d1f396d0b291842b0c7400835d6b13502dc8 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) -Replaces: python (<= 2.4-1) +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) 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 1f94f9d9f7035104734f30bc541073d093a37278..b5c4b862d5285f51512434feeb99d79f5aff7bad 100755 --- a/debian/rules +++ b/debian/rules @@ -166,10 +166,13 @@ 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 \