r39712 - in /packages/unstable/nautilus-python/debian: changelog control control.in patches/02_python_multiarch_path.patch patches/series rules

ah at users.alioth.debian.org ah at users.alioth.debian.org
Wed Oct 9 22:02:03 UTC 2013 

Author: ah
Date: Wed Oct  9 22:02:02 2013
New Revision: 39712

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39712
Log:
* Team upload.
* Sync with ubuntu (Closes: #697565, #558613, #725665)
  - debian/control(.in) changes excluded except added dh-autoreconf b-d
* d/p/02_python_multiarch_path.patch: Follow up fix for i386 multiarch.
  (LP: #1170017)
* debian/patches/02_python_multiarch_path.patch: Add 64bit multiarch
  search paths for libpython2.7.so.  (LP: #1170017)
* 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

Added:
    packages/unstable/nautilus-python/debian/patches/02_python_multiarch_path.patch
Modified:
    packages/unstable/nautilus-python/debian/changelog
    packages/unstable/nautilus-python/debian/control
    packages/unstable/nautilus-python/debian/control.in
    packages/unstable/nautilus-python/debian/patches/series
    packages/unstable/nautilus-python/debian/rules

Modified: packages/unstable/nautilus-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/changelog?rev=39712&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/changelog	[utf-8] (original)
+++ packages/unstable/nautilus-python/debian/changelog	[utf-8] Wed Oct  9 22:02:02 2013
@@ -1,3 +1,38 @@
+nautilus-python (1.1-4) unstable; urgency=low
+
+  * Team upload.
+  * Sync with ubuntu (Closes: #697565, #558613, #725665)
+    - debian/control(.in) changes excluded except added dh-autoreconf b-d
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 09 Oct 2013 23:48:55 +0200
+
+nautilus-python (1.1-3ubuntu3) saucy; urgency=low
+
+  [ Doug McMahon ]
+  * d/p/02_python_multiarch_path.patch: Follow up fix for i386 multiarch.
+    (LP: #1170017)
+
+ -- Barry Warsaw <barry at ubuntu.com>  Wed, 29 May 2013 16:34:23 -0400
+
+nautilus-python (1.1-3ubuntu2) saucy; urgency=low
+
+  [ Dr.Amr Osman ]
+  * debian/patches/02_python_multiarch_path.patch: Add 64bit multiarch
+    search paths for libpython2.7.so.  (LP: #1170017)
+
+ -- Barry Warsaw <barry at ubuntu.com>  Tue, 28 May 2013 16:26:27 -0400
+
+nautilus-python (1.1-3ubuntu1) raring; urgency=low
+
+  * 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
+
+ -- Micah Gersten <micahg at ubuntu.com>  Sun, 06 Jan 2013 17:52:30 -0600
+
 nautilus-python (1.1-3) unstable; urgency=low
 
   * Bump debhelper compatibility to 8.

Modified: packages/unstable/nautilus-python/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/control?rev=39712&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/control	[utf-8] (original)
+++ packages/unstable/nautilus-python/debian/control	[utf-8] Wed Oct  9 22:02:02 2013
@@ -7,8 +7,9 @@
 Section: python
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Ross Burton <ross at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 8),
+               dh-autoreconf,
                cdbs,
                gnome-pkg-tools,
                python-dev,

Modified: packages/unstable/nautilus-python/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/control.in?rev=39712&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/control.in	[utf-8] (original)
+++ packages/unstable/nautilus-python/debian/control.in	[utf-8] Wed Oct  9 22:02:02 2013
@@ -4,6 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8),
+               dh-autoreconf,
                cdbs,
                gnome-pkg-tools,
                python-dev,

Added: packages/unstable/nautilus-python/debian/patches/02_python_multiarch_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/02_python_multiarch_path.patch?rev=39712&op=file
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/02_python_multiarch_path.patch	(added)
+++ packages/unstable/nautilus-python/debian/patches/02_python_multiarch_path.patch	[utf-8] Wed Oct  9 22:02:02 2013
@@ -0,0 +1,36 @@
+Description: Include Python multiarch headers and library search paths
+ Use python-config to find the python include dirs
+Author: Micah Gersten <micahg at ubuntu.com>
+
+--- a/m4/python.m4
++++ b/m4/python.m4
+@@ -45,7 +45,7 @@
+ 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
+@@ -85,7 +85,7 @@
+   dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+   dnl default, namely "lib".
+   enable_lib64="$1"
+-  libdirsuffix=""
++  libdirsuffix="/i386-linux-gnu/"
+   searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+   if test "$enable_lib64" = "yes" -a -n "$searchpath"; then
+     save_IFS="${IFS=    }"; IFS=":"
+@@ -93,9 +93,11 @@
+       if test -d "$searchdir"; then
+         case "$searchdir" in
+           */lib64/ | */lib64 ) libdirsuffix=64 ;;
++          /lib/x86_64-linux-gnu/ | /lib/x86_64-linux-gnu ) libdirsuffix=/x86_64-linux-gnu ;;
+           *) searchdir=`cd "$searchdir" && pwd`
+              case "$searchdir" in
+                */lib64 ) libdirsuffix=64 ;;
++               /lib/x86_64-linux-gnu ) libdirsuffix=/x86_64-linux-gnu ;;
+              esac ;;
+         esac
+       fi

Modified: packages/unstable/nautilus-python/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/patches/series?rev=39712&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/patches/series	[utf-8] (original)
+++ packages/unstable/nautilus-python/debian/patches/series	[utf-8] Wed Oct  9 22:02:02 2013
@@ -1,2 +1,3 @@
 00git_open_terminal_example_GI.patch
 01_port_examples_to_GI.patch
+02_python_multiarch_path.patch

Modified: packages/unstable/nautilus-python/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-python/debian/rules?rev=39712&op=diff
==============================================================================
--- packages/unstable/nautilus-python/debian/rules	[utf-8] (original)
+++ packages/unstable/nautilus-python/debian/rules	[utf-8] Wed Oct  9 22:02:02 2013
@@ -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

More information about the pkg-gnome-commits mailing list