[Pkg-fonts-bugs] Ubuntu fontforge 0.0.20120101+git-2ubuntu2

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Thu, 27 Dec 2012 16:41:21 +0200
Source: fontforge
Binary: fontforge fontforge-nox libfontforge-dev libfontforge1 libgdraw4 python-fontforge fontforge-dbg
Architecture: source
Version: 0.0.20120101+git-2ubuntu2
Distribution: raring
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
Description: 
 fontforge  - font editor
 fontforge-dbg - debugging symbols for fontforge
 fontforge-nox - font editor - non-X version
 libfontforge-dev - font editor - runtime library (development files)
 libfontforge1 - font editor - runtime library
 libgdraw4  - font editor - runtime graphics and widget library
 python-fontforge - font editor - Python bindings
Changes: 
 fontforge (0.0.20120101+git-2ubuntu2) raring; urgency=low
 .
   * Fix FTBFS multiarched python include paths.
Checksums-Sha1: 
 25a85e5a712f9a56d46744c6c9be6bd8c6d70675 2843 fontforge_0.0.20120101+git-2ubuntu2.dsc
 b47f198d7e6ef5fba939b3bd137ea9efd51a7e72 20403 fontforge_0.0.20120101+git-2ubuntu2.debian.tar.gz
Checksums-Sha256: 
 0452ee6cf584cdea0fd89dcfcf6c6e6013944a3bb18a8ead9fe269c268c73f2e 2843 fontforge_0.0.20120101+git-2ubuntu2.dsc
 9e7081b5a904021eeba5aed831f0b47cebec1dd1490e144c1a5a376911296609 20403 fontforge_0.0.20120101+git-2ubuntu2.debian.tar.gz
Files: 
 12548ccffe2f76e00a71ba2717745ef7 2843 fonts optional fontforge_0.0.20120101+git-2ubuntu2.dsc
 1bb898eae6944d521652f7efdd41aa8d 20403 fonts optional fontforge_0.0.20120101+git-2ubuntu2.debian.tar.gz
Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 0.0.20120101+git-2ubuntu1/configure.dynamic.in 0.0.20120101+git-2ubuntu2/configure.dynamic.in
--- 0.0.20120101+git-2ubuntu1/configure.dynamic.in	2012-12-28 17:35:33.000000000 +0000
+++ 0.0.20120101+git-2ubuntu2/configure.dynamic.in	2012-12-28 17:35:32.000000000 +0000
@@ -268,11 +268,11 @@ if test "$python" = "yes" ; then
       python="no"
       echo $ECHO_N "(need at least python 2.3) $ECHO_C" >&6
     else
-      PyInc=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
+      PyInc="`${python_prog}-config --includes`"
       if test "$py_headers" != "" -a -e "$py_headers" ; then
 	CPPFLAGS="$CPPFLAGS -I$py_headers"
-      elif test "$PyInc" != "" -a -e "$PyInc" ; then
-	CPPFLAGS="$CPPFLAGS -I$PyInc"
+      elif test "$PyInc" != "" ; then
+	CPPFLAGS="$CPPFLAGS $PyInc"
       elif test -d /usr/include/$PyName ; then
 	CPPFLAGS="$CPPFLAGS -I/usr/include/$PyName"
       elif test -d /usr/include/python ; then
diff -pruN 0.0.20120101+git-2ubuntu1/configure.static.in 0.0.20120101+git-2ubuntu2/configure.static.in
--- 0.0.20120101+git-2ubuntu1/configure.static.in	2012-12-28 17:35:33.000000000 +0000
+++ 0.0.20120101+git-2ubuntu2/configure.static.in	2012-12-28 17:35:32.000000000 +0000
@@ -152,12 +152,12 @@ if test "$python" = "yes" ; then
     if python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" >/dev/null 2>&1 ; then
       PyVersion=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('VERSION')"`
       PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'`
