diff -Nru python-defaults-2.6.6/debian/changelog python-defaults-2.6.6/debian/changelog
--- python-defaults-2.6.6/debian/changelog 2011-09-02 11:41:23.000000000 -0500
+++ python-defaults-2.6.6/debian/changelog 2011-09-17 01:33:52.000000000 -0500
@@ -1,61 +1,11 @@
-python-defaults (2.6.6-3+squeeze6) maverick; urgency=low
+python-defaults (2.6.6-4ubuntu1) maverick; urgency=low
- * pycompile: use /usr/bin/pythonX.Y rather than pythonX.Y (to avoid
- /usr/local interpreters and thus fix some Lenny → Squeeze upgrades)
+ * Merge with Debian; remaining changes:
+ - Package priorities and status.
+ - Python-2.6 is the only supported python2.x version.
+ - Adjust version numbers in maintainer scripts.
- -- Piotr Ożarowski <piotr@debian.org> Fri, 18 Feb 2011 22:44:51 +0100
-
-python-defaults (2.6.6-3+squeeze5) unstable; urgency=low
-
- * dh_python2: fix moving files from old debug locations
- * pycompile: skip dangling symlinks to fix upgrade problem introduced in
- -3+squeeze3 (closes: 607988)
-
- -- Piotr Ożarowski <piotr@debian.org> Tue, 11 Jan 2011 22:14:56 +0100
-
-python-defaults (2.6.6-3+squeeze4) unstable; urgency=medium
-
- * dh_python2: fix a crash in packages with private extension (closes: 607555)
-
- -- Piotr Ożarowski <piotr@debian.org> Sun, 19 Dec 2010 21:12:38 +0100
-
-python-defaults (2.6.6-3+squeeze3) unstable; urgency=medium
-
- * pycompile:
- - Don't over-optimize, check the timestamps of byte-code files.
- - Add options -f/--force, -O.
- - Propagate the exit value of the py_compile processes.
- - Update manual page.
- * Bump depends to require the fixed pycompile for dh_python2 based package
- builds.
- * Don't touch the standard python library in rtupdate scripts.
-
- -- Matthias Klose <doko@debian.org> Sun, 12 Dec 2010 22:23:03 +0100
-
-python-defaults (2.6.6-3+squeeze2) unstable; urgency=low
-
- * pycompile:
- - `pycompile $DESTDIR/usr/lib/python*` will recognize public
- site-packages directories and use the right interpreter instead of
- raising KeyError
- - do not try to check if interpreter is present when version range is
- empty (closes: 605356)
-
- -- Piotr Ożarowski <piotr@debian.org> Tue, 30 Nov 2010 19:57:51 +0100
-
-python-defaults (2.6.6-3+squeeze1) unstable; urgency=medium
-
- * pycompile: if installed Python is requested via -V option, use it even if
- it's not in a list of supported Python versions
-
- -- Piotr Ożarowski <piotr@debian.org> Mon, 18 Oct 2010 19:04:55 +0200
-
-python-defaults (2.6.6-3) unstable; urgency=low
-
- * Upload to unstable
- * dh_python2: egg renaming fixed
-
- -- Piotr Ożarowski <piotr@debian.org> Wed, 22 Sep 2010 23:03:15 +0200
+ -- Matthias Klose <doko@ubuntu.com> Wed, 15 Sep 2010 21:05:52 +0200
python-defaults (2.6.6-2) experimental; urgency=low
@@ -80,6 +30,15 @@
-- Piotr Ożarowski <piotr@debian.org> Sun, 12 Sep 2010 18:41:04 +0200
+python-defaults (2.6.6-1ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - Package priorities and status.
+ - Python-2.6 is the only supported python2.x version.
+ - Adjust version numbers in maintainer scripts.
+
+ -- Scott Kitterman <scott@kitterman.com> Thu, 09 Sep 2010 21:49:55 -0400
+
python-defaults (2.6.6-1) unstable; urgency=low
[ Piotr Ożarowski ]
@@ -98,6 +57,15 @@
-- Piotr Ożarowski <piotr@debian.org> Tue, 31 Aug 2010 19:09:30 +0200
+python-defaults (2.6.5-13ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - Package priorities and status.
+ - Python-2.6 is the only supported python2.x version.
+ - Adjust version numbers in maintainer scripts.
+
+ -- Scott Kitterman <scott@kitterman.com> Tue, 24 Aug 2010 09:32:49 -0400
+
python-defaults (2.6.5-13) unstable; urgency=low
[ Scott Kitterman ]
@@ -115,6 +83,15 @@
-- Piotr Ożarowski <piotr@debian.org> Fri, 13 Aug 2010 22:39:37 +0200
+python-defaults (2.6.5-12ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - Package priorities and status.
+ - Python-2.6 is the only supported python2.x version.
+ - Adjust version numbers in maintainer scripts.
+
+ -- Matthias Klose <doko@ubuntu.com> Sat, 07 Aug 2010 19:46:20 +0200
+
python-defaults (2.6.5-12) unstable; urgency=low
* pycompile: do not hang if interpreters are not started in the same order
@@ -134,6 +111,15 @@
-- Piotr Ożarowski <piotr@debian.org> Tue, 27 Jul 2010 21:25:54 +0200
+python-defaults (2.6.5-10ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - Package priorities and status.
+ - Python-2.6 is the only supported python2.x version.
+ - Adjust version numbers in maintainer scripts.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 26 Jul 2010 11:35:43 +0200
+
python-defaults (2.6.5-10) unstable; urgency=medium
* dh_python2:
@@ -145,6 +131,15 @@
-- Piotr Ożarowski <piotr@debian.org> Sun, 25 Jul 2010 12:34:56 +0200
+python-defaults (2.6.5-9ubuntu1) maverick; urgency=low
+
+ * Merge with Debian; remaining changes:
+ - Package priorities and status.
+ - Python-2.6 is the only supported python2.x version.
+ - Adjust version numbers in maintainer scripts.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 20 Jul 2010 20:31:31 +0200
+
python-defaults (2.6.5-9) unstable; urgency=low
[ Piotr Ożarowski ]
@@ -159,6 +154,12 @@
-- Piotr Ożarowski <piotr@debian.org> Mon, 19 Jul 2010 20:27:50 +0200
+python-defaults (2.6.5-8ubuntu1) maverick; urgency=low
+
+ * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <doko@ubuntu.com> Sat, 17 Jul 2010 13:18:39 +0200
+
python-defaults (2.6.5-8) unstable; urgency=low
* Revert:
@@ -211,6 +212,54 @@
-- Piotr Ożarowski <piotr@debian.org> Sun, 11 Jul 2010 17:08:19 +0200
+python-defaults (2.6.5-5ubuntu4) maverick; urgency=low
+
+ * Pull updated pycentral upgrade symlink cleaning from Debian bzr
+ - Readd fixed autoscripts/preinst-pycentral-clean
+ - Call autoscripts/preinst-pycentral-clean from dh_python2
+
+ -- Scott Kitterman <scott@kitterman.com> Fri, 09 Jul 2010 18:14:56 -0400
+
+python-defaults (2.6.5-5ubuntu3) maverick; urgency=low
+
+ * Revert update from Debian bzr to fix installability of packages built with
+ dh_python2 - the problem of dangling symlinks for packages formerly built
+ with python-central will have to be addressed later (LP: #599921):
+ - Remove autoscripts/preinst-pycentral-clean
+ - Drop reference to autoscripts/preinst-pycentral-clean from dh_python2
+
+ -- Scott Kitterman <scott@kitterman.com> Tue, 29 Jun 2010 23:32:49 -0400
+
+python-defaults (2.6.5-5ubuntu2) maverick; urgency=low
+
+ * Drop python2.5 from supported versions for dh_python2 in
+ debpython/version.py
+ * Clean up supported version/default version fallbacks in
+ debian/pyversions.py
+
+ -- Scott Kitterman <scott@kitterman.com> Mon, 28 Jun 2010 17:27:24 -0400
+
+python-defaults (2.6.5-5ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - python: priority important instead of standard
+ - python-minimal: required instead of standard and also Essential: yes
+ - python-all*: just depend on relevant python2.6 packages instead of
+ python2.5 and python2.6
+ - debian_defaults: move python2.5 from supported versions to old versions
+ - Adjust versions in debian/python.postinst.in and preinst.in to match
+ when python2.6 became default in Ubuntu
+ - Use (= ${binary:Version}) depends relationship rather then
+ (>= ${binary:Version}) throughouth (Same change pending in Debian)
+ - python: Add an unversioned `2to3' binary (Change pending in Debian)
+ - python-minimal: Provide symlink to binary and manpage for
+ /usr/bin/python2 (Change pending in Debian)
+ * Update from Debian bzr repository to revision 91
+ - dh_python2: invoke `pycentral pkgremove foo` in preinst if upgrading
+ from python-central based package
+
+ -- Scott Kitterman <scott@kitterman.com> Sat, 26 Jun 2010 15:38:28 -0400
+
python-defaults (2.6.5-5) unstable; urgency=medium
* Use Python's compileall module instead of pycompile to byte-compile
@@ -293,6 +342,118 @@
-- Matthias Klose <doko@debian.org> Fri, 14 May 2010 18:50:21 +0200
+python-defaults (2.6.5-0ubuntu1) lucid; urgency=low
+
+ * Bump version to 2.6.5.
+ * Update the valgrind support file to 2.6 (was still based on 2.4).
+ LP: #376876.
+ * Sync the policy file from Debian.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 31 Mar 2010 17:24:25 +0200
+
+python-defaults (2.6.4-0ubuntu2) lucid; urgency=low
+
+ * Drop dependencies on python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 30 Oct 2009 13:27:50 +0100
+
+python-defaults (2.6.4-0ubuntu1) karmic-proposed; urgency=low
+
+ * Bump version to 2.6.4 (no other changes). LP: #464668.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 30 Oct 2009 12:46:58 +0100
+
+python-defaults (2.6.4~rc1-0ubuntu1) karmic; urgency=low
+
+ * Bump version to 2.6.4 release candidate 1.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 12 Oct 2009 15:01:36 +0200
+
+python-defaults (2.6.3-0ubuntu1) karmic; urgency=low
+
+ * Bump version to 2.6.3.
+
+ -- Matthias Klose <doko@ubuntu.com> Sun, 04 Oct 2009 10:02:38 +0200
+
+python-defaults (2.6.2-0ubuntu1) jaunty; urgency=low
+
+ * Bump version to 2.6.2.
+
+ -- Matthias Klose <doko@ubuntu.com> Sat, 18 Apr 2009 14:51:24 +0200
+
+python-defaults (2.6.1-0ubuntu9) jaunty; urgency=low
+
+ * add versionized conflict for python-freevo and python-aubio to
+ make intrepid->jaunty upgrade work reliable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 Mar 2009 19:52:07 +0200
+
+python-defaults (2.6.1-0ubuntu8) jaunty; urgency=low
+
+ * Add versionized conflict against libboost-dbg and libboost1.35-dbg for
+ lower version than jaunty. This ensures that the new version of the
+ libboost-dbg.rtupdate script is available when the new python2.6 gets
+ installed. The old script does not know about python2.6 and errors
+ out (LP: #352317)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 Mar 2009 14:30:21 +0200
+
+python-defaults (2.6.1-0ubuntu7) jaunty; urgency=low
+
+ * Add versionized conflict against pitivi for lower version than jaunty
+ to ensure that the new version of pitivi is available when the new
+ python2.6 gets installed. This works around a install failure in
+ intrepid->jaunty upgrade (LP: #349441)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 27 Mar 2009 16:06:42 +0100
+
+python-defaults (2.6.1-0ubuntu6) jaunty; urgency=low
+
+ [ Michael Vogt ]
+ * Add versionized conflict against qmtest for lower version than jaunty
+ to ensure that the new version of qmtest is available when the new
+ python2.6 gets installed. This works around a install failure in
+ intrepid->jaunty upgrade (LP: #348322)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 26 Mar 2009 19:24:09 -0700
+
+python-defaults (2.6.1-0ubuntu5) jaunty; urgency=low
+
+ * python: Add an unversioned `2to3' binary.
+ * idle: Don't install a desktop file (already done in the versioned
+ idle packages).
+
+ -- Matthias Klose <doko@ubuntu.com> Sun, 22 Mar 2009 21:42:15 +0100
+
+python-defaults (2.6.1-0ubuntu4) jaunty; urgency=low
+
+ * Add versioned conflict against libboost-python-dev and
+ libboost-python1.35-dev. Both packages have broken .rtupdate scripts
+ in intrepid. LP: #346795.
+
+ -- Matthias Klose <doko@ubuntu.com> Sun, 22 Mar 2009 15:13:47 +0100
+
+python-defaults (2.6.1-0ubuntu3) jaunty; urgency=low
+
+ * Add versionized conflict against ufw for lower version than jaunty
+ to ensure that the new version of ufw (with python2.6 modules)
+ is available when the new python2.6 gets installed. This works
+ around a trigger failure in intrepid->jaunty upgrade (LP: #337705)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 04 Mar 2009 21:37:16 +0100
+
+python-defaults (2.6.1-0ubuntu2) jaunty; urgency=low
+
+ * idle-python: Depend on idle-python2.6. LP: #246125. Closes: #482163.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 02 Mar 2009 14:04:05 +0100
+
+python-defaults (2.6.1-0ubuntu1) jaunty; urgency=low
+
+ * Make python2.6 the default python version.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 27 Feb 2009 11:44:05 +0100
+
python-defaults (2.5.4-9) unstable; urgency=low
* python-all-dev: Fix typo in dependency list. Closes: #566278.
@@ -373,6 +534,43 @@
-- Matthias Klose <doko@debian.org> Wed, 25 Feb 2009 02:19:09 +0000
+python-defaults (2.5.4-0ubuntu5) jaunty; urgency=low
+
+ * python: Install /usr/share/python/python.mk, helper functions for
+ getting the python library dir and install args for distutils installs.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 24 Feb 2009 15:47:38 +0100
+
+python-defaults (2.5.4-0ubuntu3) jaunty; urgency=low
+
+ * Accept initial blank line in debian/control when parsing version
+ information. LP: #328929.
+ * Merge pyversions.py with python-central.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 20 Feb 2009 10:53:36 +0100
+
+python-defaults (2.5.4-0ubuntu2) jaunty; urgency=low
+
+ * Fix dependencies fo the -all packages.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 19 Feb 2009 12:52:35 +0100
+
+python-defaults (2.5.4-0ubuntu1) jaunty; urgency=low
+
+ * Depend on the 2.5.4 versions of the packages.
+ * Add 2.6 as a supported version, drop 2.4 as a supported version.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 19 Feb 2009 10:03:43 +0100
+
+python-defaults (2.5.2-3ubuntu1) jaunty; urgency=low
+
+ * Merge with Debian; remaining changes:
+ - Build the -doc package from this source package.
+ - Omit Debian specific upgrade code.
+ - Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com> Sun, 23 Nov 2008 21:58:03 +0100
+
python-defaults (2.5.2-3) unstable; urgency=low
* python: Provide python-ctypes and python-wsgiref.
@@ -386,6 +584,15 @@
-- Matthias Klose <doko@debian.org> Sat, 26 Jul 2008 02:37:00 +0200
+python-defaults (2.5.2-1ubuntu1) intrepid; urgency=low
+
+ * Merge with Debian; remaining changes:
+ - Build the -doc package from this source package.
+ - Omit Debian specific upgrade code.
+ - Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 23 Jun 2008 13:13:51 +0200
+
python-defaults (2.5.2-1) unstable; urgency=low
* Maintainer upload; asking the Release Team to better coordinate
@@ -406,6 +613,92 @@
-- Adeodato Simó <dato@net.com.org.es> Sun, 13 Apr 2008 11:29:32 +0200
+python-defaults (2.5.2-0ubuntu1) hardy; urgency=low
+
+ * Depend on the 2.5.2 versions of the packages.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 10 Mar 2008 18:03:30 +0000
+
+python-defaults (2.5.1-1ubuntu2) gutsy; urgency=low
+
+ * Temporarily loosen the dependency on python2.5 to allow python2.5
+ to build on powerpc and sparc.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 27 Apr 2007 00:00:32 +0200
+
+python-defaults (2.5.1-1ubuntu1) gutsy; urgency=low
+
+ * Depend on the 2.5.1 versions of the packages.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 26 Apr 2007 11:23:17 +0200
+
+python-defaults (2.5.1~rc1-0ubuntu3) feisty; urgency=low
+
+ * Fix versioned build dependency on python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 13 Apr 2007 06:37:58 +0200
+
+python-defaults (2.5.1~rc1-0ubuntu2) feisty; urgency=low
+
+ * Add a sanity check, that /usr/bin/python points to the default
+ python version. Users tend to modify this symlink, which then
+ breaks stuff in obscure ways. Ubuntu #75557, Debian #418002.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 6 Apr 2007 17:47:24 +0200
+
+python-defaults (2.5.1~rc1-0ubuntu1) feisty; urgency=low
+
+ * Depend on the 2.5.1~rc1 versions of the packages.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 6 Apr 2007 11:13:10 +0000
+
+python-defaults (2.5-0ubuntu6) feisty; urgency=low
+
+ * python-dbg: Add a python-dbg-config binary.
+
+ -- Matthias Klose <doko@ubuntu.com> Sat, 17 Feb 2007 21:39:44 +0100
+
+python-defaults (2.5-0ubuntu5) feisty; urgency=low
+
+ * python-all-dbg: Tighten dependencies on the python2.x-dbg packages.
+ * python-dbg: Provide python-gdbm-dbg, python-tk-dbg,
+ link to README.debug, SpecialBuilds.txt.gz.
+ * python-dev: Add an unversioned python-config binary.
+ * Readd build-dependency on python-docutils.
+ * Set Ubuntu maintainer address.
+ * Update the FAQ.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 16 Feb 2007 18:18:06 +0100
+
+python-defaults (2.5-0ubuntu4) feisty; urgency=low
+
+ * New package python-all-dbg.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 9 Feb 2007 01:16:09 +0100
+
+python-defaults (2.5-0ubuntu3) feisty; urgency=low
+
+ * Temporarily remove build-dependency on python-docutils.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 12 Jan 2007 13:06:50 +0000
+
+python-defaults (2.5-0ubuntu2) feisty; urgency=low
+
+ * Fix icon for desktop file.
+ * Robustify building the faq html pages.
+ * Make the suggestions of various packages versioned.
+ * Recommend depending on "pythonX.X-foo, python-foo" instead of recommending
+ to only depend on "pythonX.X-foo" when a particular version is needed to
+ permit upgrades from real packages to virtual ones. (Loic Minier).
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 12 Jan 2007 11:42:02 +0000
+
+python-defaults (2.5-0ubuntu1) feisty; urgency=low
+
+ * Make python2.5 the default version.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 12 Jan 2007 09:10:52 +0000
+
python-defaults (2.4.4-6) unstable; urgency=low
* python.postinst: Fix cleanup of temporary files. Closes: #424703, #424704.
@@ -453,6 +746,20 @@
-- Matthias Klose <doko@debian.org> Sat, 16 Dec 2006 15:42:21 +0100
+python-defaults (2.4.4-1ubuntu2) feisty; urgency=low
+
+ * python-minimal is essential, not python.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 7 Dec 2006 14:25:20 +0000
+
+python-defaults (2.4.4-1ubuntu1) feisty; urgency=low
+
+ * Merge with Debian unstable.
+ - Backout: Add 2.5 to unsupported-versions.
+ * Build the FAQ again.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 16 Nov 2006 15:21:31 -0800
+
python-defaults (2.4.4-1) unstable; urgency=medium
* Depend on the 2.4.4 versions of the packages.
@@ -462,6 +769,27 @@
-- Matthias Klose <doko@debian.org> Sun, 29 Oct 2006 11:06:39 +0100
+python-defaults (2.4.3-11ubuntu3) edgy; urgency=low
+
+ * Temporarily remove the FAQ and the build-dependency on python-docutils,
+ so that the build dependencies can be installed.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 20 Sep 2006 17:28:47 +0000
+
+python-defaults (2.4.3-11ubuntu2) edgy; urgency=low
+
+ * debian/pyversions:
+ - merged the changes from python-central to support older python
+ version (and not break on upgrades)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 16:42:12 +0200
+
+python-defaults (2.4.3-11ubuntu1) edgy; urgency=low
+
+ * Merge with Debian unstable.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 8 Sep 2006 00:22:21 +0200
+
python-defaults (2.4.3-11) unstable; urgency=low
* Add a conflict to python-central (<< 0.5.5).
@@ -523,6 +851,21 @@
-- Matthias Klose <doko@debian.org> Sat, 5 Aug 2006 17:54:43 +0200
+python-defaults (2.4.3-5ubuntu1) edgy; urgency=low
+
+ * Synchronize with Debian experimental.
+ * Remove python's dependency on python-central. On upgrade of
+ the runtime, call hooks /usr/share/python/runtime.d/*.rtupdate.
+ Addresses: #372658.
+ * pyversions -r: If the XS-Python-Version field cannot be found in
+ debian/control, fall back to debian/pyversions for the version
+ information. Return with an error code, if the intersection of
+ the versions in debian/pyversions and the supported python versions
+ is empty. Fall back to the supported versions if no version
+ information can be found. Based on a patch from Raphael Hertzog.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 5 Jul 2006 05:11:42 +0000
+
python-defaults (2.4.3-5) experimental; urgency=low
* Tighten dependencies between packages built from this source.
@@ -554,6 +897,18 @@
-- Matthias Klose <doko@debian.org> Sun, 11 Jun 2006 23:25:02 +0000
+python-defaults (2.4.3-1ubuntu1) edgy; urgency=low
+
+ * Let the -all packages depend on the default packages (closes: #365219).
+ * Add /usr/share/python/debian_defaults for some default values (i.e.
+ the supported python versions).
+ * Add /etc/python/debian_config for byte-compilation options.
+ * Add a pyversions script to give information about python versions and
+ parse the XS-Python-Version attribute.
+ * Include version 0.4.1.0 of the python policy.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 13 Jun 2006 13:22:43 +0200
+
python-defaults (2.4.3-01) experimental; urgency=low
* Do not build the python-doc package from this source.
@@ -647,6 +1002,12 @@
-- Matthias Klose <doko@debian.org> Fri, 20 Aug 2004 18:24:25 +0200
+python-defaults (2.3.4-3sid) unstable; urgency=low
+
+ * Add build dependency on python-docutils (closes: #266550).
+
+ -- Matthias Klose <doko@debian.org> Wed, 18 Aug 2004 12:30:37 +0200
+
python-defaults (2.3.4-2sid) unstable; urgency=low
* Add pdb and pdb.1 symlinks.
@@ -674,3 +1035,4 @@
* Update to the proposed python-policy: byte-compile using -E.
-- Matthias Klose <doko@debian.org> Wed, 4 Feb 2004 23:16:35 +0100
+
diff -Nru python-defaults-2.6.6/debian/control python-defaults-2.6.6/debian/control
--- python-defaults-2.6.6/debian/control 2010-08-24 13:58:52.000000000 -0500
+++ python-defaults-2.6.6/debian/control 2010-09-15 14:07:38.000000000 -0500
@@ -1,7 +1,8 @@
Source: python-defaults
Section: python
Priority: optional
-Maintainer: Matthias Klose <doko@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>
Build-Depends: debhelper (>= 6.0.7~)
Build-Depends-Indep: libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
@@ -12,7 +13,7 @@
Package: python
Architecture: all
-Priority: standard
+Priority: important
Depends: ${misc:Depends}, python2.6 (>= 2.6.6-1~), python-minimal (= ${binary:Version})
Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}), python-profiler (= ${binary:Version})
Conflicts: python-central (<< 0.5.5)
@@ -29,7 +30,8 @@
Package: python-minimal
Architecture: all
-Priority: standard
+Essential: yes
+Priority: required
Depends: ${misc:Depends}, python2.6-minimal (>= 2.6.6-1~), dpkg (>= 1.13.20)
Recommends: python
Conflicts: python-central (<< 0.5.5)
@@ -110,9 +112,9 @@
Package: python-all
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.5 (>= 2.5.5-6), python2.6 (>= 2.6.5-2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.5-2)
Description: package depending on all supported Python runtime versions
- The package currently depends on python2.5 and python2.6, in the future,
+ The package currently depends on python2.6, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
@@ -121,9 +123,9 @@
Package: python-all-dev
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.5-dev (>= 2.5.5-6), python2.6-dev (>= 2.6.5-2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.6-dev (>= 2.6.5-2)
Description: package depending on all supported Python development packages
- The package currently depends on python2.5-dev and python2.6-dev, in the
+ The package currently depends on python2.6-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
@@ -134,9 +136,9 @@
Architecture: all
Section: debug
Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.5-dbg (>= 2.5.5-6), python2.6-dbg (>= 2.6.5-2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.6-dbg (>= 2.6.5-2)
Description: package depending on all supported Python debugging packages
- The package currently depends on python2.5-dbg and python2.6-dbg, in the
+ The package currently depends on python2.6-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
diff -Nru python-defaults-2.6.6/debian/control.in python-defaults-2.6.6/debian/control.in
--- python-defaults-2.6.6/debian/control.in 2010-08-22 08:23:03.000000000 -0500
+++ python-defaults-2.6.6/debian/control.in 2010-09-15 14:07:38.000000000 -0500
@@ -12,7 +12,7 @@
Package: python
Architecture: all
-Priority: standard
+Priority: important
Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version})
Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}), python-profiler (= ${binary:Version})
Conflicts: python-central (<< 0.5.5)
@@ -29,7 +29,8 @@
Package: python-minimal
Architecture: all
-Priority: standard
+Essential: yes
+Priority: required
Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20)
Recommends: python
Conflicts: python-central (<< 0.5.5)
@@ -110,9 +111,9 @@
Package: python-all
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.5 (>= 2.5.5-6), python2.6 (>= 2.6.5-2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.5-2)
Description: package depending on all supported Python runtime versions
- The package currently depends on python2.5 and python2.6, in the future,
+ The package currently depends on python2.6, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
@@ -121,9 +122,9 @@
Package: python-all-dev
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.5-dev (>= 2.5.5-6), python2.6-dev (>= 2.6.5-2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.6-dev (>= 2.6.5-2)
Description: package depending on all supported Python development packages
- The package currently depends on python2.5-dev and python2.6-dev, in the
+ The package currently depends on python2.6-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
@@ -134,9 +135,9 @@
Architecture: all
Section: debug
Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.5-dbg (>= 2.5.5-6), python2.6-dbg (>= 2.6.5-2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.6-dbg (>= 2.6.5-2)
Description: package depending on all supported Python debugging packages
- The package currently depends on python2.5-dbg and python2.6-dbg, in the
+ The package currently depends on python2.6-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
diff -Nru python-defaults-2.6.6/debian/debian_defaults python-defaults-2.6.6/debian/debian_defaults
--- python-defaults-2.6.6/debian/debian_defaults 2010-05-17 14:59:07.000000000 -0500
+++ python-defaults-2.6.6/debian/debian_defaults 2010-09-15 14:07:38.000000000 -0500
@@ -3,10 +3,10 @@
default-version = python2.6
# all supported python versions
-supported-versions = python2.5, python2.6
+supported-versions = python2.6
# formerly supported python versions
-old-versions = python2.3, python2.4
+old-versions = python2.3, python2.4, python2.5
# unsupported versions, including older versions
-unsupported-versions = python2.3, python2.4
+unsupported-versions = python2.3, python2.4, python2.5
diff -Nru python-defaults-2.6.6/debian/python.postinst.in python-defaults-2.6.6/debian/python.postinst.in
--- python-defaults-2.6.6/debian/python.postinst.in 2010-07-11 10:39:14.000000000 -0500
+++ python-defaults-2.6.6/debian/python.postinst.in 2010-09-15 14:07:38.000000000 -0500
@@ -39,7 +39,7 @@
done
fi
- if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.6.4-1~; then
+ if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.6.1-0ubuntu1; then
oldv=$(echo $2 | sed 's/^\(...\).*/\1/')
if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
echo "running python rtupdate hooks for @PVER@..."
diff -Nru python-defaults-2.6.6/debian/python.preinst.in python-defaults-2.6.6/debian/python.preinst.in
--- python-defaults-2.6.6/debian/python.preinst.in 2010-07-11 10:39:26.000000000 -0500
+++ python-defaults-2.6.6/debian/python.preinst.in 2010-09-15 14:07:38.000000000 -0500
@@ -12,7 +12,7 @@
case "$1" in
upgrade)
- if dpkg --compare-versions $2 lt 2.4; then
+ if dpkg --compare-versions $2 lt 2.6.1-0ubuntu1; then
oldv=$(echo $2 | sed 's/^\(...\).*/\1/')
if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
echo "running python pre-rtupdate hooks for @PVER@..."
diff -Nru python-defaults-2.6.6/debian/pyversions.py python-defaults-2.6.6/debian/pyversions.py
--- python-defaults-2.6.6/debian/pyversions.py 2010-08-22 08:16:53.000000000 -0500
+++ python-defaults-2.6.6/debian/pyversions.py 2010-09-15 14:07:38.000000000 -0500
@@ -138,7 +138,7 @@
if not _supported_versions:
# last resort: python-minimal not installed, apt-cache
# not available, hard code the value, #394084
- _supported_versions = ['python2.5', 'python2.6']
+ _supported_versions = ['python2.6']
if version_only:
return [v[6:] for v in _supported_versions]
else:
diff -Nru python-defaults-2.6.6/debpython/depends.py python-defaults-2.6.6/debpython/depends.py
--- python-defaults-2.6.6/debpython/depends.py 2010-12-12 15:52:08.000000000 -0600
+++ python-defaults-2.6.6/debpython/depends.py 2010-09-12 11:48:18.000000000 -0500
@@ -24,7 +24,7 @@
from debpython.version import SUPPORTED, DEFAULT, debsorted, vrepr, vrange_str
# minimum version required for pycompile/pyclean
-MINPYCDEP = 'python (>= 2.6.6-3+squeeze3~)'
+MINPYCDEP = 'python (>= 2.6.5-11~)'
log = logging.getLogger(__name__)
diff -Nru python-defaults-2.6.6/debpython/tools.py python-defaults-2.6.6/debpython/tools.py
--- python-defaults-2.6.6/debpython/tools.py 2010-09-14 17:07:32.000000000 -0500
+++ python-defaults-2.6.6/debpython/tools.py 2010-09-12 10:05:01.000000000 -0500
@@ -27,7 +27,6 @@
from debpython.version import getver
log = logging.getLogger(__name__)
-EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d(?:-[^.]*)?)?(\.egg-info|\.pth)$')
SHEBANG_RE = re.compile(r'^#!\s*/usr/bin/(?:env\s+)?(python(\d+\.\d+)?(?:-dbg)?).*')
@@ -94,20 +93,6 @@
log.error('cannot open %s', fname)
-def clean_egg_name(name):
- """Remove Python version and platform name from Egg files/dirs.
-
- >>> clean_egg_name('python_pipeline-0.1.3_py3k-py3.1.egg-info')
- 'python_pipeline-0.1.3_py3k.egg-info'
- >>> clean_egg_name('Foo-1.2-py2.7-linux-x86_64.egg-info')
- 'Foo-1.2.egg-info'
- """
- match = EGGnPTH_RE.match(name)
- if match and match.group(2) is not None:
- return ''.join(match.group(1, 3))
- return name
-
-
class memoize(object):
def __init__(self, func):
self.func = func
diff -Nru python-defaults-2.6.6/debpython/version.py python-defaults-2.6.6/debpython/version.py
--- python-defaults-2.6.6/debpython/version.py 2010-08-12 11:44:51.000000000 -0500
+++ python-defaults-2.6.6/debpython/version.py 2010-09-15 14:07:38.000000000 -0500
@@ -23,7 +23,7 @@
from os.path import exists
from types import GeneratorType
-SUPPORTED = [(2, 5), (2, 6)]
+SUPPORTED = [(2, 6)]
DEFAULT = (2, 6)
RANGE_PATTERN = r'(-)?(\d\.\d+)(?:(-)(\d\.\d+)?)?'
RANGE_RE = re.compile(RANGE_PATTERN)
diff -Nru python-defaults-2.6.6/dh_python2 python-defaults-2.6.6/dh_python2
--- python-defaults-2.6.6/dh_python2 2011-01-11 15:16:07.000000000 -0600
+++ python-defaults-2.6.6/dh_python2 2010-09-12 11:41:50.000000000 -0500
@@ -40,7 +40,7 @@
from debpython.pydist import validate as validate_pydist, \
PUBLIC_DIR_RE
from debpython.tools import sitedir, relative_symlink, \
- shebang2pyver, clean_egg_name
+ shebang2pyver
from debpython.option import Option
# initialize script
@@ -104,7 +104,7 @@
dbg_to_check.append("usr/lib/debug/usr/lib/pyshared/python%s" % ver)
dstdir = sitedir(version, package, gdb=True)
- for location in dbg_to_check:
+ for location in to_check:
srcdir = "debian/%s/%s" % (package, location)
if isdir(srcdir):
if not isdir(dstdir):
@@ -227,9 +227,6 @@
common_files = cmpfiles(dir1, dir2, common_files, shallow=False)[0]
for fn in common_files:
- if fn.endswith('.so'):
- # in unlikely case where extensions are exactly the same
- continue
fpath1 = join(dir1, fn)
fpath2 = join(dir2, fn)
fpath3 = join(dstdir, fn)
@@ -309,20 +306,21 @@
if len(root.split('/', 6)) < 6 and (\
root.endswith('/sbin') or root.endswith('/bin') or\
root.endswith('/usr/games')):
- # /(s)bin or /usr/(s)bin or /usr/games
+ # /bin or /usr/bin or /usr/games
bin_dir = root
# handle some EGG related data (.egg-info dirs)
for name in dirs:
- if name.endswith('.egg-info'):
+ match = EGGnPTH_RE.match(name)
+ if match:
if dbg_package:
rmtree(join(root, name))
dirs.pop(dirs.index(name))
continue
- clean_name = clean_egg_name(name)
- if clean_name != name:
- log.info('renaming %s to %s', name, clean_name)
- os.rename(join(root, name), join(root, clean_name))
+ if match.group(2) is not None:
+ new_name = ''.join(match.group(1, 3, 4))
+ log.debug('renaming %s to %s', name, new_name)
+ os.rename(join(root, name), join(root, new_name))
if root.endswith('.egg-info') and 'requires.txt' in file_names:
r['requires.txt'].add(join(root, 'requires.txt'))
continue
@@ -350,7 +348,7 @@
if fext == 'so':
(r if public_dir else
r['private_dirs'].setdefault(private_dir, {}))\
- .setdefault('public_ext', set()).add(version)
+ ['public_ext'].add(version)
continue
elif fext == 'py':
(r if public_dir else
@@ -359,11 +357,12 @@
continue
# .egg-info files
- if fn.endswith('.egg-info'):
- clean_name = clean_egg_name(fn)
- if clean_name != fn:
- log.info('renaming %s to %s', fn, clean_name)
- os.rename(join(root, fn), join(root, clean_name))
+ match = EGGnPTH_RE.match(fn)
+ if match:
+ if match.group(2) is not None:
+ new_name = ''.join(match.group(1, 3, 4))
+ log.debug('renaming %s to %s', fn, new_name)
+ os.rename(join(root, fn), join(root, new_name))
continue
# search for scripts in bin dirs
if bin_dir:
@@ -520,7 +519,7 @@
if ext_for is None: # no extension
if options.vrange:
args += " -V %s" % vrange_str(options.vrange)
- elif False in ext_for: # extension's version not detected
+ elif ext_for is False: # extension's version not detected
if options.vrange and '-' not in vrange_str(options.vrange):
ver = vrange_str(options.vrange)
else: # try shebang or default Python version
diff -Nru python-defaults-2.6.6/pycompile python-defaults-2.6.6/pycompile
--- python-defaults-2.6.6/pycompile 2011-02-18 15:50:07.000000000 -0600
+++ python-defaults-2.6.6/pycompile 2010-09-11 15:44:17.000000000 -0500
@@ -1,9 +1,8 @@
#! /usr/bin/python
-# -*- coding: utf-8 -*-
+# -*- coding: UTF-8 -*-
# vim: et ts=4 sw=4
# Copyright © 2010 Piotr Ożarowski <piotr@debian.org>
-# Copyright © 2010 Canonical Ltd
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -26,11 +25,10 @@
from __future__ import with_statement
import logging
import optparse
-import os
import sys
from os import environ, listdir, walk
-from os.path import abspath, exists, isdir, isfile, islink, join
-from subprocess import PIPE, STDOUT, Popen
+from os.path import abspath, exists, isdir, isfile, join
+from subprocess import PIPE, Popen
sys.path.insert(1, '/usr/share/python/')
from debpython.version import SUPPORTED, debsorted, vrepr, \
get_requested_versions, parse_vrange, getver
@@ -166,11 +164,10 @@
### COMPILE ####################################################
-def py_compile(version, optimize, workers):
+def py_compile(version, workers):
if not isinstance(version, basestring):
version = vrepr(version)
- cmd = "/usr/bin/python%s%s -m py_compile -" \
- % (version, '' if (__debug__ or not optimize) else ' -O')
+ cmd = "python%s -m py_compile -" % version
process = Popen(cmd, bufsize=1, shell=True,
stdin=PIPE, close_fds=True)
workers[version] = process # keep the reference for .communicate()
@@ -180,40 +177,21 @@
stdin.write(filename + '\n')
-def compile(files, versions, force, optimize, e_patterns=None):
+def compile(files, versions, e_patterns=None):
global STDINS, WORKERS
# start Python interpreters that will handle byte compilation
for version in versions:
if version not in STDINS:
- coroutine = py_compile(version, optimize, WORKERS)
+ coroutine = py_compile(version, WORKERS)
coroutine.next()
STDINS[version] = coroutine
# byte compile files
for fn, versions_to_compile in filter_files(files, e_patterns, versions):
- if not exists(fn):
- # pycentral's cleanup-pkgprepare-updates hook will clean it later
- if islink(fn):
- log.warn('dangling symlink skipped: %s (%s)', fn,
- os.readlink(fn))
+ if exists("%sc" % fn):
continue
- cfn = fn + 'c' if (__debug__ or not optimize) else 'o'
- if exists(cfn) and not force:
- ftime = os.stat(fn).st_mtime
- try:
- ctime = os.stat(cfn).st_mtime
- except os.error:
- ctime = 0
- if (ctime > ftime):
- continue
for version in versions_to_compile:
- try:
- pipe = STDINS[version]
- except KeyError:
- # `pycompile /usr/lib/` invoked, add missing worker
- pipe = py_compile(version, optimize, WORKERS)
- pipe.next()
- STDINS[version] = pipe
+ pipe = STDINS[version]
pipe.send(fn)
@@ -227,10 +205,6 @@
help='turn verbose mode on')
parser.add_option('-q', '--quiet', action='store_false', dest='verbose',
default=False, help='be quiet')
- parser.add_option('-f', '--force', action='store_true', dest='force',
- default=False, help='force rebuild even if timestamps are up-to-date')
- parser.add_option('-O', action='store_true', dest='optimize',
- default=False, help="byte-compile to .pyo files")
parser.add_option('-p', '--package',
help='specify Debian package name whose files should be bytecompiled')
parser.add_option('-V', type='version_range', dest='vrange',
@@ -261,13 +235,7 @@
'only, please use /usr/share/python/bcep to specify '
'public modules to skip')
- if options.vrange and options.vrange[0] == options.vrange[1] and\
- options.vrange != (None, None) and\
- exists("/usr/bin/python%d.%d" % options.vrange[0]):
- # specific version requested, use it even if it's not in SUPPORTED
- versions = set(options.vrange[:1])
- else:
- versions = get_requested_versions(options.vrange, available=True)
+ versions = get_requested_versions(options.vrange, available=True)
if not versions:
log.error('Requested versions are not installed')
exit(3)
@@ -287,34 +255,27 @@
log.debug('byte compiling %s using Python %s',
item, compile_versions)
files = get_private_files(pkg_files, item)
- compile(files, compile_versions, options.force,
- options.optimize, e_patterns)
+ compile(files, compile_versions, e_patterns)
elif options.package: # package's public modules
# no need to limit versions here, it's either pyr mode or version is
# hardcoded in path / via -V option
e_patterns = get_exclude_patterns()
files = get_package_files(options.package)
files = get_public_files(files, versions)
- compile(files, versions,
- options.force, options.optimize, e_patterns)
+ compile(files, versions, e_patterns)
elif args: # other directories/files (public ones mostly)
versions = debsorted(versions)[:1]
for item in args:
e_patterns = get_exclude_patterns(item, options.regexpr, versions)
files = get_directory_files(item)
- compile(files, versions,
- options.force, options.optimize, e_patterns)
+ compile(files, versions, e_patterns)
else:
parser.print_usage()
exit(1)
# wait for all processes to finish
- rv = 0
for process in WORKERS.itervalues():
process.communicate()
- if process.returncode not in (None, 0):
- rv = process.returncode
- sys.exit(rv)
if __name__ == '__main__':
main()
diff -Nru python-defaults-2.6.6/pycompile.1 python-defaults-2.6.6/pycompile.1
--- python-defaults-2.6.6/pycompile.1 2010-12-12 15:28:24.000000000 -0600
+++ python-defaults-2.6.6/pycompile.1 2010-08-07 19:59:54.000000000 -0500
@@ -1,49 +1,39 @@
.TH PYCOMPILE "1" "August 2010" "pycompile 0.9" "User Commands"
.SH NAME
-pycompile \- byte compile Python source files
+pycompile \- byte compiles Python source files
.SH SYNOPSIS
.B pycompile
[\fI-V \fR[\fIX.Y\fR][\fI-\fR][\fIA.B\fR]] \fIDIR_OR_FILE \fR[\fI-X REGEXPR\fR]
-.P
-.B pycompile
-\fB\-p\fR PACKAGE
.SH DESCRIPTION
-Wrapper around
-.B py_compile
-to byte-compile python files.
+.IP
+pycompile \fB\-p\fR PACKAGE
.SH OPTIONS
.TP
\fB\-\-version\fR
-Show program's version number and exit.
+show program's version number and exit
.TP
\fB\-h\fR, \fB\-\-help\fR
-Show this help message and exit
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-Force rebuild of byte-code files even if timestamps are up-to-date.
+show this help message and exit
.TP
-\fB\-O\fR
-Byte-compile to .pyo files.
+\fB\-v\fR, \fB\-\-verbose\fR
+turn verbose mode on
.TP
\fB\-q\fR, \fB\-\-quiet\fR
-Be quiet.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Turn verbose mode on.
+be quiet
.TP
\fB\-p\fR PACKAGE, \fB\-\-package\fR=\fIPACKAGE\fR
-Specify Debian package name whose files should be
-bytecompiled.
+specify Debian package name whose files should be
+bytecompiled
.TP
\fB\-V\fR VRANGE
-Force private modules to be bytecompiled with Python
+force private modules to be bytecompiled with Python
version from given range, regardless of the default
Python version in the system. If there are no other
options, bytecompile all public modules for installed
Python versions that match given range. VERSION_RANGE
examples: '2.5' (version 2.5 only), '2.5\-' (version
2.5 or newer), '2.5\-2.7' (version 2.5 or 2.6), '\-3.0'
-(all supported 2.X versions).
+(all supported 2.X versions)
.TP
\fB\-X\fR REGEXPR, \fB\-\-exclude\fR=\fIREGEXPR\fR
exclude items that match given REGEXPR. You may use
diff -Nru python-defaults-2.6.6/runtime.d/public_modules.rtinstall python-defaults-2.6.6/runtime.d/public_modules.rtinstall
--- python-defaults-2.6.6/runtime.d/public_modules.rtinstall 2010-12-12 15:28:24.000000000 -0600
+++ python-defaults-2.6.6/runtime.d/public_modules.rtinstall 2010-07-11 10:38:37.000000000 -0500
@@ -2,15 +2,8 @@
set -e
VERSION=${2#python}
-case "$VERSION" in
- 2.[45])
- sitedir=/usr/lib/python$VERSION/site-packages;;
- *)
- sitedir=/usr/lib/python$VERSION/dist-packages
-esac
-
if which python >/dev/null 2>&1 && which pycompile >/dev/null 2>&1; then
- pycompile -V $VERSION $sitedir
+ pycompile -V $VERSION /usr/lib/python$VERSION/
else
echo >&2 "python or pycompile not found in $(basename $0) hook."
exit 1
diff -Nru python-defaults-2.6.6/runtime.d/public_modules.rtremove python-defaults-2.6.6/runtime.d/public_modules.rtremove
--- python-defaults-2.6.6/runtime.d/public_modules.rtremove 2010-12-12 15:28:24.000000000 -0600
+++ python-defaults-2.6.6/runtime.d/public_modules.rtremove 2010-07-11 10:38:49.000000000 -0500
@@ -2,15 +2,8 @@
set -e
VERSION=${2#python}
-case "$VERSION" in
- 2.[45])
- sitedir=/usr/lib/python$VERSION/site-packages;;
- *)
- sitedir=/usr/lib/python$VERSION/dist-packages
-esac
-
if which python >/dev/null 2>&1 && which pyclean >/dev/null 2>&1; then
- pyclean $sitedir
+ pyclean /usr/lib/python$VERSION/
else
- find $sitedir -name '*.py[co]' -delete
+ find /usr/lib/python$VERSION/ -name '*.py[co]' -delete
fi