Package: pxlib Version: 0.6.4-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmphbPOhc In Ubuntu, the attached patch was applied to achieve the following: https://bugs.launchpad.net/ubuntu/+source/pxlib/+bug/755924 * Fix build error using pkg-config * Fix LP: #755924 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 'configure' --- configure 2009-04-27 08:05:06 +0000 +++ configure 2011-06-20 05:23:17 +0000 @@ -18123,12 +18123,12 @@ else if test -r ${withval}/include/libgsf-1/gsf/gsf-input.h ; then GSF_LIBDIR=-L${withval}/lib - GSF_INCLUDEDIR="-I${withval}/include/libgsf-1 -I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include" + GSF_INCLUDEDIR="-I${withval}/include/libgsf-1 -I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include $(pkg-config --libs --cflags glib-2.0)" try_gsf=true else if test -r /usr/include/libgsf-1/gsf/gsf-input.h ; then GSF_LIBDIR=-L/usr - GSF_INCLUDEDIR="-I/usr/include/libgsf-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" + GSF_INCLUDEDIR="-I/usr/include/libgsf-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $(pkg-config --libs --cflags glib-2.0)" try_gsf=true else try_gsf=false === modified file 'configure.in' --- configure.in 2009-04-27 08:05:06 +0000 +++ configure.in 2011-06-20 05:23:56 +0000 @@ -117,12 +117,12 @@ else if test -r ${withval}/include/libgsf-1/gsf/gsf-input.h ; then GSF_LIBDIR=-L${withval}/lib - GSF_INCLUDEDIR="-I${withval}/include/libgsf-1 -I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include" + GSF_INCLUDEDIR="-I${withval}/include/libgsf-1 -I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include $(pkg-config --libs --cflags glib-2.0)" try_gsf=true else if test -r /usr/include/libgsf-1/gsf/gsf-input.h ; then GSF_LIBDIR=-L/usr - GSF_INCLUDEDIR="-I/usr/include/libgsf-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" + GSF_INCLUDEDIR="-I/usr/include/libgsf-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $(pkg-config --libs --cflags glib-2.0)" try_gsf=true else try_gsf=false === modified file 'debian/changelog' === modified file 'debian/control' --- debian/control 2007-09-12 17:33:43 +0000 +++ debian/control 2011-06-20 05:33:12 +0000 @@ -1,6 +1,7 @@ Source: pxlib Priority: optional -Maintainer: Uwe Steinmann <ste...@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Uwe Steinmann <ste...@debian.org> Build-Depends: debhelper (>> 4.0.0), intltool (>= 0.30), docbook-utils, docbook-to-man, libgsf-1-dev (>= 1.13.2) Standards-Version: 3.6.1