Merge lp:~mitya57/ubuntu/raring/python-defaults/resync into lp:ubuntu/raring/python-defaults

[Dmitry Shachnev]

python-defaults (2.7.3-3ubuntu1) raring-proposed; urgency=low

  * Resynchronize with Debian unstable, remaining Ubuntu changes:
    - debian/control.in: Build depend on lsb-release to set correct
      Maintainer fields when building on Ubuntu.
    - debian/rules: Ignore version check, as our default versions differ
      from Debian's.
    - debian/control.in, debian/debian_defaults: Drop python2.6 support.
    - debian/rules: Provide Python pkgconfig defaults.
    - debian/rules: Re-add the python2 and python2-config symlinks,
      formerly present in the python2.7 packages (see PEP 394).
    - debian/control.in, debian/rules: Build dependency packages as
      architecture dependent packages (for cross-building python
      extension packages, see LP: #934593).
  * debian/rules: in binary-arch section, use -a argument for dh_* commands.

 -- Dmitry Shachnev <email address hidden> Wed, 28 Nov 2012 14:50:19 +0400

The diff against the previous Ubuntu version is below, use `bzr diff -r 56` to see the diff against (a bit outdated) Debian.

[Barry Warsaw (barry)]

I'm not able to do a full review at the moment, but one thing jumped out at me.

On Oct 24, 2012, at 02:28 PM, Dmitry Shachnev wrote:

>The proposal to merge lp:~mitya57/ubuntu/raring/python-defaults/resync into lp:ubuntu/python-defaults has been updated.
>
>Description changed to:
>
>python-defaults (2.7.3-3ubuntu1) raring-proposed; urgency=low
>
>  * Resynchronize with Debian unstable, remaining Ubuntu changes:
>    - Build depend on lsb-release.
>    - Ignore vesion check.

s/vesion/version/

>    - Drop python2.6 support.
>    - Provide Python pkgconfig defaults.
>    - Re-add the python2 and python2-config symlinks, formerly present
>      in the python2.7 packages.
>    - Build dependency packages as architecture dependent packages again.
>    - Move idle.xpm into the idle package.
>    - Remove Essential flag from python-minimal.
>  * debian/rules: in binary-arch section, use -a argument for dh_* commands.
>
> -- Dmitry Shachnev <email address hidden> Wed, 24 Oct 2012 18:14:31 +0400

[lp:~mitya57/ubuntu/raring/python-defaults/resync]

64. By Dmitry Shachnev on 2012-10-24

Fix a typo, thanks Barry!

[Dmitry Shachnev (mitya57)]

> s/vesion/version

Fixed, thanks!

[lp:~mitya57/ubuntu/raring/python-defaults/resync]

65. By Dmitry Shachnev on 2012-10-28

Don't build idle twice

[Dmitry Shachnev (mitya57)]

Will you review it or should I subscribe "regular" sponsors here?

[Scott Kitterman (kitterman)]

I didn't look at the diff yet, but from the changelog entry, I notice "Remove Essential flag from python-minimal." is backwards. It should be adding it for Ubuntu.

[Dmitry Shachnev (mitya57)]

Really? The essential flag was removed in Ubuntu (http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/python-defaults/raring/revision/90) because the package becomes not really essential here with the python3 switch (I hope we'll even ship raring without it).

We'll maybe want to add that flag to python3-defaults, though.

[Scott Kitterman (kitterman)]

You can't remove essential until it's been verified nothing in the archive assumes it's present. Also, it's not essential in Debian.

[Dmitry Shachnev (mitya57)]

Again — that was not me who removed it, it was Colin Watson. I've added it back now.

[lp:~mitya57/ubuntu/raring/python-defaults/resync]

66. By Dmitry Shachnev on 2012-11-04

Re-add Essential flag to python-mimimal as recommended by Scott Kitterman.

67. By Dmitry Shachnev on 2012-11-04

Fix the changelog

[Colin Watson (cjwatson)]

I removed Essential in 12.10. Please don't put it back. It will impede our ability to ever get rid of Python 2. It would be particularly daft to put it back now that we've managed to get python-minimal down to Priority: optional!

python-minimal was never Essential in Debian; it was only ever Essential in Ubuntu for political reasons, and those reasons no longer make sense now that we're trying to move to Python 3. The way Python policy is laid out means that the odds of anything sensible trying to use python without a dependency on it are very slim. The only remotely plausible things that might be affected were in the base system, and I grepped for that. The only bug I found was bug 1058029, which is in a utility script that I don't consider to be at all important for this purpose.

[Colin Watson (cjwatson)]

It is of course wrong to mention the removal of this flag in the changelog in any event, because it is no longer part of the delta with Debian.

[lp:~mitya57/ubuntu/raring/python-defaults/resync]

68. By Dmitry Shachnev on 2012-11-05

Revert r66.

[Scott Kitterman (kitterman)]

I talked to Colin and dropping it's fine, but as he said, don't mention it in the changelog.

[Barry Warsaw (barry)]

One thing that would be very helpful would be to organize the remaining Ubuntu changes by file, adding these descriptions to the changelog entry. E.g. in d/changelog:

 * Resynchronize ...
   - debian/control: Build depend on lsb-release

and so on. If you need extra levels, do it like this:

 * Resynchronize ...
   - debian/control
     + Build depend on lsb-release
     + frobnicate the foobar

This would make it much easier to trace the differences we're keeping. It will also make it easier to reduce those deltas in the future. (I know that previous changes don't have these, and you're just copying them from earlier changelog entries, but I think this is a good habit to get into, so let's start now :).

I also wish there were more rationales in the changelog entries. For example, *why* is "make check_version" status being ignored? Without reasons, these just become long lived onions in the varnish[1].

Other than that, I think this looks okay. I built the package and did some limited testing in a chroot and it looks okay. Please let me know if you want me to sponsor this upload into Ubuntu once you've fixed the few things mentioned above.

[1] http://c2.com/cgi/wiki?OnionInTheVarnish

review: Needs Fixing

[lp:~mitya57/ubuntu/raring/python-defaults/resync]

69. By Dmitry Shachnev on 2012-11-28

Make tests/t6/{foo,bar}.py executable, to reduce delta with Debian

70. By Dmitry Shachnev on 2012-11-28

Update debian/changelog as suggested by Barry

[Dmitry Shachnev (mitya57)]

Added some comments to the changelog. Please sponsor it if you want to make seb128 happy :)

[Barry Warsaw (barry)]

Thanks for making the changes! I'll sponsor it now.

review: Approve

[Barry Warsaw (barry)]

Thanks for the awesome contribution!

review: Approve

[Barry Warsaw (barry)]

So, the build failed on some arches because rst2man was missing.

https://launchpad.net/ubuntu/raring/+source/python-defaults/+builds

Moving python-docutils and debiandoc-sgml to Build-Depends from Build-Depends-Indep in d/control.in fixes the problem. I'll upload a -3ubuntu2 to fix this.

[Scott Kitterman (kitterman)]

On Wednesday, November 28, 2012 10:04:24 PM you wrote:
> So, the build failed on some arches because rst2man was missing.
>
> https://launchpad.net/ubuntu/raring/+source/python-defaults/+builds
>
> Moving python-docutils and debiandoc-sgml to Build-Depends from
> Build-Depends-Indep in d/control.in fixes the problem. I'll upload a
> -3ubuntu2 to fix this.

A better solution would be to only build the arch any parts of the package on
!i386 archs.

Scott K

=== modified file 'Makefile'
--- Makefile	2011-10-13 22:39:31 +0000
+++ Makefile	2012-11-28 12:53:22 +0000
@@ -30,13 +30,16 @@
 %.1: %.rst
 	rst2man $< > $@
 
+%.html: %.rst
+	rst2html $< > $@
+
 manpages: $(MANPAGES)
 
 dist_fallback:
 	make -C pydist $@
 
 check_versions:
-	@set -ex;\
+	@set -e;\
 	DEFAULT=`sed -rn 's,^DEFAULT = \(([0-9]+)\, ([0-9]+)\),\1.\2,p' debpython/version.py`;\
 	SUPPORTED=`sed -rn 's,^SUPPORTED = \[\(([0-9]+)\, ([0-9]+)\)\, \(([0-9]+)\, ([0-9]+)\)\],\1.\2 \3.\4,p' debpython/version.py`;\
 	DEB_DEFAULT=`sed -rn 's,^default-version = python([0-9.]*),\1,p' debian/debian_defaults`;\

=== modified file 'README.derivatives'
--- README.derivatives	2010-09-12 18:41:04 +0000
+++ README.derivatives	2012-11-28 12:53:22 +0000
@@ -6,7 +6,7 @@
   python-all-dbg's Depends line (add or remove pythonX.Y packages)
 * Open debian/pyversions.py file and edit `_supported_versions` list
   around line 141
-* Open debpython/versions.py file and edit `SUPPORTED` list around
+* Open debpython/version.py file and edit `SUPPORTED` list around
   line 26
 
 
@@ -18,7 +18,7 @@
   (default + 1 version) and `PVER` (default version with "python" prefix)
 * Open debian/pyversions.py file and edit `debian_default` variable around
   line 171
