update from latest gnome foocanvas

foocanvas/zmap_source/configure.in

 AC_PREREQ(2.50)
-AC_INIT([libfoocanvas], [0.1])
+AC_INIT([libzmapfoocanvas], [0.1])
 AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
 
 AC_CONFIG_HEADERS([config.h])

foocanvas/zmap_source/configure.in.diff

---- ./tmp_merged_foocanvas/configure.in	2010-03-24 10:47:06.722000000 +0000
-+++ ./tmp_zmap_foocanvas/configure.in	2010-03-24 10:47:01.212000000 +0000
-@@ -3,7 +3,8 @@
+--- ./tmp_merged_foocanvas/configure.in	2010-03-24 14:47:04.503000000 +0000
++++ ./tmp_zmap_foocanvas/configure.in	2010-03-24 14:47:01.317000000 +0000
+@@ -1,9 +1,10 @@
+ AC_PREREQ(2.50)
+-AC_INIT([libfoocanvas], [0.1])
++AC_INIT([libzmapfoocanvas], [0.1])
  AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
  
  AC_CONFIG_HEADERS([config.h])

foocanvas/zmap_source/libfoocanvas/Makefile.am

@@ -18,7 +18,7 @@ libzmapfoocanvas_la_LIBADD = \
 	$(RENDER_LIBS)				\
 	$(LIBFOOCANVAS_LIBS)
 
-libfoocanvasincludedir = $(includedir)/libfoocanvas-1.0/libfoocanvas
+libfoocanvasincludedir = $(includedir)/libzmapfoocanvas-1.0/libfoocanvas
 
 libfoocanvasinclude_HEADERS =			\
 	foo-canvas-line.h			\

foocanvas/zmap_source/libfoocanvas/Makefile.am.diff

---- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am	2010-03-16 15:14:38.377000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am	2010-03-16 15:14:36.883000000 +0000
-@@ -12,9 +12,9 @@
+--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am	2010-03-24 14:47:04.378000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am	2010-03-24 14:47:01.337000000 +0000
+@@ -12,34 +12,40 @@
  	-DG_LOG_DOMAIN=\"Foocanvas\"			\
  	-DVERSION=\"$(VERSION)\"
  
@@ -12,7 +12,8 @@
  	$(RENDER_LIBS)				\
  	$(LIBFOOCANVAS_LIBS)
  
-@@ -22,24 +22,30 @@
+-libfoocanvasincludedir = $(includedir)/libfoocanvas-1.0/libfoocanvas
++libfoocanvasincludedir = $(includedir)/libzmapfoocanvas-1.0/libfoocanvas
  
  libfoocanvasinclude_HEADERS =			\
  	foo-canvas-line.h			\

foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in

@@ -8,4 +8,4 @@ Description: libzmapfoocanvas
 Requires: pango gtk+-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lzmapfoocanvas
-Cflags: -I${includedir}/libfoocanvas-1.0
+Cflags: -I${includedir}/libzmapfoocanvas-1.0

foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in.diff

---- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.pc.in	2010-03-16 15:14:38.378000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.pc.in	2010-03-16 15:14:36.982000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.pc.in	2010-03-24 14:47:04.379000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.pc.in	2010-03-24 14:47:01.523000000 +0000
 @@ -3,9 +3,9 @@
  libdir=@libdir@
  includedir=@includedir@
@@ -11,5 +11,6 @@
  Requires: pango gtk+-2.0
  Version: @VERSION@
 -Libs: -L${libdir} -lfoocanvas
+-Cflags: -I${includedir}/libfoocanvas-1.0
 +Libs: -L${libdir} -lzmapfoocanvas
- Cflags: -I${includedir}/libfoocanvas-1.0
++Cflags: -I${includedir}/libzmapfoocanvas-1.0