r40374 - in /desktop/unstable/pygobject/debian: changelog patches/00git_non_recursive_make_python.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Fri Dec 27 14:31:55 2013
New Revision: 40374

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40374
Log:
00git_non_recursive_make_python.patch: Avoid clash between gi/types.py and
the Python standard library when installing, which broke installation with
Python 3.4 (https://bugzilla.gnome.org/show_bug.cgi?id=721025).

Added:
    desktop/unstable/pygobject/debian/patches/00git_non_recursive_make_python.patch
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/series

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=40374&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog	[utf-8] Fri Dec 27 14:31:55 2013
@@ -2,6 +2,9 @@
 
   [ Colin Watson ]
   * Fix building for multiple Python 3 versions.
+  * 00git_non_recursive_make_python.patch: Avoid clash between gi/types.py and
+    the Python standard library when installing, which broke installation with
+    Python 3.4 (https://bugzilla.gnome.org/show_bug.cgi?id=721025).
 
  -- Martin Pitt <mpitt at debian.org>  Fri, 27 Dec 2013 15:29:08 +0100
 

Added: desktop/unstable/pygobject/debian/patches/00git_non_recursive_make_python.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/00git_non_recursive_make_python.patch?rev=40374&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/00git_non_recursive_make_python.patch	(added)
+++ desktop/unstable/pygobject/debian/patches/00git_non_recursive_make_python.patch	[utf-8] Fri Dec 27 14:31:55 2013
@@ -0,0 +1,85 @@
+Description: Avoid clash between gi/types.py and the Python standard library
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=721025
+Last-Update: 2013-12-25
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,9 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ AUTOMAKE_OPTIONS = 1.7
+ 
++# Part of the gi subdirectory is handled with non-recursive make to avoid
++# py-compile getting confused between gi/types.py and Python's standard
++# types module.
+ SUBDIRS = examples gi tests pygtkcompat
+ 
+ PLATFORM_VERSION = 3.0
+@@ -49,6 +52,27 @@
+ BUILT_EXTRA_DIST = 		\
+ 	ChangeLog
+ 
++nobase_pyexec_PYTHON = \
++	gi/__init__.py \
++	gi/types.py \
++	gi/module.py \
++	gi/importer.py \
++	gi/pygtkcompat.py \
++	gi/docstring.py
++
++# if we build in a separate tree, we need to symlink the *.py files from the
++# source tree; Python does not accept the extensions and modules in different
++# paths
++build_pylinks:
++	for f in $(nobase_pyexec_PYTHON); do \
++		[ -e $(builddir)/$$f ] || \
++			$(LN_S) $(abs_srcdir)/$$f $(builddir)/$$f; \
++	done
++
++all-local: build_pylinks
++
++check-local: build_pylinks
++
+ # pkg-config files
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
+Index: b/gi/Makefile.am
+===================================================================
+--- a/gi/Makefile.am
++++ b/gi/Makefile.am
+@@ -26,14 +26,6 @@
+ 
+ pygidir = $(pyexecdir)/gi
+ 
+-pygi_PYTHON = \
+-	__init__.py \
+-	types.py \
+-	module.py \
+-	importer.py \
+-	pygtkcompat.py \
+-	docstring.py
+-
+ pygi_LTLIBRARIES = _gi.la
+ 
+ _gi_la_SOURCES = \
+@@ -118,16 +110,8 @@
+ %$(PYTHON_SO): %.la
+ 	$(LN_S) -f .libs/$@ $@
+ 
+-# if we build in a separate tree, we need to symlink the *.py files from the
+-# source tree; Python does not accept the extensions and modules in different
+-# paths
+-build_pylinks:
+-	for f in $(pygi_PYTHON); do \
+-	    [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \
+-	done
+-
+-all-local: $(LTLIBRARIES:.la=$(PYTHON_SO)) build_pylinks
++all-local: $(LTLIBRARIES:.la=$(PYTHON_SO))
+ 
+-check-local: $(LTLIBRARIES:.la=$(PYTHON_SO)) build_pylinks
++check-local: $(LTLIBRARIES:.la=$(PYTHON_SO))
+ clean-local:
+ 	rm -f $(LTLIBRARIES:.la=$(PYTHON_SO))

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=40374&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series	[utf-8] Fri Dec 27 14:31:55 2013
@@ -1 +1,2 @@
+00git_non_recursive_make_python.patch
 01_cairo_region.patch