-* Open debpython/versions.py file and edit `DEFAULT` variable around line 27
+* Open debpython/version.py file and edit `DEFAULT` variable around line 27
 
 
 How to bump minimum required Python version by dh_python2?

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-10 15:45:02 +0000
+++ debian/changelog	2012-11-28 12:53:22 +0000
@@ -1,3 +1,84 @@
+python-defaults (2.7.3-3ubuntu1) raring-proposed; urgency=low
+
+  * Resynchronize with Debian unstable, remaining Ubuntu changes:
+    - debian/control.in: Build depend on lsb-release to set correct
+      Maintainer fields when building on Ubuntu.
+    - debian/rules: Ignore version check, as our default versions differ
+      from Debian's.
+    - debian/control.in, debian/debian_defaults: Drop python2.6 support.
+    - debian/rules: Provide Python pkgconfig defaults.
+    - debian/rules: Re-add the python2 and python2-config symlinks,
+      formerly present in the python2.7 packages (see PEP 394).
+    - debian/control.in, debian/rules: Build dependency packages as
+      architecture dependent packages (for cross-building python
+      extension packages, see LP: #934593).
+  * debian/rules: in binary-arch section, use -a argument for dh_* commands.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 28 Nov 2012 14:50:19 +0400
+
+python-defaults (2.7.3-3) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * dh_python2:
+    - no longer sensitive to trailing slash in private dir names
+      (closes: #686358)
+    - ignore /usr/bin/python3 shebangs in all packages, not just in
+      python3-* ones
+    - generates correct "python (<< 2.X)" dependencies for packages with
+      private Python extensions (typo fixed)
+  * pyversions.py: fix parsing DEBPYTHON_SUPPORTED env. variable
+    (versions should be separated using comma, as in debian_defaults
+    config file)
+
+  [ Dmitry Shachnev ]
+  * debian/python.{pre,post}rm.in: Handle purge command the same way as
+    remove (thanks to Mitsuya Shibata for the bug report)
+
+ -- Piotr Ożarowski <[e-mail]>  Sun, 21 Oct 2012 22:40:55 +0200
+
+python-defaults (2.7.3-2) unstable; urgency=low
+
+  * dh_python2: ignore empty files while trying to normalize shebangs
+    (Closes: #680793)
+  * Fix lack of python-imaging in pydist/dist_fallback
+    - Add python-imaging override to pydist/generate_fallback_list.py
+    - pydist/dist_fallback: Regenerate to add python-imaging (which wasn't
+      recognized before due to .pth file) along with a few automatic
+      adjustments 
+
+ -- Piotr Ożarowski <[e-mail]>  Thu, 26 Jul 2012 23:03:32 +0200
+
+python-defaults (2.7.3-1) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * dh_python2:
+    - remove even more \.so.* dangling symlinks, thanks to Stefano
+      Rivera for providing a test case
+    - rewrite shebangs by default (disable via --no-shebang-rewrite),
+      examples:
+       + "/usr/bin/env python*" → "/usr/bin/python*"
+       + "/usr/local/bin/python foo" → "/usr/bin/python foo"
+       + "/usr/bin/python2" → "/usr/bin/python"
+    - new --shebang option to replace all shebangs in bin dirs
+      (example: --shebang /usr/bin/python2.6)
+    - no longer generates python2.X | python2.Y depenendies for public modules
+      (Closes: 625740)
+    - translate Python version numbers into Debian ones for those
+      require.txt items that have a pydist file with (uscan like) rules
+      or PEP386 flag (Closes: #653740)
+  * Improve dh_python2 manpage a bit, add information about cleaning debug
+    packages (Closes: #653741)
+  * pyversions, dh_python2, pycompile: allow to override system's list of
+    supported Python versions via DEBPYTHON_SUPPORTED and default Python
+    version via DEBPYTHON_DEFAULT env. variables
+  * Debhelper's python2 sequence now inserts dh_python2 before dh_installinit
+    (closes: 670418)
+
+  [ Scott Kitterman ]
+  * Bump upstream version to match current unstable/wheezy python2.7 version
+
+ -- Piotr Ożarowski <[e-mail]>  Sat, 30 Jun 2012 20:23:59 +0200
+
 python-defaults (2.7.3-0ubuntu7) quantal; urgency=low
 
   * Avoid TypeError in dh_python when maximum version is specified.
@@ -49,6 +130,49 @@
 
  -- Matthias Klose <[e-mail]>  Thu, 12 Apr 2012 23:54:23 +0200
 
+python-defaults (2.7.3~rc2-1) unstable; urgency=low
+
+  [ Scott Kitterman ]
+  * Bump minimum debhelper version to 8 so all tests will run
+    - dh_python2 tests 1 - 5 require dh 7 and test 6 needs dh 8
+  * Move idle.xpm symlink from python to idle and add Breaks/Replaces
+  * Move /usr/bin/pyversions from python to python-minimal since that's where
+    the actual script it's a symlink to lives, add Breaks/Replaces
+  * Bump standards version to 3.9.3 without further change
+  * Correct Python package names with hyphens in them being ignored
+    (Closes: #657665)
+  * Drop -n from /usr/bin/idle invocations in debian/idle.desktop and
+    debian/idle.menu (Closes: #482156)
+  * Update Python policy
+    - Describe addition of /usr/bin/python2 due to upstream changes
+    - Remove redundant text on Python provides and clarify when they should be
+      used
+    - Update description of functionality related to X-Python-Version for
+      Wheezy
+    - Update X/XS-Python-Versions to also include X-Python-Version examples
+    - Add appropriage Breaks/Replaces
+  * Bump upstream version to match current unstable/wheezy python2.7 version
+
+  [ Piotr Ożarowski ]
+  * dh_python2, pyversions: make comparison of X(S)-Python-Version field names
+    case-insensitive (Closes: #676224)
+
+ -- Scott Kitterman <[e-mail]>  Tue, 05 Jun 2012 22:43:11 -0400
+
+python-defaults (2.7.2-10) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * dh_python2: For argparse eggs, generate dependencies of the form
+    "python (>= 2.7) | python-argparse". Closes: #653644, #657119.
+  * Regenerate pydist/dist_fallback.
+
+  [ Piotr Ożarowski ]
+  * pycompile: fix -O option
+  * dh_python2: do not try to add python2.X dependency if private dir works
+    with all Python versions
+
+ -- Matthias Klose <[e-mail]>  Tue, 24 Jan 2012 11:49:24 +0100
+
 python-defaults (2.7.2-9ubuntu6) precise; urgency=low
 
   * Revert to 2.7.2-9ubuntu2 as the arch:all -> arch:any change needs to be
@@ -1642,4 +1766,3 @@
   * Update to the proposed python-policy: byte-compile using -E.
 
  -- Matthias Klose <[e-mail]>  Wed,  4 Feb 2004 23:16:35 +0100
-

=== modified file 'debian/control'
--- debian/control	2012-05-23 10:50:46 +0000
+++ debian/control	2012-11-28 12:53:22 +0000
@@ -4,7 +4,8 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
 Uploaders: Scott Kitterman <[e-mail]>, Piotr Ożarowski <[e-mail]>
-Build-Depends: debhelper (>= 6.0.7~), lsb-release, libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
+Build-Depends: debhelper (>= 8~)
+Build-Depends-Indep: lsb-release, libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
 Standards-Version: 3.9.3
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
@@ -12,8 +13,8 @@
 
 Package: python
 Architecture: any
-Priority: important
-Depends: ${misc:Depends}, python2.7 (>= 2.7.3), python-minimal (= ${binary:Version})
+Priority: standard
+Depends: ${misc:Depends}, python2.7 (>= 2.7.3-1~), python-minimal (= ${binary:Version})
 Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
 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)
@@ -29,12 +30,12 @@
 
 Package: python-minimal
 Architecture: any
-Priority: required
-Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.3), dpkg (>= 1.13.20)
+Priority: standard
+Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.3-1~), 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), python2.7 (<< 2.7.3)
+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)
  This package contains the interpreter and some essential modules.  It's used
  in the boot process for some basic tasks.
@@ -43,7 +44,7 @@
 
 Package: python-examples
 Architecture: all
-Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.3)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-examples (>= 2.7.3-1~)
 Description: examples for the Python language (default version)
  Examples, Demos and Tools for Python. These are files included in
  the upstream Python distribution.
@@ -53,7 +54,7 @@
 
 Package: python-dev
 Architecture: any
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dev (>= 2.7.3)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dev (>= 2.7.3-1~)
 Replaces: python2.7 (<< 2.7.3)
 Description: header files and a static library for Python (default)
  Header files, a static library and development tools for building
@@ -65,9 +66,10 @@
 
 Package: idle
 Architecture: all
-Depends: ${misc:Depends}, python (>= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.7
-Replaces: python (<< 2.7.3-0ubuntu2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.7
 Enhances: python
+Replaces: python (<< 2.7.3-1~)
+Breaks: python (<< 2.7.3-1~)
 Description: IDE for Python using Tkinter (default version)
  IDLE is an Integrated Development Environment for Python.
  IDLE is written using Tkinter and therefore quite platform-independent.
@@ -78,7 +80,7 @@
 Package: python-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, python2.7-doc (>= 2.7.3)
+Depends: ${misc:Depends}, python2.7-doc (>= 2.7.3-1~)
 Suggests: python-examples, python (= ${binary:Version})
 Breaks: python (<< 2.3.5)
 Replaces: python (<< 2.3.5)
@@ -104,7 +106,7 @@
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dbg (>= 2.7.3)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-dbg (>= 2.7.3-1~)
 Provides: python-gdbm-dbg, python-tk-dbg
 Description: debug build of the Python Interpreter (version 2.7)
  Python interpreter configured with --pydebug. Dynamically loaded modules are

=== modified file 'debian/control.in'
--- debian/control.in	2012-05-23 10:50:46 +0000
+++ debian/control.in	2012-11-28 12:53:22 +0000
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Matthias Klose <[e-mail]>
 Uploaders: Scott Kitterman <[e-mail]>, Piotr Ożarowski <[e-mail]>
-Build-Depends: debhelper (>= 6.0.7~), lsb-release, libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
+Build-Depends: debhelper (>= 8~)
+Build-Depends-Indep: lsb-release, libhtml-tree-perl, debiandoc-sgml, python-docutils (>= 0.4-3)
 Standards-Version: 3.9.3
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
@@ -11,7 +12,7 @@
 
 Package: python
 Architecture: any
-Priority: important
+Priority: standard
 Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version})
 Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
 Conflicts: python-central (<< 0.5.5)
@@ -28,12 +29,12 @@
 
 Package: python-minimal
 Architecture: any
-Priority: required
+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), python2.7 (<< 2.7.3)
+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)
  This package contains the interpreter and some essential modules.  It's used
  in the boot process for some basic tasks.
@@ -42,7 +43,7 @@
 
 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.
@@ -64,9 +65,10 @@
 
 Package: idle
 Architecture: all
-Depends: ${misc:Depends}, python (>= ${binary:Version}), python-tk (>= 2.4.3-3), idle-@PVER@
-Replaces: python (<< 2.7.3-0ubuntu2)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-tk (>= 2.4.3-3), idle-@PVER@
 Enhances: python
+Replaces: python (<< 2.7.3-1~)
+Breaks: python (<< 2.7.3-1~)
 Description: IDE for Python using Tkinter (default version)
  IDLE is an Integrated Development Environment for Python.
  IDLE is written using Tkinter and therefore quite platform-independent.

=== modified file 'debian/idle.desktop'
--- debian/idle.desktop	2010-06-26 15:38:28 +0000
+++ debian/idle.desktop	2012-11-28 12:53:22 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=IDLE
 Comment=Integrated Development Environment for Python
-Exec=/usr/bin/idle -n
+Exec=/usr/bin/idle
 Icon=/usr/share/pixmaps/idle.xpm
 Terminal=false
 MultipleArgs=false

=== modified file 'debian/idle.menu'
--- debian/idle.menu	2009-12-14 06:03:32 +0000
+++ debian/idle.menu	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 ?package(idle):needs="X11" section="Applications/Programming"\
 	title="IDLE (Python IDE)"\
 	icon="/usr/share/pixmaps/idle.xpm"\
-	command="/usr/bin/idle -n" \
+	command="/usr/bin/idle" \
 	hints="Environments"

=== modified file 'debian/python-policy.sgml'
--- debian/python-policy.sgml	2011-10-06 00:22:16 +0000
+++ debian/python-policy.sgml	2012-11-28 12:53:22 +0000
@@ -32,7 +32,7 @@
         <name>Scott Kitterman</name>
 	<email>[e-mail]</email>
       </author>
-      <version>version 0.9.4.1</version>
+      <version>version 0.9.4.2</version>
 
       <abstract>
 	This document describes the packaging of Python within the
@@ -42,8 +42,8 @@
 
       <copyright>
 	<copyrightsummary>
-	  Copyright &copy; 1999, 2001, 2003, 2006, 2009, 2010, 2011 Software in the
-	  Public Interest
+	  Copyright &copy; 1999, 2001, 2003, 2006, 2009, 2010, 2011, 2012
+	  Software in the Public Interest
 	</copyrightsummary>
 	<p>
 	  This manual is free software; you can redistribute it and/or
@@ -106,8 +106,8 @@
 	  are needed by other packages, or as long as it seems
 	  reasonable to provide them.  (Note: For the scope of this
 	  document, Python versions are synonymous to feature
-	  releases, i.e. Python 2.5 and 2.5.1 are sub-minor versions of
-	  the same Python version 2.5, but Python 2.4 and 2.5 are
+	  releases, i.e. Python 2.7 and 2.7.1 are sub-minor versions of
+	  the same Python version 2.7, but Python 2.6 and 2.7 are
 	  indeed different versions.)
 	</p>
 	<p>
@@ -184,11 +184,11 @@
 	  than <var>X</var>.<var>Y+1</var>.
 	</p>
 	<p>
-	  There is no symlink for <file>/usr/bin/python2</file>.  This is
-	  consistent with current upstream practice. This is being discussed
-	  in <url id="http://www.python.org/dev/peps/pep-0394/"
-          name="PEP-0394">. If this PEP is approved, then the policy for
-	  Debian should be reconsidered.
+	  Because upstream has started providing it, there will be a symlink
+	  for <file>/usr/bin/python2</file> for Wheezy and later releases.  See
+	  <url id="http://www.python.org/dev/peps/pep-0394/" name="PEP-0394">
+	  for details. Packages must be careful to depend on a sufficient
+	  version of <package>python</package> if they make use of this symlink.
 	</p>
       </sect>
 
