Merge lp:~mitya57/ubuntu/raring/python3-defaults/3.3.0-3ubuntu1 into lp:ubuntu/raring/python3-defaults

[Dmitry Shachnev]

This merges 3.3.0-3 upload from Debian. Half of changes in that upload are already applied in Ubuntu, another half is only bugfixes. That is also needed for quantal/precise pybuild backport I'm working on (lp:~mitya57/ubuntu/quantal/python3-defaults/pybuild-backport).

Changes that are in 3.3.0-3 but not yet in Ubuntu:

 [ Piotr Ożarowski ]
 * pybuild:
   - distutils plugin: do not skip build in install target
     (ugly workaround for yet another distutils "feature",
     closes: #701137)
   - do not run tests if DEB_BUILD_OPTIONS contains "nocheck"
 * dh_python3:
   - no longer sensitive to trailing slash in private dir names
     (closes: #701215)
 * Bump minimum required dpkg-dev build dependency to 1.16.1~
   (due to architecture.mk in debian/rules)

 [ Dmitry Shachnev ]
 * Added missing docinfo to man pages, to fix a lintian warning
   (Closes: #702777).

 [ Matthias Klose ]
 * dh_python3: Use the multiarch tuple for the host (if DEB_HOST_MULTIARCH
   is set in the environment).

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-06 18:33:16 +0000
+++ debian/changelog	2013-03-21 15:07:21 +0000
@@ -1,3 +1,51 @@
+python3-defaults (3.3.0-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+    - Drop python3.2 as a supported python3 version.
+    - Make python3-{all,all-dev,all-dbg} Multi-Arch: allowed.
+    - Move debiandoc-sgml and lsb-release from Build-Depends-Indep to
+      Build-Depends.
+    - Build libpython3-all-{dev,dbg} and libpython3-stdlib packages.
+    - Build-depend on python:any instead of python.
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 21 Mar 2013 18:51:30 +0400
+
+python3-defaults (3.3.0-3) experimental; urgency=low
+
+  [ Piotr Ożarowski ]
+  * pybuild:
+    - add --ext-dest-dir (PYBUILD_EXT_DESTDIR) and --ext-pattern
+      (PYBUILD_EXT_PATTERN) options to move files after install step
+    - save before/after command logs if quiet mode is on
+    - do not warn about limiting versions if there's only one
+    - distutils plugin: do not skip build in install target
+      (ugly workaround for yet another distutils "feature",
+      closes: #701137)
+    - do not run tests if DEB_BUILD_OPTIONS contains "nocheck"
+  * dh_python3:
+    - add version range to py3compile in maintainer scripts
+    - no longer sensitive to trailing slash in private dir names
+      (closes: #701215)
+  * Bump minimum required dpkg-dev build dependency to 1.16.1~
+    (due to architecture.mk in debian/rules)
+
+  [ Dmitry Shachnev ]
+  * Include architecture.mk in debian/rules instead of defining
+    DEB_HOST_* manually.
+  * tests/t1: Build-depend on python3-all instead of python-all.
+  * Make tests work without python-support installed.
+  * debian/tests/control: Add a dependency on libjs-jquery (test1 contains
+    a symlink to /usr/share/javascript/jquery/jquery.js).
+  * Added missing docinfo to man pages, to fix a lintian warning
+    (Closes: #702777).
+
+  [ Matthias Klose ]
+  * dh_python3: Use the multiarch tuple for the host (if DEB_HOST_MULTIARCH
+    is set in the environment).
+  * Add a libpython3-stdlib package (not yet built).
+
+ -- Piotr Ożarowski <[e-mail]>  Sun, 17 Mar 2013 13:47:29 +0100
+
 python3-defaults (3.3.0-2ubuntu9) raring; urgency=low
 
   * Build-depend on python:any instead of python.

=== modified file 'debian/control'
--- debian/control	2013-03-06 18:33:16 +0000
+++ debian/control	2013-03-21 15:07:21 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
 Uploaders: Piotr Ożarowski <[e-mail]>, Scott Kitterman <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), python:any, debiandoc-sgml, python-docutils, lsb-release
+Build-Depends: debhelper (>= 7.0.50~), python:any, debiandoc-sgml, python-docutils, lsb-release, dpkg-dev (>= 1.16.1~)
 Build-Depends-Indep: libhtml-tree-perl
 Standards-Version: 3.9.3
 Homepage: http://www.python.org/

=== modified file 'debian/control.in'
--- debian/control.in	2013-03-06 18:33:16 +0000
+++ debian/control.in	2013-03-21 15:07:21 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Matthias Klose <[e-mail]>
 Uploaders: Piotr Ożarowski <[e-mail]>, Scott Kitterman <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), python:any, debiandoc-sgml, python-docutils, lsb-release
+Build-Depends: debhelper (>= 7.0.50~), python:any, debiandoc-sgml, python-docutils, lsb-release, dpkg-dev (>= 1.16.1~)
 Build-Depends-Indep: libhtml-tree-perl
 Standards-Version: 3.9.3
 Homepage: http://www.python.org/

=== modified file 'debpython/build/plugin_distutils.py'
--- debpython/build/plugin_distutils.py	2013-01-24 15:48:55 +0000
+++ debpython/build/plugin_distutils.py	2013-03-21 15:07:21 +0000
@@ -48,8 +48,7 @@
                                '[install]\n',
                                'install-layout=deb\n',
                                'install-lib={}\n'.format(args['install_dir']),
-                               'root={}\n'.format(args['destdir']),
-                               'skip-build=1\n'])
+                               'root={}\n'.format(args['destdir'])])
         context['ENV']['HOME'] = args['home_dir']
         return func(self, context, args, *oargs, **kwargs)
 

=== modified file 'debpython/interpreter.py'
--- debpython/interpreter.py	2013-01-24 15:48:55 +0000
+++ debpython/interpreter.py	2013-03-21 15:07:21 +0000
@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 import logging
+import os
 import re
 from os.path import join, split
 from debpython.version import Version
@@ -339,7 +340,12 @@
             cmd = 'from distutils import sysconfig as s;'
         cmd += 'print("__SEP__".join(i or "" ' \
                'for i in s.get_config_vars("SOABI", "MULTIARCH")))'
-        return self._execute(cmd, version).split('__SEP__')
+        conf_vars = self._execute(cmd, version).split('__SEP__')
+        try:
+            conf_vars[1] = os.environ['DEB_HOST_MULTIARCH']
+        except KeyError:
+            pass
+        return conf_vars
 
     def _execute(self, command, version=None, cache=True):
         version = Version(version or self.version)

=== modified file 'dh_python3'
--- dh_python3	2013-01-24 15:48:55 +0000
+++ dh_python3	2013-03-21 15:07:21 +0000
@@ -156,8 +156,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 2.X locations

=== modified file 'dh_python3.rst'
--- dh_python3.rst	2013-01-24 15:48:55 +0000
+++ dh_python3.rst	2013-03-21 15:07:21 +0000
@@ -6,6 +6,9 @@
 calculates Python dependencies, adds maintainer scripts to byte compile files, etc.
 -----------------------------------------------------------------------------------
 
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
 SYNOPSIS
 ========
   dh_python3 -p PACKAGE [-V [X.Y][-][A.B]] DIR [-X REGEXPR]

=== modified file 'py3clean.rst'
--- py3clean.rst	2012-11-26 09:20:46 +0000
+++ py3clean.rst	2013-03-21 15:07:21 +0000
@@ -6,6 +6,9 @@
 removes .pyc and .pyo files
 ---------------------------
 
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
 SYNOPSIS
 ========
   py3clean [-V VERSION] [-p PACKAGE] [DIR_OR_FILE]

=== modified file 'py3compile.rst'
--- py3compile.rst	2012-11-26 09:20:46 +0000
+++ py3compile.rst	2013-03-21 15:07:21 +0000
@@ -1,11 +1,14 @@
-===========
+============
  py3compile
-===========
+============
 
 ----------------------------------
 byte compile Python 3 source files
 ----------------------------------
 
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
 SYNOPSIS
 ========
   py3compile [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]

=== modified file 'pybuild'
--- pybuild	2013-01-24 15:48:55 +0000
+++ pybuild	2013-03-21 15:07:21 +0000
@@ -46,6 +46,10 @@
             print(name, '\t', Plugin.DESCRIPTION)
         exit(0)
 
+    nocheck = False
+    if 'DEB_BUILD_OPTIONS' in environ:
+        nocheck = 'nocheck' in environ['DEB_BUILD_OPTIONS']
+
     if cfg.system:
         certainty = 99
         Plugin = build.plugins.get(cfg.system)
@@ -63,9 +67,12 @@
                 log.warn('cannot initialize %s plugin: %s', Plugin.NAME,
                          err, exc_info=cfg.verbose)
                 continue
-            tmp_context = {'ENV': environ.copy(), 'args': {}, 'dir': cfg.dir}
-            tmp_context['ENV'].update({'LC_ALL': 'C',
-                                       'http_proxy': 'http://127.0.0.1:9/'})
+            env = environ.copy()
+            if 'LC_ALL' not in env:
+                env['LC_ALL'] = 'C'
+            if 'http_proxy' not in env:
+                env['http_proxy'] = 'http://127.0.0.1:9/'
+            tmp_context = {'ENV': env, 'args': {}, 'dir': cfg.dir}
             tmp_certainty = tmp_plugin.detect(tmp_context)
             if tmp_certainty and tmp_certainty > certainty:
                 plugin, certainty, context = tmp_plugin, tmp_certainty, tmp_context
@@ -217,6 +224,8 @@
     ### one function for each interpreter at a time mode ###
     if func:
         step = func.__func__.__name__
+        if step == 'test' and nocheck:
+            exit(0)
         for interpreter in cfg.interpreter:
             iversions = versions
             if '{version}' not in interpreter and len(versions) > 1:
@@ -273,7 +282,7 @@
                     if ext_destdir:
                         move_matching_files(c['destdir'], ext_destdir,
                                             get_option('ext_pattern', i, version))
-                if not is_disabled('test', i, version):
+                if not nocheck and not is_disabled('test', i, version):
                     run(plugin.test, i, version, c)
     except Exception as err:
         log.error('plugin %s failed: %s', plugin.NAME, err,

=== modified file 'pybuild.rst'
--- pybuild.rst	2013-01-24 15:48:55 +0000
+++ pybuild.rst	2013-03-21 15:07:21 +0000
@@ -6,6 +6,9 @@
 invokes various build systems for requested Python versions in order to build modules and extensions
 ----------------------------------------------------------------------------------------------------
 
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
 SYNOPSIS
 ========
   pybuild [ACTION] [BUILD SYSTEM ARGUMENTS] [DIRECTORIES] [OPTIONS]