Package: pygpiv
Version: 2.0.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch



*** /tmp/tmpmUvhAs
In Ubuntu, the attached patch was applied to achieve the following:

https://bugs.launchpad.net/ubuntu/oneiric/+source/pygpiv/+bug/755955

need to use pkg-config to find correct include directories to build package.

  * Fix build failure do to changes to libglib2.0-dev 
  * Fix lp:755955


Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2010-06-17 10:48:00 +0000
+++ debian/control	2011-06-09 15:55:55 +0000
@@ -1,7 +1,8 @@
 Source: pygpiv
 Section: python
 Priority: extra
-Maintainer: Gerber van der Graaf <gerber_gr...@users.sourceforge.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gerber van der Graaf <gerber_gr...@users.sourceforge.net>
 XB-Python-Version: ${python:Versions}
 Standards-Version: 3.8.4
 Homepage: http://libgpiv.sourceforge.net/pygpiv.html

=== modified file 'debian/patches/01_python2.6.dpatch' (properties changed: -x to +x)
=== modified file 'setup.py'
--- setup.py	2009-11-05 18:17:00 +0000
+++ setup.py	2011-06-20 06:59:16 +0000
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 
+import commands
 from distutils.core import setup, Extension
 
+# Use pkg-config to find library needed for glib-2.0
+GLIB_LIB = commands.getoutput('pkg-config --cflags glib-2.0').split()[1][2:]
+
 setup(name='pygpiv',
       version='2.0.0',
       description='Particle Image Velocimetry module',
@@ -32,7 +36,8 @@
       ext_modules=[Extension('_pygpiv', ['pygpiv.i'],
                              include_dirs=['/usr/local/include',
                                            '/usr/include/glib-2.0',
-                                           '/usr/lib/glib-2.0/include'],
+                                           '/usr/lib/glib-2.0/include',
+                                           GLIB_LIB],
                              swig_opts=['-modern',
                                         '-cpperraswarn',
                                         '-I/usr/include',

Reply via email to