@@ -330,7 +330,7 @@
 	  <item>
 	    <p>
 	      /usr/share/python/runtime.d/*.rtremove: these are called when
-	      a runtime is installed or stops being supported.  The first
+	      a runtime is removed or stops being supported.  The first
 	      argument is "rtremove", and the second argument is the
 	      affected runtime (for example
 	      python<var>X</var>.<var>Y</var>).
@@ -432,14 +432,14 @@
 
 	  Such a package should support the current Debian Python version,
 	  and more if possible (there are several tools to help implement
-	  this, see <ref id="packaging_tools">). For example, if Python 2.3,
-	  2.4, and 2.5 are supported, the Python statement
+	  this, see <ref id="packaging_tools">). For example, if Python 2.5,
+	  2.6, and 2.7 are supported, the Python statement
 	  <example>
 import foo
 	  </example>
 	  should import the module when the user is running any
-	  of <prgn>/usr/bin/python2.3</prgn>, <prgn>/usr/bin/python2.4</prgn>,
-	  and <prgn>/usr/bin/python2.5</prgn>. This requirement also
+	  of <prgn>/usr/bin/python2.5</prgn>, <prgn>/usr/bin/python2.6</prgn>,
+	  and <prgn>/usr/bin/python2.7</prgn>. This requirement also
 	  applies to extension modules; binaries for all the supported
 	  Python versions should be included in a single package.
 	</p>
@@ -460,8 +460,8 @@
 	  appropriate Depends and Provides lines. The format of the
 	  field may be one of the following:
 	  <example>
-XS-Python-Version: >= X.Y
-XS-Python-Version: >= A.B, << X.Y
+X-Python-Version: >= X.Y
+X-Python-Version: >= A.B, << X.Y
 XS-Python-Version: A.B, X.Y
 XS-Python-Version: all
 	  </example>
@@ -471,9 +471,9 @@
 	  information.  The keyword "all" is limited to Python versions and
 	  must be ignored for Python 3 versions. Lists of multiple individual
 	  versions (e.g. 2.4, 2.5, 2.6) work for <tt>XS-Python-Version</tt> and
-	  will continue to be supported, but are not recommended and will not
-	  be supported by <tt>X-Python-Version</tt> or <tt>X-Python3-Version</tt>
-	  after the Squeeze release.
+	  will continue to be supported, but are not recommended and are not
+	  supported by <tt>X-Python-Version</tt> or <tt>X-Python3-Version</tt>
+	  for Wheezy and later releases.
 
 	  The keyword "current" has been deprecated and used to mean that
 	  the package would only have to support a single version (even
@@ -488,12 +488,6 @@
           transitions.  This can be adequately accomplished by examining
 	  package dependencies.
 	</p>
-	<p>
-	  If your package is used by another module or application
-	  that requires a specific Python version, it should also
-	  <tt>Provide: python<var>X</var>.<var>Y</var>-foo</tt> for
-	  each version it supports.
-	</p>
       </sect>
 
       <sect id="dependencies">
@@ -522,11 +516,11 @@
 	<heading>Provides</heading>
 	<p>
           Provides in binary packages of the form
-          <package>python-<var>foo</var></package> must be specified,
-          if the package contains an extension for more than one
-          python version. Provides should also be added on request of
-          maintainers who depend on a non-default python version. Provides
-	  are only for extensions, not modules.
+          <package>python-<var>X</var>.<var>Y</var><var>>foo</var></package>
+	  must be specified if the package contains an extension for more
+	  than one python version and other package with version specific
+	  dependencies on the package require it.  Provides are only for
+	  extensions, not modules.
 	</p>
       </sect>
 
@@ -606,7 +600,7 @@
 	    Programs that have private compiled extensions must either
 	    handle multiple version support themselves, or declare a
 	    tight dependency on the current Python version
-	    (e.g. <tt>Depends: python (>= 2.4), python (<= 2.5)</tt>. No 
+	    (e.g. <tt>Depends: python (>= 2.6), python (<< 2.7)</tt>. No 
 	    tools currently exist to alleviate this situation.
 	  </p>
 	</sect1>
@@ -627,7 +621,7 @@
 	  requires a specific version of the package (since virtual
 	  packages cannot be versioned). If this is the case, it
 	  should depend on both the virtual package and the main
-	  package (e.g. <tt>Depends: python2.4-foo, python-foo (>=
+	  package (e.g. <tt>Depends: python2.7-foo, python-foo (>=
 	  1.0)</tt>).
 	</p>
 	<p>
@@ -704,16 +698,16 @@
       <p>
 	Build-Depend on at least:
 	<example>
-Build-Depends: python2.3 (>= 2.3-1)
-Build-Depends: python2.4 (>= 2.4-1)
-Build-Depends: python (>= 2.3.5-7)
+Build-Depends: python2.7
+Build-Depends: python2.6 (>= 2.6-1)
+Build-Depends: python (>= 2.6.6-9)
 Build-Depends: python-all
 
-Build-Depends: python2.3-dev (>= 2.3-1)
-Build-Depends: python2.4-dev (>= 2.4-1)
-Build-Depends: python-dev (>= 2.3.5-7)
+Build-Depends: python2.7-dev
+Build-Depends: python2.6-dev (>= 2.6-1)
+Build-Depends: python-dev (>= 2.6.6-9)
 Build-Depends: python-all-dev
-Build-Depends: python3-all-dev (>= 3.1)
+Build-Depends: python3-all-dev (>= 3.2)
 	</example>
       </p>
       <p>

=== modified file 'debian/python.postinst.in'
--- debian/python.postinst.in	2011-10-06 00:22:16 +0000
+++ debian/python.postinst.in	2012-11-28 12:53:22 +0000
@@ -40,7 +40,7 @@
 	fi
 
 	# run the rtinstall script, when 2.7 became a supported version
-        if [ -x /usr/bin/python2.7 ] && [ -n "$2" ] && dpkg --compare-versions $2 lt 2.6.6-4; then
+        if [ -x /usr/bin/python2.7 ] && [ -n "$2" ] && dpkg --compare-versions $2 lt 2.6.6-13; then
             if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
 		echo "Linking and byte-compiling packages for runtime python2.7..."
             fi
@@ -51,7 +51,7 @@
             done
 	fi
 
-        if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.7.1-0ubuntu1~; then
+        if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.7.2-7~; then
 	    oldv=$(echo $2 | sed 's/^\(...\).*/\1/')
 	    if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
 		echo "running python rtupdate hooks for @PVER@..."

=== modified file 'debian/python.postrm.in'
--- debian/python.postrm.in	2010-07-11 17:08:19 +0000
+++ debian/python.postrm.in	2012-11-28 12:53:22 +0000
@@ -1,8 +1,7 @@
 #! /bin/sh
 set -e
 
-case "$1" in
-    purge)
+case "$1" in remove|purge)
 	rm -rf /etc/python
 esac
 

=== modified file 'debian/python.preinst.in'
--- debian/python.preinst.in	2011-06-04 20:23:29 +0000
+++ debian/python.preinst.in	2012-11-28 12:53:22 +0000
@@ -12,7 +12,7 @@
 
 case "$1" in
     upgrade)
-        if dpkg --compare-versions $2 lt 2.6.1-0ubuntu1; then
+        if dpkg --compare-versions $2 lt 2.6.1-1~; then
 	    oldv=$(echo $2 | sed 's/^\(...\).*/\1/')
 	    if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
 		echo "running python pre-rtupdate hooks for @PVER@..."
@@ -47,9 +47,9 @@
 	    echo "$version" > /var/lib/python/python2.6_already_installed
 	fi
 
-	# 2.6.6-4 is the first version, which adds python2.7 as supported
+	# 2.6.6-13 is now the first version, which adds python2.7 as supported
 	# version; need to run an rtinstall python2.7 in the postinst.
-        if dpkg --compare-versions $2 lt 2.6.6-4 && [ -x /usr/bin/python2.7 ]; then
+        if dpkg --compare-versions $2 lt 2.6.6-13 && [ -x /usr/bin/python2.7 ]; then
 	    version=$(dpkg -s python2.7-minimal | awk '/^Version:/ {print $2}')
 	    mkdir -p /var/lib/python
 	    echo "$version" > /var/lib/python/python2.7_already_installed

=== modified file 'debian/python.prerm.in'
--- debian/python.prerm.in	2012-09-22 05:15:14 +0000
+++ debian/python.prerm.in	2012-11-28 12:53:22 +0000
@@ -1,8 +1,7 @@
 #! /bin/sh
 set -e
 
-case "$1" in
-    remove|purge)
+case "$1" in remove|purge)
 	rm -f /usr/share/python/pyversions.py[co]
 esac
 

=== modified file 'debian/pyversions.py'
--- debian/pyversions.py	2011-10-06 00:22:16 +0000
+++ debian/pyversions.py	2012-11-28 12:53:22 +0000
@@ -110,7 +110,9 @@
     else:
         return _unsupported_versions
 
-_supported_versions = None
+_supported_versions = ["python%s" % ver.strip() for ver in
+                       os.environ.get('DEBPYTHON_SUPPORTED', '').split(',')
+                       if ver.strip()]
 def supported_versions(version_only=False):
     global _supported_versions
     if not _supported_versions:
@@ -144,7 +146,9 @@
     else:
         return _supported_versions
 
-_default_version = None
+_default_version = "python%s" % os.environ.get('DEBPYTHON_DEFAULT', '')
+if _default_version == 'python':
+    _default_version = None
 def default_version(version_only=False):
     global _default_version
     if not _default_version:
@@ -261,12 +265,12 @@
             section = 'Source'
         elif line.startswith('Package: ' + pkg):
             section = pkg
-        elif line.startswith('XS-Python-Version:') or line.startswith('X-Python-Version:'):
+        elif line.lower().startswith(('xs-python-version:', 'x-python-version:')):
             if section != 'Source':
                 raise ValueError, \
                       'attribute X(S)-Python-Version not in Source section'
             sversion = line.split(':', 1)[1].strip()
-        elif line.startswith('XB-Python-Version:'):
+        elif line.lower().startswith('xb-python-version:'):
             if section == pkg:
                 version = line.split(':', 1)[1].strip()
     if section == None:

=== modified file 'debian/rules'
--- debian/rules	2012-04-17 15:54:22 +0000
+++ debian/rules	2012-11-28 12:53:22 +0000
@@ -20,7 +20,7 @@
 export PVER=python2.7
 
 PREVVER	:= $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
-PREVVER := 2.7.3
+PREVVER := 2.7.3-1~
 
 PWD		:= $(shell pwd)
 
@@ -229,7 +229,7 @@
 		debian/python-minimal/usr/share/python/
 	install -m 644 debian/pyversions.1 \
 		debian/python-minimal/usr/share/man/man1/
-	dh_link -ppython /usr/share/python/pyversions.py /usr/bin/pyversions
+	dh_link -ppython-minimal /usr/share/python/pyversions.py /usr/bin/pyversions
 
 #	install -m 755 debian/pycompile \
 #		debian/python-minimal/usr/bin/

=== modified file 'debpython/debhelper.py'
--- debpython/debhelper.py	2011-10-06 00:22:16 +0000
+++ debpython/debhelper.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -79,11 +79,11 @@
             elif line.startswith('Source:'):
                 self.source_name = line[7:].strip()
             elif source_section:
-                if line.startswith('XS-Python-Version:'):
+                if line.lower().startswith('xs-python-version:'):
                     xspv = True
                     if not self.python_version:
                         self.python_version = line[18:].strip()
-                if line.startswith('X-Python-Version:'):
+                if line.lower().startswith('x-python-version:'):
                     xpv = True
                     self.python_version = line[17:].strip()
 

=== modified file 'debpython/depends.py'
--- debpython/depends.py	2012-10-10 15:45:02 +0000
+++ debpython/depends.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -94,11 +94,13 @@
             tpl = 'python-dbg' if dbgpkg else 'python'
             minv = pub_vers[0]
             maxv = pub_vers[-1]
-            if dbgpkg:
-                tpl2 = 'python%d.%d-dbg'
-            else:
-                tpl2 = 'python%d.%d'
-            self.depend(' | '.join(tpl2 % i for i in debsorted(pub_vers)))
+            # generating "python2.X | python2.Y | python2.Z" dependencies
+            # disabled (see #625740):
+            #if dbgpkg:
+            #    tpl2 = 'python%d.%d-dbg'
+            #else:
+            #    tpl2 = 'python%d.%d'
+            #self.depend(' | '.join(tpl2 % i for i in debsorted(pub_vers)))
 
             # additional Depends to block python package transitions
             if minv <= DEFAULT:
