Package: nautilus-python
Version: 1.1-3
Severity: normal
Tags: patch
User: debian-pyt...@lists.debian.org
Usertags: origin-ubuntu raring ubuntu-patch multiarch
*** /tmp/tmp1Ob06B/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with python multiarch headers; Add dh-autoreconf to control;
Add autoreconf to rules
- update debian/control
- update debian/rules
- add debian/patches/02_python_multiarch_path.patch
- update debian/patches/series
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-35-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru nautilus-python-1.1/debian/changelog nautilus-python-1.1/debian/changelog
diff -Nru nautilus-python-1.1/debian/control nautilus-python-1.1/debian/control
--- nautilus-python-1.1/debian/control.in 2011-12-14 17:52:05.000000000 -0600
+++ nautilus-python-1.1/debian/control.in 2013-01-06 18:05:37.000000000 -0600
@@ -4,14 +4,15 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8),
+ dh-autoreconf,
cdbs,
gnome-pkg-tools,
python-dev,
python-gi-dev,
libnautilus-extension-dev (>= 3.0)
Standards-Version: 3.9.2
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/nautilus-python
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/nautilus-python/
Package: python-nautilus
Architecture: any
diff -Nru nautilus-python-1.1/debian/patches/02_python_multiarch_path.patch nautilus-python-1.1/debian/patches/02_python_multiarch_path.patch
--- nautilus-python-1.1/debian/patches/02_python_multiarch_path.patch 1969-12-31 18:00:00.000000000 -0600
+++ nautilus-python-1.1/debian/patches/02_python_multiarch_path.patch 2013-01-06 17:55:00.000000000 -0600
@@ -0,0 +1,15 @@
+Description: Include Python multiarch headers
+ Use python-config to find the python include dirs
+Author: Micah Gersten <mic...@ubuntu.com>
+
+--- nautilus-python-1.1.orig/m4/python.m4
++++ nautilus-python-1.1/m4/python.m4
+@@ -45,7 +45,7 @@ AC_MSG_CHECKING(for headers required to
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
+ py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
+-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++PYTHON_INCLUDES=`python-config --includes`
+ if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
diff -Nru nautilus-python-1.1/debian/patches/series nautilus-python-1.1/debian/patches/series
--- nautilus-python-1.1/debian/patches/series 2011-12-14 17:46:10.000000000 -0600
+++ nautilus-python-1.1/debian/patches/series 2013-01-06 17:55:33.000000000 -0600
@@ -1,2 +1,3 @@
00git_open_terminal_example_GI.patch
01_port_examples_to_GI.patch
+02_python_multiarch_path.patch
diff -Nru nautilus-python-1.1/debian/rules nautilus-python-1.1/debian/rules
--- nautilus-python-1.1/debian/rules 2011-12-14 17:46:10.000000000 -0600
+++ nautilus-python-1.1/debian/rules 2013-01-06 17:57:56.000000000 -0600
@@ -5,6 +5,7 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_INSTALL_EXAMPLES_python-nautilus := $(wildcard examples/*.py) examples/README
DEB_DH_MAKESHLIBS_ARGS_python-nautilus += --no-act