-      PyInc=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"`
-      PyLib=`python -c "import distutils.sysconfig ; print '%s/%s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'))"`
+      PyInc=`${python_prog}-config --includes`
+      PyLib=`${python_prog}-config --libs`
       if test "$PySubVersion" \!= "" -a "$PySubVersion" -le 2 ; then
         python="no"
       elif test "$PySubVersion" \!= "" -a "$PySubVersion" -ge 3 -a -e $PyLib -a -e $PyInc; then
-	PyIncs=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"`
+        PyIncs=`${python_prog}-config --includes`
         PyLibs=`${python_prog}-config --libs`
         LIBS="$LIBS $PyLibs"
 	CPPFLAGS="$CPPFLAGS $PyIncs"
diff -pruN 0.0.20120101+git-2ubuntu1/debian/changelog 0.0.20120101+git-2ubuntu2/debian/changelog
--- 0.0.20120101+git-2ubuntu1/debian/changelog	2012-07-13 17:27:41.000000000 +0000
+++ 0.0.20120101+git-2ubuntu2/debian/changelog	2012-12-28 06:10:27.000000000 +0000
@@ -1,3 +1,9 @@
+fontforge (0.0.20120101+git-2ubuntu2) raring; urgency=low
+
+  * Fix FTBFS multiarched python include paths.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Thu, 27 Dec 2012 16:41:21 +0200
+
 fontforge (0.0.20120101+git-2ubuntu1) quantal; urgency=low
 
   * debian/control:
diff -pruN 0.0.20120101+git-2ubuntu1/debian/patches/901_ld_as_needed.diff 0.0.20120101+git-2ubuntu2/debian/patches/901_ld_as_needed.diff
--- 0.0.20120101+git-2ubuntu1/debian/patches/901_ld_as_needed.diff	2012-05-15 19:36:08.000000000 +0000
+++ 0.0.20120101+git-2ubuntu2/debian/patches/901_ld_as_needed.diff	2012-12-28 06:09:31.000000000 +0000
@@ -1,16 +1,40 @@
 --- a/configure.static.in
 +++ b/configure.static.in
-@@ -158,7 +158,7 @@
+@@ -152,13 +152,13 @@
+     if python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" >/dev/null 2>&1 ; then
+       PyVersion=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('VERSION')"`
+       PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'`
+-      PyInc=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"`
+-      PyLib=`python -c "import distutils.sysconfig ; print '%s/%s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'))"`
++      PyInc=`${python_prog}-config --includes`
++      PyLib=`${python_prog}-config --libs`
+       if test "$PySubVersion" \!= "" -a "$PySubVersion" -le 2 ; then
          python="no"
        elif test "$PySubVersion" \!= "" -a "$PySubVersion" -ge 3 -a -e $PyLib -a -e $PyInc; then
- 	PyIncs=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"`
+-	PyIncs=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"`
 -        PyLibs=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))"`
++        PyIncs=`${python_prog}-config --includes`
 +        PyLibs=`${python_prog}-config --libs`
          LIBS="$LIBS $PyLibs"
  	CPPFLAGS="$CPPFLAGS $PyIncs"
        else
 --- a/configure.dynamic.in
 +++ b/configure.dynamic.in
+@@ -268,11 +268,11 @@
+       python="no"
+       echo $ECHO_N "(need at least python 2.3) $ECHO_C" >&6
+     else
+-      PyInc=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
++      PyInc="`${python_prog}-config --includes`"
+       if test "$py_headers" != "" -a -e "$py_headers" ; then
+ 	CPPFLAGS="$CPPFLAGS -I$py_headers"
+-      elif test "$PyInc" != "" -a -e "$PyInc" ; then
+-	CPPFLAGS="$CPPFLAGS -I$PyInc"
++      elif test "$PyInc" != "" ; then
++	CPPFLAGS="$CPPFLAGS $PyInc"
+       elif test -d /usr/include/$PyName ; then
+ 	CPPFLAGS="$CPPFLAGS -I/usr/include/$PyName"
+       elif test -d /usr/include/python ; then
 @@ -280,10 +280,10 @@
        else
  	python="no"