@@ -112,21 +114,17 @@
         if stats['compile']:
             self.depend(MINPYCDEP)
 
-        if not options.ignore_shebangs:
-            for interpreter, version in stats['shebangs']:
-                self.depend(interpreter)
+        for interpreter, version in stats['shebangs']:
+            self.depend(interpreter)
 
         for private_dir, details in stats['private_dirs'].iteritems():
-            if options.ignore_shebangs:
-                versions = []
-            else:
-                versions = list(v for i, v in details.get('shebangs', []) if v)
+            versions = list(v for i, v in details.get('shebangs', []) if v)
 
             for v in versions:
                 if v in SUPPORTED:
                     self.depend("python%d.%d" % v)
                 else:
-                    log.warn('dependency on python%s (from shebang) ignored'
+                    log.info('dependency on python%s (from shebang) ignored'
                              ' - it\'s not supported anymore', vrepr(v))
             # /usr/bin/python shebang → add python to Depends
             if any(True for i, v in details.get('shebangs', []) if v is None):
@@ -143,7 +141,9 @@
                     # are scripts for different Python versions: compile with
                     # default Python version (or the one requested via X-P-V)
                     args += "-V %s" % vrange_str(vr)
-                    if vr[0] == vr[1]:
+                    if vr == (None, None):
+                        pass
+                    elif vr[0] == vr[1]:
                         self.depend("python%s" % vrepr(vr[0]))
                     else:
                         if vr[0]:  # minimum version specified

=== modified file 'debpython/files.py'
--- debpython/files.py	2011-04-15 00:04:07 +0000
+++ debpython/files.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

=== modified file 'debpython/namespace.py'
--- debpython/namespace.py	2011-10-06 00:22:16 +0000
+++ debpython/namespace.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2011 Piotr Ożarowski <[e-mail]>
+# Copyright © 2011-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

=== modified file 'debpython/option.py'
--- debpython/option.py	2011-10-06 00:22:16 +0000
+++ debpython/option.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

=== modified file 'debpython/pydist.py'
--- debpython/pydist.py	2011-10-06 00:22:16 +0000
+++ debpython/pydist.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 import os
 import re
 from os.path import exists, isdir, join
+from string import maketrans
 from subprocess import PIPE, Popen
 from debpython.version import vrepr, getver, get_requested_versions
 from debpython.tools import memoize
@@ -32,7 +33,7 @@
 
 PUBLIC_DIR_RE = re.compile(r'.*?/usr/lib/python(\d.\d+)/(site|dist)-packages')
 PYDIST_RE = re.compile(r"""
-    (?P<name>[A-Za-z][A-Za-z0-9_.]*)             # Python distribution name
+    (?P<name>[A-Za-z][A-Za-z0-9_.\-]*)             # Python distribution name
     \s*
     (?P<vrange>(?:-?\d\.\d+(?:-(?:\d\.\d+)?)?)?) # version range
     \s*
@@ -41,7 +42,7 @@
         ;\s*
         (?P<standard>PEP386)?                    # PEP-386 mode
         \s*
-        (?P<rules>s/.*)?                         # translator rules
+        (?P<rules>(?:s|tr|y).*)?                 # translator rules
     )?
     """, re.VERBOSE)
 REQUIRES_RE = re.compile(r'''
@@ -117,13 +118,13 @@
     req = safe_name(name) + rest
 
     data = load()
-    req_dict = REQUIRES_RE.match(req)
-    if not req_dict:
+    req_d = REQUIRES_RE.match(req)
+    if not req_d:
         log.info('please ask dh_python2 author to fix REQUIRES_RE '
                  'or your upstream author to fix requires.txt')
         raise Exception('requirement is not valid: %s' % req)
-    req_dict = req_dict.groupdict()
-    name = req_dict['name']
+    req_d = req_d.groupdict()
+    name = req_d['name']
     details = data.get(name.lower())
     if details:
         for item in details:
@@ -134,12 +135,13 @@
             if not item['dependency']:
                 return  # this requirement should be ignored
             if item['dependency'].endswith(')'):
-                # no need to translate versions if version is hardcoded in Debian
-                # dependency
-                return item['dependency']
-            if req_dict['version']:
-                # FIXME: translate it (rules, versions)
-                return item['dependency']
+                # no need to translate versions if version is hardcoded in
+                # Debian dependency
+                return item['dependency']
+            if req_d['version'] and (item['standard'] or item['rules']) and\
+               req_d['operator'] not in (None, '=='):
+                v = _translate(req_d['version'], item['rules'], item['standard'])
+                return "%s (%s %s)" % (item['dependency'], req_d['operator'], v)
             else:
                 return item['dependency']
 
@@ -231,3 +233,53 @@
 def ci_regexp(name):
     """Return case insensitive dpkg -S regexp."""
     return ''.join("[%s%s]" % (i.upper(), i) if i.isalpha() else i for i in name.lower())
+
+
+PRE_VER_RE = re.compile(r'[-.]?(alpha|beta|rc|dev|a|b|c)')
+GROUP_RE = re.compile(r'\$(\d+)')
+
+
+def _pl2py(pattern):
+    """Convert Perl RE patterns used in uscan to Python's
+
+    >>> print _pl2py('foo$3')
+    foo\g<3>
+    """
+    return GROUP_RE.sub(r'\\g<\1>', pattern)
+
+
+def _translate(version, rules, standard):
+    """Translate Python version into Debian one.
+
+    >>> _translate('1.C2betac', ['s/c//gi'], None)
+    '1.2beta'
+    >>> _translate('5-fooa1.2beta3-fooD',
+    ...     ['s/^/1:/', 's/-foo//g', 's:([A-Z]):+$1:'], 'PEP386')
+    '1:5~a1.2~beta3+D'
+    >>> _translate('x.y.x.z', ['tr/xy/ab/', 'y,z,Z,'], None)
+    'a.b.a.Z'
+    """
+    for rule in rules:
+        # uscan supports s, tr and y operations
+        if rule.startswith(('tr', 'y')):
+            # Note: no support for escaped separator in the pattern
+            pos = 1 if rule.startswith('y') else 2
+            tmp = rule[pos + 1:].split(rule[pos])
+            version = version.translate(maketrans(tmp[0], tmp[1]))
+        elif rule.startswith('s'):
+            # uscan supports: g, u and x flags
+            tmp = rule[2:].split(rule[1])
+            pattern = re.compile(tmp[0])
+            count = 1
+            if tmp[2:]:
+                flags = tmp[2]
+                if 'g' in flags:
+                    count = 0
+                if 'i' in flags:
+                    pattern = re.compile(tmp[0], re.I)
+            version = pattern.sub(_pl2py(tmp[1]), version, count)
+        else:
+            log.warn('unknown rule ignored: %s', rule)
+    if standard == 'PEP386':
+        version = PRE_VER_RE.sub('~\g<1>', version)
+    return version

=== modified file 'debpython/tools.py'
--- debpython/tools.py	2011-10-06 00:22:16 +0000
+++ debpython/tools.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@
 
 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)?).*')
+SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(2\.\d+)?(?:-dbg)?)(?:\s(.*))?[$\r\n].*')
 SHAREDLIB_RE = re.compile(r'NEEDED.*libpython(\d\.\d)')
 INSTALL_RE = re.compile(r"""
     (?P<pattern>.+?)  # file pattern
@@ -92,6 +92,42 @@
     return os.symlink(relpath(target, link), link)
 
 
+def fix_shebang(fpath, replacement=None):
+    """Normalize file's shebang.
+
+    :param replacement: new shebang command (path to interpreter and options)
+    """
+    try:
+        with open(fpath) as fp:
+            fcontent = fp.readlines()
+        if not fcontent:
+            log.debug('fix_shebang: ignoring empty file: %s', fpath)
+            return None
+    except IOError:
+        log.error('cannot open %s', fpath)
+        return False
+
+    match = SHEBANG_RE.match(fcontent[0])
+    if not match:
+        return None
+    if not replacement:
+        path, interpreter, version, argv = match.groups()
+        if path != '/usr/bin':  # f.e. /usr/local/* or */bin/env
+            replacement = "/usr/bin/%s" % interpreter
+        if interpreter == 'python2':
+            replacement = '/usr/bin/python'
+        if replacement and argv:
+            replacement += " %s" % argv
+    if replacement:
+        log.info('replacing shebang in %s (%s)', fpath, fcontent[0])
+        # do not catch IOError here, the file is zeroed at this stage so it's
+        # better to fail dh_python2
+        with open(fpath, 'w') as fp:
+            fp.write("#! %s\n" % replacement)
+            fp.writelines(fcontent[1:])
+    return True
+
+
 def shebang2pyver(fpath):
     """Check file's shebang.
 
@@ -105,10 +141,10 @@
             if not match:
                 return None
             res = match.groups()
-            if res != (None, None):
-                if res[1]:
-                    res = res[0], getver(res[1])
-                return res
+            if res[1:3] != (None, None):
+                if res[2]:
+                    return res[1], getver(res[2])
+                return res[1], None
     except IOError:
         log.error('cannot open %s', fpath)
 

=== modified file 'debpython/version.py'
--- debpython/version.py	2011-10-11 16:07:04 +0000
+++ debpython/version.py	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright © 2010 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,7 @@
 import logging
 import re
 from ConfigParser import SafeConfigParser
+from os import environ
 from os.path import exists, dirname, join
 from types import GeneratorType
 
@@ -36,18 +37,23 @@
 
 # try to read debian_defaults and get a list of supported Python versions and
 # the default one from there
-_config = SafeConfigParser()
-_config.read(['/usr/share/python/debian_defaults',
-             join(dirname(__file__), '..', 'debian', 'debian_defaults')])
+_supported = environ.get('DEBPYTHON_SUPPORTED')
+_default = environ.get('DEBPYTHON_DEFAULT')
+if not _supported or not _default:
+    _config = SafeConfigParser()
+    _config.read('/usr/share/python/debian_defaults')
+    if not _default:
+        _default = _config.get('DEFAULT', 'default-version')[6:]
+    if not _supported:
+        _supported = _config.get('DEFAULT', 'supported-versions')\
+                     .replace('python', '')
 try:
-    DEFAULT = tuple(int(i) for i in _config.get('DEFAULT',
-                    'default-version')[6:].split('.'))
+    DEFAULT = tuple(int(i) for i in _default.split('.'))
 except Exception:
     log.exception('cannot read debian_defaults')
 try:
-    SUPPORTED = tuple(tuple(int(j) for j in i.strip()[6:].split('.'))\
-                            for i in _config.get('DEFAULT',
-                                'supported-versions').split(','))
+    SUPPORTED = tuple(tuple(int(j) for j in i.strip().split('.'))
+                            for i in _supported.split(','))
 except Exception:
     log.exception('cannot read debian_defaults')
 
@@ -83,10 +89,10 @@
             versions = set(v for v in SUPPORTED if minv <= v < maxv)
 
     if available:
-        versions = set(v for v in versions \
+        versions = set(v for v in versions
                        if exists("/usr/bin/python%d.%d" % v))
     elif available is False:
-        versions = set(v for v in versions \
+        versions = set(v for v in versions
                        if not exists("/usr/bin/python%d.%d" % v))
 
     return versions
@@ -151,6 +157,8 @@
     ((2, 6), (2, 6))
     >>> parse_pycentral_vrange('2.5, 2.6')
     ((2, 5), None)
+    >>> parse_pycentral_vrange('>= 2.6.3')
+    ((2, 6), None)
     """
     get = lambda x: get_requested_versions(parse_vrange(x))
 
@@ -188,7 +196,7 @@
         minv = sorted(hardcoded)[0]
 
     if current:
-        versions = sorted(get("%s-%s" % (minv if minv else '', \
+        versions = sorted(get("%s-%s" % (minv if minv else '',
                                          maxv if maxv else '')))
         if not versions:
             raise ValueError("version range doesn't match installed Python versions: %s" % value)

=== modified file 'dh_python2'
--- dh_python2	2012-05-22 11:23:40 +0000
+++ dh_python2	2012-11-28 12:53:22 +0000
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 # -*- coding: UTF-8 -*- vim: et ts=4 sw=4
 
-# Copyright © 2010-2011 Piotr Ożarowski <[e-mail]>
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -42,8 +42,8 @@
 from debpython.pydist import validate as validate_pydist, \
                              PUBLIC_DIR_RE
 from debpython.tools import sitedir, relative_symlink, \
-                            shebang2pyver, so2pyver, \
-                            clean_egg_name, \
+                            fix_shebang, shebang2pyver, \
+                            so2pyver, clean_egg_name, \
                             pyinstall, pyremove
 from debpython.option import Option
 
@@ -299,7 +299,7 @@
 
 
 ### PACKAGE DETAILS ############################################
-def scan(package, dname=None, clean_dbg_pkg=True):
+def scan(package, dname=None, options=None):
     """Gather statistics about Python files in given package."""
     r = {'requires.txt': set(),
          'nsp.txt': set(),
@@ -321,8 +321,9 @@
                                 'usr/share/%s', 'usr/share/games/%s')]
     else:
         # scan private directory *only*
-        proot = join('debian', package, dname.strip('/'))
-        private_to_check = [dname[1:]]
+        dname = dname.strip('/')
+        proot = join('debian', package, dname)
+        private_to_check = [dname]
 
     for root, dirs, file_names in os.walk(proot):
         # ignore Python 3.X locations
@@ -358,7 +359,7 @@
         # handle some EGG related data (.egg-info dirs)
         for name in dirs:
             if name.endswith('.egg-info'):
-                if dbg_package and clean_dbg_pkg:
+                if dbg_package and options.clean_dbg_pkg:
                     rmtree(join(root, name))
                     dirs.remove(name)
                     continue
@@ -380,6 +381,11 @@
             fpath = join(root, fn)
             if not exists(fpath):
                 # could be removed while handling .so symlinks
+                if islink(fpath) and '.so.' in split(fpath)[-1]:
+                    # dangling symlink to (now removed/renamed) .so file
+                    # which wasn't removed yet (see test3's quux.so.0)
+                    log.info('removing symlink: %s', fpath)
+                    os.remove(fpath)
                 continue
             fext = fn.rsplit('.', 1)[-1]
             if fext in ('pyc', 'pyo'):
@@ -399,18 +405,22 @@
                             os.remove(lpath)
                         log.info('renaming %s to %s', dstfpath, fn)
                         os.rename(dstfpath, fpath)
-                if dbg_package and clean_dbg_pkg and fext not in ('so', 'h'):
+                if dbg_package and options.clean_dbg_pkg and \
+                   fext not in ('so', 'h'):
                     os.remove(join(root, fn))
                     continue
 
             elif private_dir:
-                if exists(join(root, fn)):
-                    mode = os.stat(join(root, fn))[ST_MODE]
+                if exists(fpath):
+                    mode = os.stat(fpath)[ST_MODE]
                     if mode & S_IXUSR or mode & S_IXGRP or mode & S_IXOTH:
-                        res = shebang2pyver(join(root, fn))
-                        if res:
-                            r['private_dirs'].setdefault(private_dir, {})\
-                                .setdefault('shebangs', set()).add(res)
+                        if (options.no_shebang_rewrite or \
+                            fix_shebang(fpath, options.shebang)) and \
+                           not options.ignore_shebangs:
+                            res = shebang2pyver(fpath)
+                            if res:
+                                r['private_dirs'].setdefault(private_dir, {})\
+                                    .setdefault('shebangs', set()).add(res)
 
             if public_dir or private_dir:
                 if fext == 'so':
@@ -447,11 +457,14 @@
                 continue
             # search for scripts in bin dirs
             if bin_dir:
-                res = shebang2pyver(fpath)
-                if res:
-                    r['shebangs'].add(res)
+                if (options.no_shebang_rewrite or \
+                    fix_shebang(fpath, options.shebang)) and \
+                   not options.ignore_shebangs:
+                     res = shebang2pyver(fpath)
+                     if res:
+                         r['shebangs'].add(res)
 
-    if dbg_package and clean_dbg_pkg:
+    if dbg_package and options.clean_dbg_pkg:
         # remove empty directories in -dbg packages
         proot = proot + '/usr/lib'
         for root, dirs, file_names in os.walk(proot, topdown=False):
@@ -468,7 +481,7 @@
 ################################################################
 def main():
     usage = '%prog -p PACKAGE [-V [X.Y][-][A.B]] DIR [-X REGEXPR]\n'
-    parser = OptionParser(usage, version='%prog 2.0~beta1',
+    parser = OptionParser(usage, version='%prog 2.1',
                                    option_class=Option)
     parser.add_option('--no-guessing-versions', action='store_false',
         dest='guess_versions', default=True,
@@ -514,6 +527,8 @@
         help='recreate __init__.py files for given namespaces at install time')
     parser.add_option('--clean-pycentral', action='store_true', default=False,
         help='generate maintainer script that will remove pycentral files')
+    parser.add_option('--shebang',
+        help='use given command as shebang in scripts')
     parser.add_option('--ignore-shebangs', action='store_true', default=False,
         help='do not translate shebangs into Debian dependencies')
     parser.add_option('--ignore-namespace', action='store_true', default=False,
@@ -521,6 +536,8 @@
     parser.add_option('--no-dbg-cleaning', action='store_false',
             dest='clean_dbg_pkg', default=True,
         help='do not remove files from debug packages')
+    parser.add_option('--no-shebang-rewrite', action='store_true',
+            default=False, help='do not rewrite shebangs')
     # ignore some debhelper options:
     parser.add_option('-O', help=SUPPRESS_HELP)
 
@@ -588,7 +605,7 @@
             if not pyremove(package, options.vrange):
                 exit(5)
             fix_locations(package)
-        stats = scan(package, private_dir, options.clean_dbg_pkg)
+        stats = scan(package, private_dir, options)
         if not private_dir:
             share(package, stats, options)
             pyshared_dir = "debian/%s/usr/share/pyshared/" % package

=== modified file 'dh_python2.rst'
--- dh_python2.rst	2011-10-06 00:22:16 +0000
+++ dh_python2.rst	2012-11-28 12:53:22 +0000
@@ -22,13 +22,13 @@
  * build module/application using its standard build system,
    remember to build extensions for all supported Python versions (loop over
    ``pyversions -vr``),
- * install files to the *standard* locations, add ``--install-layout=deb`` to
+ * install files to the *standard* locations, add `--install-layout=deb` to
    setup.py's install command if your package is using distutils,
- * add ``python2`` to dh's ``--with`` option, or:
- * include /usr/share/cdbs/1/class/python-distutils.mk in debian/rules and
-   depend on cdbs (>= 0.4.90), or:
- * call dh_python2 in the binary-* target,
- * add ${python:Depends} to Depends,
+ * add `python2` to dh's --with option, or:
+ * `include /usr/share/cdbs/1/class/python-distutils.mk` in debian/rules and
+   depend on `cdbs (>= 0.4.90)`, or:
+ * call ``dh_python2`` in the `binary-*` target,
+ * add `${python:Depends}` to Depends
 
 NOTES
 -----
@@ -43,17 +43,19 @@
 dependencies
 ~~~~~~~~~~~~
 dh_python2 tries to translate Python dependencies from requires.txt file to
-Debian dependencies, use debian/pydist-overrides or --no-guessing-deps option
-to override it. If you want dh_python2 to generate more strict dependencies
-(f.e. to avoid ABI problems) create debian/python-foo.pydist file. See
-/usr/share/doc/python-doc/README.PyDist (provided by python-doc package) for
-more information.
+Debian dependencies. Use debian/pydist-overrides or --no-guessing-deps option
+to override it if the guess is incorrect. If you want dh_python2 to generate
+more strict dependencies (f.e. to avoid ABI problems) create
+debian/python-foo.pydist file. See /usr/share/doc/python-doc/README.PyDist
+(provided by python-doc package) for more information. If the pydist file
+contains PEP386 flag or set of (uscan like) rules, dh_python2 will make the
+depedency versioned (version requirements are ignored by default).
 
 namespace feature
 ~~~~~~~~~~~~~~~~~
 dh_python2 parses Egg's namespace_packages.txt files (in addition to
 --namespace command line argument(s)) and drops empty __init__.py files from
-binary package. pycompile will regenerates them at install time and pyclean
+binary package. pycompile will regenerate them at install time and pyclean
 will remove them at uninstall time (if they're no longer used in installed
 packages). It's still a good idea to provide __init__.py file in one of
 binary packages (even if all other packages use this feature).
@@ -70,24 +72,33 @@
 dh_python2 with --skip-private option and add another call with a path to this
 directory and new options.
 
+debug packages
+~~~~~~~~~~~~~~
+In binary packages which name ends with `-dbg`, all files in
+`/usr/lib/python2.X/{site,dist}-packages/` directory 
+that have extensions different than `so` or `h` are removed by default.
+Use --no-dbg-cleaning option to disable this feature.
+
 pyinstall files
 ~~~~~~~~~~~~~~~
 Files listed in debian/pkg.pyinstall file will be installed as public modules
 for all requested Python versions (dh_install doesn't know about python's site-
 vs. dist-packages issue).
 
-Syntax: "path/to/file [VERSION_RANGE] [NAMESPACE]". debian directory is
-automatically removed from the path, so you can place your files in debian/
-directory and install them from this location (if you want to install them in
-"debian" namespace, set NAMESPACE to debian). If NAMESPACE is set, all listed
-files will be installed in .../dist-packages/NAMESPACE/ directory.
+Syntax: ``path/to/file [VERSION_RANGE] [NAMESPACE]``
+
+debian directory is automatically removed from the path, so you can place your
+files in debian/ directory and install them from this location (if you want to
+install them in "debian" namespace, set NAMESPACE to debian). If NAMESPACE is
+set, all listed files will be installed in .../dist-packages/NAMESPACE/
+directory.
 
 Examples:
- * `foo.py` (installs .../dist-packages/foo.py for all supported Python versions)
- * `foo/bar.py 2.6-` (installs .../dist-packages/foo/bar.py for versions >= 2.6)
- * `foo/bar.py spam` (installs .../dist-packages/spam/bar.py)
- * `debian/*.py spam.egg 2.5` (installs .../python2.5/site-packages/spam/egg/\*.py
-   files)
+ * ``foo.py`` installs .../dist-packages/foo.py for all supported Python versions
+ * ``foo/bar.py 2.6-`` installs .../dist-packages/foo/bar.py for versions >= 2.6
+ * ``foo/bar.py spam`` installs .../dist-packages/spam/bar.py
+ * ``debian/*.py spam.egg 2.5`` installs .../python2.5/site-packages/spam/egg/\*.py
+   files
 
 pyremove files
 ~~~~~~~~~~~~~~
@@ -96,8 +107,18 @@
 debian/pkg.pyremove file.
 
 Examples:
- * `*.pth` (removes .pth files from .../dist-packages/)
- * `bar/baz.py 2.5` (removes .../python2.5/site-packages/bar/baz.py)
+ * ``*.pth`` removes .pth files from .../dist-packages/
+ * ``bar/baz.py 2.5`` removes .../python2.5/site-packages/bar/baz.py
+
+overriding supported / default Python versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If you want to override system's list of supported Python versions or the
+default one (f.e. to build a package that includes symlinks for older version
+of Python or compile .py files only for given interpreter version), you can do
+that via `DEBPYTHON_SUPPORTED` and/or `DEBPYTHON_DEFAULT` env. variables.
+
+Example: ``2.5,2.7`` limits the list of supported Python versions to Python 2.5
+and Python 2.7.
 
 
 OPTIONS
@@ -112,6 +133,8 @@
 
 --no-dbg-cleaning	do not remove any files from debug packages
 
+--no-shebang-rewrite	do not rewrite shebangs
+
 --skip-private	don't check private directories
 
 -v, --verbose	turn verbose mode on
@@ -156,6 +179,8 @@
 --clean-pycentral	generate maintainer script that will remove byte code
   generated by python-central helper
 
+--shebang=COMMAND	use given command as shebang in scripts
+
 --ignore-shebangs	do not translate shebangs into Debian dependencies
 
 SEE ALSO

=== modified file 'pyclean'
--- pyclean	2011-09-27 18:21:42 +0000
+++ pyclean	2012-11-28 12:53:22 +0000
@@ -1,8 +1,7 @@
 #! /usr/bin/python
-# -*- coding: UTF-8 -*-
-# vim: et ts=4 sw=4
-
-# Copyright © 2010-2011 Piotr Ożarowski <[e-mail]>
+# -*- coding: UTF-8 -*- vim: et ts=4 sw=4
+#
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

=== modified file 'pycompile'
--- pycompile	2011-10-06 00:22:16 +0000
+++ pycompile	2012-11-28 12:53:22 +0000
@@ -1,8 +1,7 @@
 #! /usr/bin/python
-# -*- coding: utf-8 -*-
-# vim: et ts=4 sw=4
-
-# Copyright © 2010-2011 Piotr Ożarowski <[e-mail]>
+# -*- coding: utf-8 -*- vim: et ts=4 sw=4
+#
+# Copyright © 2010-2012 Piotr Ożarowski <[e-mail]>
 # Copyright © 2010 Canonical Ltd
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -132,7 +131,7 @@
     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')
+        % (version, ' -O' if optimize else '')
     process = Popen(cmd, bufsize=1, shell=True,
                     stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
     workers[version] = process  # keep the reference for .communicate()
@@ -153,7 +152,7 @@
 
     # byte compile files
     for fn, versions_to_compile in filter_files(files, e_patterns, versions):
-        cfn = fn + 'c' if (__debug__ or not optimize) else 'o'
+        cfn = fn + 'o' if optimize else 'c'
         if not exists(fn):
             # pycentral's hook should clean it later
             if islink(fn):

=== modified file 'pydist/dist_fallback'
--- pydist/dist_fallback	2011-10-06 00:22:16 +0000
+++ pydist/dist_fallback	2012-11-28 12:53:22 +0000
@@ -1,51 +1,46 @@
 python python
 setuptools python-pkg-resources
 wsgiref python (>= 2.5) | python-wsgiref
+argparse python (>= 2.7) | python-argparse
+pil python-imaging
 AddOns python-peak.util
+BatchModify trac-batchmodify
 BitTornado bittornado
 BitTorrent bittorrent
-Bitten trac-bitten
-Bugs_Everywhere bugs-everywhere
+Bitten trac-bitten-slave
 BytecodeAssembler python-peak.util
 BzrPipeline bzr-pipeline
 BzrTools bzrtools
+Calendar_and_Contacts_Server calendarserver
 CedarBackup2 cedar-backup2
 CherryPy python-cherrypy3
+CherryTree cherrytree
 ClusterShell clustershell
 Codeville codeville
-Connectome_Viewer connectomeviewer
 ControlAula controlaula
-Couchapp couchapp
 CoverageTestRunner python-coverage-test-runner
-Cython cython
 DITrack ditrack
 DebTorrent debtorrent
 DecoratorTools python-peak.util.decorators
+DiaVisViewPlugin trac-diavisview
 Djapian python-django-djapian
-Djblets python-django-djblets
-Dockbarx dockbarx
+Doconce doconce
 Dosage dosage
 DouF00 douf00
 Editra editra
-Eikazo eikazo
 Extremes python-peak.util
 Fabric fabric
 FeinCMS python-django-feincms
 Flask_WTF python-flaskext.wtf
-GGZChess python-ggz
-GGZCore python-ggz
-GGZDMod python-ggz
-GGZMod python-ggz
-Gally gally
 GaussSum gausssum
 GeoIP_Python python-geoip
 GitPython python-git
-Gufw gufw
 HarvestMan harvestman
 ISO8583_Module python-iso8583
 Ibid ibid
 JCC jcc
 Loom bzr-loom
+MAT mat
 Magic_file_extensions python-magic
 Mirage mirage
 Mnemosyne mnemosyne
@@ -53,11 +48,11 @@
 MySQL_python python-mysqldb
 Nautilus_scripts_manager nautilus-scripts-manager
 Nulog nulog
+OdtExportPlugin trac-odtexport
 PEAK_Rules python-peak.rules
 PIDA pida
 Photon photon
 Plywood plywood
-Pootle pootle
 Postr postr
 PreludeEasy python-prelude
 PsychoPy psychopy
@@ -66,8 +61,11 @@
 PyBluez python-bluez
 PyCAPTCHA python-captcha
 PyCoCuMa pycocuma
+PyFFTW3 python-fftw
+PyHamcrest python-hamcrest
 PyMca pymca
 PyMetrics pymetrics
+PyNAST pynast
 PyOpenGL python-opengl
 PyProtocols python-protocols
 PyRoom pyroom
@@ -76,53 +74,63 @@
 PyWavelets python-pywt
 PyWebDAV python-webdav
 PyYAML python-yaml
+Py_ python-py++
 Pygmy pygmy
-Pyjamas pyjamas-pyjs
 Pymacs pymacs
-Pyro pyro
-Pyste libboost-python1.46-dev
+Pyste libboost-python1.49-dev
 PythonDaap python-daap
 QuantLib_Python quantlib-python
 Quixote python-quixote1
-RSVGSDL python-ggz
-SSSDConfig python-sss
+Ren_Py python-renpy
+Roadmap_Plugin trac-roadmap
+RunSnakeRun runsnakerun
 ScientificPython python-scientific
 Shinken shinken-core
 Sonata sonata
 South python-django-south
-SpreadModule python-spread
-Starch coop-computing-tools
 SymbolType python-peak.util
 Symbolic python-swiginac
+TcosConfigurator tcos-configurator
 The_FreeSmartphone_Framework_Daemon fso-frameworkd
 TileCache tilecache
 TileStache tilestache
 Trac trac
 TracAccountManager trac-accountmanager
+TracAnnouncer trac-announcer
 TracAuthOpenId trac-authopenid
 TracBzr trac-bzr
 TracCustomFieldAdmin trac-customfieldadmin
 TracDateField trac-datefieldplugin
 TracGit trac-git
+TracHTTPAuth trac-httpauth
 TracMasterTickets trac-mastertickets
 TracMercurial trac-mercurial
-TracPrivateTickets trac-privateticketsplugin
+TracPrivateTickets trac-privatetickets
 TracSpamFilter trac-spamfilter
+TracSubTicketsPlugin trac-subtickets
 TracTags trac-tags
+TracVirtualTicketPermissions trac-virtualticketpermissions
 TracWikiPrintPlugin trac-wikiprint
-TracWikiRename trac-wikirename
 TracWysiwyg trac-wysiwyg
 TracXMLRPC trac-xmlrpc
+Trac_jsGantt trac-jsgantt
 Turtle_Art turtleart
 UNKNOWN python-pdfrw
+UnknownHorizons unknown-horizons
+VirtualMailManager vmm
 WikiTableMacro trac-wikitablemacro
 Wikkid wikkid
+WordPress_Library python-wordpresslib
+X_Tile x-tile
 ZODB3 python-zodb
+_tifffile tifffile
 activity_log_manager activity-log-manager
 adns_python python-adns
 agtl agtl
+alembic alembic
 allmydata_tahoe tahoe-lafs
 apache_libcloud python-libcloud
+apparmor apparmor-utils
 apt_clone apt-clone
 apt_p2p apt-p2p
 apt_xapian_index apt-xapian-index
@@ -131,14 +139,13 @@
 arandr arandr
 archivemail archivemail
 archmage archmage
-arcjobtool arcjobtool
 arista arista
-astk code-aster-run
 atheist atheist
 autokey autokey-common
+beautifulsoup4 python-bs4
 bicyclerepair bicyclerepair
-bitbake bitbake
 bley bley
+bookletimposer bookletimposer
 bpython bpython
 buildbot buildbot
 buildbot_slave buildbot-slave
@@ -154,8 +161,6 @@
 bzr_git bzr-git
 bzr_grep bzr-grep
 bzr_gtk bzr-gtk
-bzr_hg bzr-hg
-bzr_pqm bzr-pqm
 bzr_rewrite bzr-rewrite
 bzr_search bzr-search
 bzr_stats bzr-stats
@@ -163,32 +168,38 @@
 bzr_upload bzr-upload
 bzr_xmloutput bzr-xmloutput
 cappuccino cappuccino
+carbon graphite-carbon
 cardstories cardstories
 cfget cfget
+chirp chirp
 chm2pdf chm2pdf
 cm config-manager
+cmdtest cmdtest
+cpuset cpuset
 cvs2svn cvs2svn
-cwm python-swap
 d_feet d-feet
+d_rats d-rats
+datapm datapm
+dblatex dblatex
 dctrl2xml dctrl2xml
 debpartial_mirror debpartial-mirror
 deluge deluge-common
 devscripts devscripts
+dicompyler dicompyler
 dissy dissy
-distro_info distro-info
 djagios djagios
 django_ajax_selects django-ajax-selects
 django_filter django-filter
 django_openid_auth python-django-auth-openid
-django_tables django-tables
+django_tables2 django-tables
+django_tastypie python-tastypie
 djextdirect python-django-extdirect
+dkimpy python-dkim
 dot2tex dot2tex
 driconf driconf
 dtrx dtrx
 duplicity duplicity
 dvcs_autosync dvcs-autosync
-earcandy earcandy
-ears ears
 eficas eficas
 elisa python-moovida
 elisa_plugin_amazon moovida-plugins-bad
@@ -224,81 +235,93 @@
 elisa_plugin_wmd moovida-plugins-bad
 elisa_plugin_youtube moovida-plugins-ugly
 epigrass epigrass
+epoptes epoptes
+espeak_gui espeak-gui
 euca2ools euca2ools
 explorer bzr-explorer
 flashbake flashbake
 flickrfs flickrfs
 fontypython fontypython
+frescobaldi frescobaldi
+fts fts
+fts_clacks fts-clacks
+fts_fai fts-fai-ldap
+fts_ltsp fts-ltsp-ldap
+fts_opsi fts-opsi
 funkload funkload
 fuse_python python-fuse
 fusil fusil
-fusion_icon fusion-icon
 fuss_launcher fuss-launcher
-gEcrit gecrit
 galternatives galternatives
+gameclock gameclock
 gaphor gaphor
 gastablesgui gastables
+gbp git-buildpackage
 gdevilspie gdevilspie
 gdmodule python-gd
 genbackupdata genbackupdata
 getmail getmail4
 geximon geximon
-git_build_package git-buildpackage
+git_review git-review
 github_cli github-cli
 giws giws
 gjots2 gjots2
+glipper glipper
 globs globs
+glue glue-sprite
 gmobilemedia gmobilemedia
 gnome_activity_journal gnome-activity-journal
 gnome_app_install gnome-codec-install
 gnomecatalog gnomecatalog
 gnuplot_py python-gnuplot
 go2 go2
-googlecl googlecl
 gozerbot gozerbot
 gozerplugs gozerbot-plugins
 gpodder gpodder
 gquilt gquilt
-gracie gracie
 graphviz trac-graphviz
-groundcontrol groundcontrol
 gunicorn gunicorn
 gvb gvb
 gwrite gwrite
 gyp gyp
-hellanzb hellanzb
 hgnested mercurial-nested
 hgsvn hgsvn
-hgview hgview
+hitchhhiker hitchhiker
 hotwire hotwire
+httpcode httpcode
+httpie httpie
+hyde hyde
 ibus_tegaki ibus-tegaki
 icalview trac-icalviewplugin
 identicurse identicurse
 imposm.parser python-imposm-parser
-include_server distcc-pump
-indywiki indywiki
 iotop iotop
 ipython ipython
+isoquery isoquery
 jack jack
 jsb jsonbot
+juju juju
+kedpm kedpm
+keepnote keepnote
 key_mon key-mon
 keymapper keymapper
 kiki kiki
 lastfmsubmitd lastfmsubmitd
 lazygal lazygal
+legit legit
 libtpclient_py python-tp-client
 libtpproto_py python-tp-netlib
-live_magic live-magic
+lio lio-utils
 llnl_babel python-sidl
 llnl_babel_sidl_sidlx python-sidl
 loggerhead loggerhead
 londonlaw londonlaw
 lptools lptools
 lshell lshell
-lucene pylucene
 ludev_t ludevit
 lybniz lybniz
 mayavi mayavi2
+mcomix mcomix
 mecab_python python-mecab
 mercurial mercurial-common
 mic mic2
@@ -306,19 +329,23 @@
 mingc python-ming
 mini_dinstall mini-dinstall
 miro miro
+mitmproxy mitmproxy
 mod_python libapache2-mod-python
 moin python-moinmoin
 moosic moosic
 mozilla_devscripts mozilla-devscripts
 mpDris mpdris
-msgpack_python msgpack-python
 museek_python_bindings python-museek
 musiclibrarian musiclibrarian
+mysql_utilities mysql-utilities
+nautilus_pastebin nautilus-pastebin
 neso tryton-neso
 netsnmp_python libsnmp-python
 nfoview nfoview
 nglister nglister
+nml nml
 nsscache nsscache
+nxt_python python-nxt
 obMenu obmenu
 obnam obnam
 oboinus oboinus
@@ -329,14 +356,16 @@
 openbmap_logger openbmap-logger
 openoffice_python python-openoffice
 openshot openshot
+openstack.common python-openstack-common
 osc osc
-ows ows
 pYsearch python-yahoo
+pbundler pbundler
 pdfposter pdfposter
 pdfshuffler pdfshuffler
 pep8 pep8
 perroquet perroquet
-picard picard
+pgxnclient pgxnclient
+photofilmstrip photofilmstrip
 pithos pithos
 pkpgcounter pkpgcounter
 playitslowly playitslowly
@@ -344,14 +373,18 @@
 prelude_correlator prelude-correlator
 prelude_notify prelude-notify
 preprocess preprocess
+presage_dbus_service presage-dbus
 prewikka prewikka
 prioritized_methods python-peak.rules
 proteus tryton-proteus
 prover9_mace4 prover9-mace4
 pssh pssh
+ptex2tex ptex2tex
 puddletag puddletag
 purity_ng purity-ng
 pyExcelerator python-excelerator
+pyFAI pyfai
+pyLibravatar python-libravatar
 pyOpenSSL python-openssl
 pyPortMidi python-pypm
 py_Asterisk python-asterisk
@@ -359,8 +392,8 @@
 py_rrdtool python-rrdtool
 py_sendfile python-sendfile
 pyacidobasic python-acidobasic
+pyacoustid python-acoustid
 pyalsaaudio python-alsaaudio
-pybackpack pybackpack
 pybloom python-bloomfilter
 pybridge pybridge
 pybtex pybtex
@@ -370,9 +403,7 @@
 pychm python-chm
 pycrypto python-crypto
 pydicom python-dicom
-pydkim python-dkim
 pydns python-dns
-pyelemental python-elemental
 pyenchant python-enchant
 pyepr python-epr
 pyfacebook python-facebook
@@ -381,38 +412,42 @@
 pygopherd pygopherd
 pygpgme python-gpgme
 pygpiv python-gpiv
+pygrib python-grib
 pyliblo python-liblo
 pyliblzma python-lzma
 pylibpcap python-libpcap
-pylibssh2 python-libssh2
 pylint pylint
+pylogsparser python-logsparser
 pymecavideo python-mecavideo
 pymilter python-milter
 pymol pymol
 pymucipher python-museek
 pymvpa python-mvpa
+pymvpa2 python-mvpa2
 pyneighborhood pyneighborhood
 pynids python-nids
 pynifti python-nifti
 pyogg python-ogg
+pyp pyp
 pyparallel python-parallel
 pyppd pyppd
 pyprompter pyprompter
-pyqonsole pyqonsole
 pyremctl python-remctl
 pyrit pyrit
 pyrite_publisher pyrite-publisher
 pysane python-imaging-sane
 pysatellites python-satellites
 pyserial python-serial
-pysnmp python-pysnmp2
+pysnmp python-pysnmp4
 pysnmp_apps python-pysnmp4-apps
 pysnmp_mibs python-pysnmp4-mibs
 pysparse python-sparse
+pyspf python-spf
 pyspi python-at-spi
 pysqlite python-pysqlite1.1
 pystatgrab python-statgrab
 pysubnettree python-subnettree
+pysurfer python-surfer
 pytagsfs pytagsfs
 pytcpwrap python-tcpwrap
 python2_biggles python-pybiggles
@@ -425,10 +460,10 @@
 python_logging_extra python-loggingx
 python_memcached python-memcache
 python_policyd_spf postfix-policyd-spf-python
-python_workqueue coop-computing-tools
 python_yapps yapps2
 pythontracer pythontracer
 pytidylib python-tidylib
+pytimechart pytimechart
 pytrainer pytrainer
 pytz python-tz
 pyusb python-usb
@@ -439,6 +474,10 @@
 qbzr qbzr
 qct qct
 qmtest qmtest
+qpid_python python-qpid
+qpid_qmf python-qpid-extras-qmf
+qpid_tools qpid-tools
+quisk quisk
 quodlibet exfalso
 qweborf qweborf
 rabbitvcs rabbitvcs-core
@@ -450,9 +489,9 @@
 rebuildd rebuildd
 recaptcha_client python-recaptcha
 relational_gui relational
+relational_pyside relational
 relational_readline relational-cli
 remuco remuco-base
-renpy_module python-renpy
 repoze.what.plugins.sql python-repoze.what-plugins
 repoze.what.plugins.xml python-repoze.what-plugins
 repoze.what_pylons python-repoze.what-plugins
@@ -465,18 +504,27 @@
 roundup roundup
 rpl rpl
 rst2pdf rst2pdf
-scikits.learn python-scikits-learn
+rubber rubber
+salt salt-common
+scikit_learn python-sklearn
+scikits_image python-skimage
 screenlets screenlets
 seivot seivot
-sessioninstaller sessioninstaller
+sensitivetickets trac-sensitivetickets
+servefile servefile
+shedskin shedskin
 slapos.core slapos-client
+slimit slimit
 smart python-smartpm
-smart_notifier smart-notifier
 snimpy snimpy
 spambayes spambayes
 spectacle spectacle
 specto specto
+sphinxcontrib_actdiag python-sphinxcontrib.actdiag
+sphinxcontrib_blockdiag python-sphinxcontrib.blockdiag
 sphinxcontrib_issuetracker python-sphinxcontrib.issuetracker
+sphinxcontrib_nwdiag python-sphinxcontrib.nwdiag
+sphinxcontrib_seqdiag python-sphinxcontrib.seqdiag
 sphinxcontrib_spelling python-sphinxcontrib.spelling
 spyder python-spyderlib
 sqlalchemy_migrate python-migrate
@@ -486,19 +534,22 @@
 supervisor supervisor
 supybot supybot
 svnmailer svnmailer
-synce_kpm synce-kpm
-synce_sync_engine synce-sync-engine
+synaptiks kde-config-touchpad
 tailor tailor
+targetcli targetcli
+tcm lio-utils
+tcosconfig tcosconfig
 tegaki_pygtk python-tegaki-gtk
 tegaki_python python-tegaki
 tegaki_tools python-tegakitools
 tegaki_train tegaki-train
 tgext.crud python-tgext.admin
+tilelite tilelite
 tinyeartrainer tinyeartrainer
 tortoisehg tortoisehg
 transifex_client transifex-client
 translate_toolkit translate-toolkit
-trash trash-cli
+trash_cli trash-cli
 trimage trimage
 tritium tritium
 tryton tryton-client
@@ -553,34 +604,34 @@
 ttb ttb
 turpial turpial
 tw.forms python-toscawidgets
+txLibravatar python-twisted-libravatar
 ubuntu_dev_tools ubuntu-dev-tools
-ubuntu_sso_client ubuntu-sso-client
 ufw ufw
 unattended_upgrades unattended-upgrades
-undertaker undertaker
 unittest_xml_reporting python-xmlrunner
 urlscan urlscan
+vamos undertaker
 vboxapi virtualbox
 virtaal virtaal
 virtinst virtinst
+virtualbricks virtualbricks
 virtualenvwrapper virtualenvwrapper
 wammu wammu
 web.py python-webpy
+weboob python-weboob-core
 whyteboard whyteboard
-wiican wiican
 wikipediafs wikipediafs
 winpdb winpdb
-wxPython_common python-wxgtk2.6
+wxPython_common python-wxgtk2.8
+wxgeometrie wxgeometrie
 xgflib xgridfit
 xml_marshaller python-xmlmarshaller
 xmldiff xmldiff
 xmms2tray xmms2tray
-xxdiff_scripts xxdiff-scripts
 yagtd yagtd
 yokadi yokadi
 yum_metadata_parser python-sqlitecachec
 zenmap zenmap
 zeroinstall_injector zeroinstall-injector
-zhone zhone-illume-glue
 zim zim
 zinnia_python python-zinnia

=== modified file 'pydist/generate_fallback_list.py'
--- pydist/generate_fallback_list.py	2011-10-06 00:22:16 +0000
+++ pydist/generate_fallback_list.py	2012-11-28 12:53:22 +0000
@@ -71,4 +71,7 @@
 fp.write('python python\n')
 fp.write('setuptools python-pkg-resources\n')
 fp.write('wsgiref python (>= 2.5) | python-wsgiref\n')
+fp.write('argparse python (>= 2.7) | python-argparse\n')
+# wasn't recognized due to .pth file (egg-info is in PIL/ and not in *-packages/)
+fp.write('pil python-imaging\n')
 fp.writelines(result)

=== modified file 'python2.pm'
--- python2.pm	2010-06-17 23:47:08 +0000
+++ python2.pm	2012-11-28 12:53:22 +0000
@@ -5,7 +5,7 @@
 use strict;
 use Debian::Debhelper::Dh_Lib;
 
-insert_after("dh_perl", "dh_python2");
+insert_before("dh_installinit", "dh_python2");
 remove_command("dh_pycentral");
 remove_command("dh_pysupport");
 

=== modified file 'tests/Makefile'
--- tests/Makefile	2011-11-22 08:54:54 +0000
+++ tests/Makefile	2012-11-28 12:53:22 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # enable or disable tests here:
-TESTS := test1 test2 test3 test4 test5 test6
+TESTS := test1 test2 test3 test4 test5 test6 test7
 
 all: $(TESTS)
 

=== added file 'tests/common.mk'
--- tests/common.mk	1970-01-01 00:00:00 +0000
+++ tests/common.mk	2012-11-28 12:53:22 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+export DEBPYTHON_DEFAULT ?= $(shell sed -rne 's,^default-version = python(.*),\1,p' ../../debian/debian_defaults)
+export DEBPYTHON_SUPPORTED ?= $(shell sed -rne '/^supported-versions/{s/^supported-versions = (.*)/\1/g;s/python//g}' ../../debian/debian_defaults)
+
+all: run check
+
+run: clean
+	dpkg-buildpackage -b -us -uc
+
+clean-common:
+	./debian/rules clean

=== modified file 'tests/t1/Makefile'
--- tests/t1/Makefile	2011-09-27 18:21:42 +0000
+++ tests/t1/Makefile	2012-11-28 12:53:22 +0000
@@ -1,20 +1,16 @@
 #!/usr/bin/make -f
 
-all: run check
-
-DPY=$(shell PYTHONPATH=../../ python -c 'import debpython.version as v; print(v.vrepr(v.DEFAULT))')
-
-run: clean
-	dpkg-buildpackage -b -us -uc
+include ../common.mk
+DPY=$(DEBPYTHON_DEFAULT)
 
 check:
 	grep -q "Depends: .*python-mako" debian/python-foo/DEBIAN/control
+	grep -q 'python-foo (>= 2:0.1~rc2)' debian/python-foo/DEBIAN/control
 	test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/__init__.py
 	test ! -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/spam.py
 	grep -q "Depends: .*python (<<" debian/python-foo/DEBIAN/control
 	[ `readlink debian/python-foo/usr/lib/python$(DPY)/dist-packages/foo/absolute_link_to_tmp` = /tmp ]
 	[ `readlink debian/python-foo/usr/lib/python$(DPY)/dist-packages/foo/link_to_parent_dir` = .. ]
 
-clean:
-	./debian/rules clean
+clean: clean-common
 	rm -rf lib/Foo.egg-info

=== modified file 'tests/t1/debian/pydist-overrides'
--- tests/t1/debian/pydist-overrides	2010-09-12 18:41:04 +0000
+++ tests/t1/debian/pydist-overrides	2012-11-28 12:53:22 +0000
@@ -1,5 +1,5 @@
 Mako python-mako (>= 0.2)
 SQLAlchemy python-sqlalchemy (>= 0.6)
-Foo python-foo
+Foo python-foo; PEP386 s/^/2:/
 Bar python-bar
 Baz

=== modified file 'tests/t1/debian/rules'
--- tests/t1/debian/rules	2011-09-27 18:21:42 +0000
+++ tests/t1/debian/rules	2012-11-28 12:53:22 +0000
@@ -12,5 +12,5 @@
 	DH_VERBOSE=1 ../../dh_python2\
 		--depends 'SQLAlchemy >= 0.6.1'\
 		--recommends Mako\
-		--suggests 'Foo >= 0.1'\
+		--suggests 'Foo >= 0.1rc2'\
 		--suggests 'bar >= 1.0'

=== modified file 'tests/t2/Makefile'
--- tests/t2/Makefile	2011-03-21 10:22:06 +0000
+++ tests/t2/Makefile	2012-11-28 12:53:22 +0000
@@ -1,16 +1,10 @@
 #!/usr/bin/make -f
 
-all: run check
-
-
-run: clean
-	dpkg-buildpackage -b -us -uc
+include ../common.mk
+clean: clean-common
 
 check:
 	test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo.py
 	test -f debian/python-foo/usr/lib/python2.6/dist-packages/bar/bar.py
 	grep -q pycompile debian/python-foo/DEBIAN/postinst
 	grep -q pyclean debian/python-foo/DEBIAN/prerm
-
-clean:
-	./debian/rules clean

=== modified file 'tests/t3/Makefile'
--- tests/t3/Makefile	2011-10-06 00:22:16 +0000
+++ tests/t3/Makefile	2012-11-28 12:53:22 +0000
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-all: run check
-
-DPY=$(shell PYTHONPATH=../../ python -c 'import debpython.version as v; print(v.vrepr(v.DEFAULT))')
-
-run: clean
-	dpkg-buildpackage -b -us -uc
+include ../common.mk
+DPY=$(DEBPYTHON_DEFAULT)
 
 check:
 	grep -q "pycompile -p python-foo /usr/lib/python-foo -V $(DPY)"\
@@ -17,7 +13,10 @@
 	test -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz.so
 	test ! -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz.so.0.1
 	test ! -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz.so.0.1.2
+	test -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so
+	test ! -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0
+	test ! -L debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0
+	test ! -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0.0.0
 
-clean:
-	./debian/rules clean
+clean: clean-common
 	rm -rf lib/Foo.egg-info build

=== modified file 'tests/t3/debian/rules'
--- tests/t3/debian/rules	2011-10-06 00:22:16 +0000
+++ tests/t3/debian/rules	2012-11-28 12:53:22 +0000
@@ -19,4 +19,12 @@
 		/usr/lib/python${DPY}/dist-packages/foo/baz.so.0.1
 	dh_link /usr/lib/python${DPY}/dist-packages/foo/baz.so.0.1 \
 		/usr/lib/python${DPY}/dist-packages/foo/baz.so
+	# ... second style of multiple symlinks
+	cp debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/bar.so \
+	   debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0.0.0
+	dh_link /usr/lib/python${DPY}/dist-packages/foo/quux.so.0.0.0 \
+		/usr/lib/python${DPY}/dist-packages/foo/quux.so.0
+	dh_link /usr/lib/python${DPY}/dist-packages/foo/quux.so.0.0.0 \
+		/usr/lib/python${DPY}/dist-packages/foo/quux.so
+	# ... and complex multiple symlinks
 	DH_VERBOSE=1 ../../dh_python2

=== modified file 'tests/t4/Makefile'
--- tests/t4/Makefile	2011-09-27 18:21:42 +0000
+++ tests/t4/Makefile	2012-11-28 12:53:22 +0000
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-all: run check
-
-
-run: clean
-	dpkg-buildpackage -b -us -uc
+include ../common.mk
+clean: clean-common
 
 check:
 	grep -q python2.6 debian/foo/usr/share/foo/foo.py
@@ -14,6 +11,3 @@
 	grep -q python2.4 debian/foo/usr/share/foo/baz.py
 	test ! -x debian/foo/usr/share/foo/baz.py
 	grep -q Depends:.*python2.4 debian/foo/DEBIAN/control && false || true
-
-clean:
-	./debian/rules clean

=== modified file 'tests/t5/Makefile'
--- tests/t5/Makefile	2011-04-15 00:04:07 +0000
+++ tests/t5/Makefile	2012-11-28 12:53:22 +0000
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-all: run check
-
-
-run: clean
-	dpkg-buildpackage -b -us -uc
+include ../common.mk
+clean: clean-common
 
 check:
 	# test dh_python2
@@ -29,6 +26,3 @@
 	do [ `ls debian/python-foo/usr/lib/python2.*/*-packages/$$i/__init__.py 2>/dev/null || true | wc -l` = 0 ];\
 	[ `ls debian/python-foo/usr/lib/python2.*/*-packages/$$i/__init__.pyc 2>/dev/null || true | wc -l` = 0 ];\
 	done
-
-clean:
-	./debian/rules clean

=== modified file 'tests/t6/Makefile'
--- tests/t6/Makefile	2011-11-22 08:54:54 +0000
+++ tests/t6/Makefile	2012-11-28 12:53:22 +0000
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-all: run check
-
-
-run: clean
-	dpkg-buildpackage -b -us -uc
+include ../common.mk
+clean: clean-common
 
 check:
 	# python2.4 hardcoded via `dh_python2 -V 2.4`
@@ -19,6 +16,3 @@
 	grep -q Depends:.*python2.6 debian/foo/DEBIAN/control
 	grep -q '\-V 2.6 /usr/share/foo' debian/foo/usr/share/python/runtime.d/foo.rtupdate
 	grep -q '/usr/share/foo \-V 2.6' debian/foo/DEBIAN/postinst
-
-clean:
-	./debian/rules clean

=== modified file 'tests/t6/bar.py' (properties changed: -x to +x)
=== modified file 'tests/t6/foo.py' (properties changed: -x to +x)
=== added directory 'tests/t7'
=== added file 'tests/t7/Makefile'
--- tests/t7/Makefile	1970-01-01 00:00:00 +0000
+++ tests/t7/Makefile	2012-11-28 12:53:22 +0000
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+include ../common.mk
+clean: clean-common
+
+check:
+	# python2.4 hardcoded via `dh_python2 -shebang ...python2.4`
+	grep -q '\-V 2.4 /usr/share/baz24' debian/foo/usr/share/python/runtime.d/foo.rtupdate
+	grep -q '/usr/share/baz24 \-V 2.4' debian/foo/DEBIAN/postinst
+	grep -q '#! /usr/bin/python2.4 -OO' debian/foo/usr/share/baz24/baz.py
+	# python2.6 hardcoded via shebang
+	grep -q '\-V 2.6 /usr/share/foo' debian/foo/usr/share/python/runtime.d/foo.rtupdate
+	grep -q '/usr/share/foo \-V 2.6' debian/foo/DEBIAN/postinst
+	# /env removed from shebang 
+	grep -q '#! /usr/bin/python' debian/foo/usr/share/bar/bar.py
+	# /local removed from shebang 
+	grep -q '#! /usr/bin/python' debian/foo/usr/share/foo/baz.py
+	grep -q '#! /usr/bin/python2.6' debian/foo/usr/share/foo/foo.py

=== added file 'tests/t7/bar.py'
--- tests/t7/bar.py	1970-01-01 00:00:00 +0000
+++ tests/t7/bar.py	2012-11-28 12:53:22 +0000
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+"env in shebang"

=== added file 'tests/t7/baz.py'
--- tests/t7/baz.py	1970-01-01 00:00:00 +0000
+++ tests/t7/baz.py	2012-11-28 12:53:22 +0000
@@ -0,0 +1,2 @@
+#!/usr/local/bin/python
+"/usr/local in shebang"

=== added directory 'tests/t7/debian'
=== added file 'tests/t7/debian/changelog'
--- tests/t7/debian/changelog	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/changelog	2012-11-28 12:53:22 +0000
@@ -0,0 +1,5 @@
+foo (1.0) unstable; urgency=low
+
+  * Initial release
+
+ -- Piotr Ożarowski <[e-mail]>  Sun, 10 Jun 2012 14:09:45 +0200

=== added file 'tests/t7/debian/compat'
--- tests/t7/debian/compat	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/compat	2012-11-28 12:53:22 +0000
@@ -0,0 +1,1 @@
+8

=== added file 'tests/t7/debian/control'
--- tests/t7/debian/control	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/control	2012-11-28 12:53:22 +0000
@@ -0,0 +1,13 @@
+Source: foo
+Section: misc
+Priority: optional
+Maintainer: Piotr Ożarowski <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: python
+Standards-Version: 3.9.3
+
+Package: foo
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: example 7 - shebangs
+ exemple package #7 - shebang related tests

=== added file 'tests/t7/debian/copyright'
--- tests/t7/debian/copyright	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/copyright	2012-11-28 12:53:22 +0000
@@ -0,0 +1,2 @@
+The Debian packaging is © 2012, Piotr Ożarowski <[e-mail]> and
+is licensed under the MIT License.

=== added file 'tests/t7/debian/install'
--- tests/t7/debian/install	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/install	2012-11-28 12:53:22 +0000
@@ -0,0 +1,7 @@
+foo.py /usr/share/foo/
+baz.py /usr/share/foo/
+spam.py /usr/share/foo/
+bar.py /usr/share/bar/
+spam.py /usr/share/bar/
+baz.py /usr/share/baz24/
+spam.py /usr/share/baz24/

=== added file 'tests/t7/debian/rules'
--- tests/t7/debian/rules	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/rules	2012-11-28 12:53:22 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+%:
+	dh $@ --buildsystem=python_distutils
+
+override_dh_pysupport:
+	DH_VERBOSE=1 ../../dh_python2
+	DH_VERBOSE=1 ../../dh_python2 /usr/share/bar
+	DH_VERBOSE=1 ../../dh_python2 /usr/share/baz24 --shebang '/usr/bin/python2.4 -OO'
+
+clean:
+	dh_clean

=== added directory 'tests/t7/debian/source'
=== added file 'tests/t7/debian/source/format'
--- tests/t7/debian/source/format	1970-01-01 00:00:00 +0000
+++ tests/t7/debian/source/format	2012-11-28 12:53:22 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added file 'tests/t7/foo.py'
--- tests/t7/foo.py	1970-01-01 00:00:00 +0000
+++ tests/t7/foo.py	2012-11-28 12:53:22 +0000
@@ -0,0 +1,2 @@
+#!/usr/local/bin/python2.6
+"/usr/local/bin/python2.6 hardcoded in shebang"

=== added file 'tests/t7/setup.py'
=== added file 'tests/t7/spam.py'
--- tests/t7/spam.py	1970-01-01 00:00:00 +0000
+++ tests/t7/spam.py	2012-11-28 12:53:22 +0000
@@ -0,0 +1,1 @@
+print('spam')