Merge lp:~mitya57/ubuntu/saucy/python-defaults/2.7.5-5ubuntu1 into lp:ubuntu/saucy/python-defaults

[Dmitry Shachnev]

This merges an important bugfix from Debian [1], and brings us closer to Debian (there is only one remaining change).

[1]: http://lists.debian.org/debian-python/2013/08/msg00012.html
     http://lists.debian.org/debian-python/2013/08/msg00013.html

[Barry Warsaw (barry)]

Thanks!

review: Approve

Unmerged revisions

107. By Dmitry Shachnev on 2013-09-14

Add a changelog entry

106. By Dmitry Shachnev on 2013-09-14

Merge lp:debian/python-defaults

105. By Steve Langasek on 2013-09-12

releasing package python-defaults version 2.7.5-4ubuntu2

104. By Steve Langasek on 2013-09-12

Adjust debpython/depends.py to be multiarch-friendly. Closes: #722046.

=== modified file 'Makefile'
--- Makefile	2013-08-19 11:46:54 +0000
+++ Makefile	2013-09-14 10:16:35 +0000
@@ -17,7 +17,7 @@
 	$(INSTALL) -m 755 runtime.d/* $(DESTDIR)$(PREFIX)/share/python/runtime.d/
 	$(INSTALL) -m 644 autoscripts/* $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts/
 	$(INSTALL) -m 755 dh_python2 $(DESTDIR)$(PREFIX)/share/python/
-	$(INSTALL) -m 755 dh_python2.sh $(DESTDIR)$(PREFIX)/bin/dh_python2
+	$(INSTALL) -m 755 dh_python2.py $(DESTDIR)$(PREFIX)/bin/dh_python2
 	$(INSTALL) -m 644 python2.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/
 
 install-runtime:

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-12 20:36:15 +0000
+++ debian/changelog	2013-09-14 10:16:35 +0000
@@ -1,3 +1,23 @@
+python-defaults (2.7.5-5ubuntu1) saucy; urgency=low
+
+  * Merge with Debian unstable, remaining change:
+    - Set minimal required python version to 2.7.1.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 14 Sep 2013 14:10:23 +0400
+
+python-defaults (2.7.5-5) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Adjust debpython/depends.py to be multiarch-friendly.
+
+  [ Piotr Ożarowski ]
+  * Set "Multi-Arch: allowed" in python, python-dev, python-minimal,
+    python-dbg, python-all, python-all-dev, python-all-dbg
+  * Replace /usr/bin/dh_python2 with a Python script that invokes
+    dh-python's dh_python2 if Build-Depends{,-Indep} contains dh-python
+
+ -- Piotr Ożarowski <[e-mail]>  Thu, 12 Sep 2013 21:25:01 +0200
+
 python-defaults (2.7.5-4ubuntu2) saucy; urgency=low
 
   * Adjust debpython/depends.py to be multiarch-friendly.  Closes: #722046.

=== modified file 'debpython/version.py'
--- debpython/version.py	2013-08-19 11:46:54 +0000
+++ debpython/version.py	2013-09-14 10:16:35 +0000
@@ -67,7 +67,7 @@
     :type available: bool
 
     >>> sorted(get_requested_versions([(2, 5), (3, 0)]))
-    [(2, 6), (2, 7)]
+    [(2, 7)]
     >>> sorted(get_requested_versions('')) == sorted(SUPPORTED)
     True
     >>> sorted(get_requested_versions([None, None])) == sorted(SUPPORTED)

=== added file 'dh_python2.py'
--- dh_python2.py	1970-01-01 00:00:00 +0000
+++ dh_python2.py	2013-09-14 10:16:35 +0000
@@ -0,0 +1,36 @@
+#! /usr/bin/python
+
+from os.path import exists
+from subprocess import call
+from sys import argv
+from re import compile
+
+OLD = '/usr/share/python/dh_python2'
+NEW = '/usr/share/dh-python/dh_python2'
+has_dhpython = compile(r'(^|:|\s|,)dh-python($|\s|,|\()').search
+
+binary = OLD
+if exists(NEW) and exists('debian/control'):
+    with open('debian/control', 'r') as fp:
+        inside = False
+        for line in fp:
+            if not line:
+                break
+            line_lower = line.lower()
+            if inside:
+                if line.startswith((' ', "\t")):
+                    if has_dhpython(line):
+                        binary = NEW
+                        break
+                    continue
+                elif line.startswith('#'):
+                    continue
+                inside = False
+            if line_lower.startswith(('build-depends:', 'build-depends-indep:')):
+                if has_dhpython(line):
+                    binary = NEW
+                    break
+                inside = True
+
+argv[0] = binary
+exit(call(argv))

=== removed file 'dh_python2.sh'
--- dh_python2.sh	2013-08-02 08:54:32 +0000
+++ dh_python2.sh	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-if [ -f /usr/share/dh-python/dh_python2 ] &&\
-    grep -q dh-python ./debian/control 2>/dev/null
-then
-  exec /usr/share/dh-python/dh_python2 $@
-else
-  exec /usr/share/python/dh_python2 $@
-fi

=== modified file 'pyclean.rst'
--- pyclean.rst	2013-08-19 11:46:54 +0000
+++ pyclean.rst	2013-09-14 10:16:35 +0000
@@ -24,3 +24,4 @@
 -q, --quiet	be quiet
 
 -p PACKAGE, --package=PACKAGE	specify Debian package name to clean
+  (combining with DIR_OR_FILE will additionally limit list of files)

=== modified file 'pycompile.rst'
--- pycompile.rst	2013-08-19 11:46:54 +0000
+++ pycompile.rst	2013-09-14 10:16:35 +0000
@@ -35,7 +35,8 @@
 -v, --verbose	turn verbose mode on
 
 -p PACKAGE, --package=PACKAGE	specify Debian package name whose files should
-  be bytecompiled
+  be bytecompiled (combining with DIR_OR_FILE will additionally limit list of
+  files)
 
 -V VRANGE	force private modules to be bytecompiled with Python
   version from given range, regardless of the default Python version in the

=== modified file 'tests/common.mk'
--- tests/common.mk	2012-10-21 22:40:55 +0000
+++ tests/common.mk	2013-09-14 10:16:35 +0000
@@ -1,7 +1,7 @@
 #!/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)
+export DEBPYTHON_SUPPORTED ?= $(shell sed -rne '/^supported-versions/{s/^supported-versions = (.*)/\1/g;s/python//gp}' ../../debian/debian_defaults)
 
 all: run check
 

=== modified file 'tests/t1/Makefile'
--- tests/t1/Makefile	2012-12-12 09:17:34 +0000
+++ tests/t1/Makefile	2013-09-14 10:16:35 +0000
@@ -6,7 +6,9 @@
 check:
 	grep -q "Depends: .*python-mako" debian/python-foo/DEBIAN/control
 	grep -q 'python-foo (>= 2:0.1~rc2)' debian/python-foo/DEBIAN/control
+ifneq (,$(findstring 2.6,$(DEBPYTHON_SUPPORTED)))
 	test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/__init__.py
+endif
 	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" ]

=== modified file 'tests/t2/Makefile'
--- tests/t2/Makefile	2012-06-30 20:23:59 +0000
+++ tests/t2/Makefile	2013-09-14 10:16:35 +0000
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 
 include ../common.mk
+DPY=$(DEBPYTHON_DEFAULT)
 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
+	test -f debian/python-foo/usr/lib/python$(DPY)/dist-packages/foo.py
+	test -f debian/python-foo/usr/lib/python$(DPY)/dist-packages/bar/bar.py
 	grep -q pycompile debian/python-foo/DEBIAN/postinst
 	grep -q pyclean debian/python-foo/DEBIAN/prerm

=== modified file 'tests/t4/Makefile'
--- tests/t4/Makefile	2012-06-30 20:23:59 +0000
+++ tests/t4/Makefile	2013-09-14 10:16:35 +0000
@@ -5,7 +5,9 @@
 
 check:
 	grep -q python2.6 debian/foo/usr/share/foo/foo.py
+ifneq (,$(findstring 2.6,$(DEBPYTHON_SUPPORTED)))
 	grep -q Depends:.*python2.6 debian/foo/DEBIAN/control
+endif
 	#grep -q python2.5 debian/foo/usr/share/bar/bar.py
 	#grep -q Depends:.*python2.5 debian/foo/DEBIAN/control
 	grep -q python2.4 debian/foo/usr/share/foo/baz.py

=== modified file 'tests/t6/Makefile'
--- tests/t6/Makefile	2012-11-28 14:50:19 +0000
+++ tests/t6/Makefile	2013-09-14 10:16:35 +0000
@@ -13,6 +13,8 @@
 	grep -q '\-V 2.5 /usr/share/bar25' debian/foo/usr/share/python/runtime.d/foo.rtupdate
 	grep -q '/usr/share/bar25 \-V 2.5' debian/foo/DEBIAN/postinst
 	# python2.6 hardcoded via shebang
+ifneq (,$(findstring 2.6,$(DEBPYTHON_SUPPORTED)))
 	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
+endif