diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/ChangeLog src/libgnomedb/ChangeLog
--- origsrc/libgnomedb/ChangeLog	2007-03-19 20:48:33.000000000 -0500
+++ src/libgnomedb/ChangeLog	2007-03-19 23:44:24.906250000 -0500
@@ -1,3 +1,40 @@
+2007-03-20  yselkowitz  <yselkowitz@users.sourceforge.net>
+
+	* Makefile.am:
+	* configure.in:
+	* control-center/Makefile.am:
+	* doc/C/Makefile.am:
+	* extra/Makefile.am:
+	* extra/demos/Makefile.am:
+	* glade/Makefile.am:
+	* glade3/Makefile.am:
+	* libgnomedb-3.0.pc.in:
+	* libgnomedb-extra-3.0.pc.in:
+	* libgnomedb-extra/Makefile.am:
+	* libgnomedb-graph-3.0.pc.in:
+	* libgnomedb-graph/Makefile.am:
+	* libgnomedb/Makefile.am:
+	* libgnomedb/data-entries/Makefile.am:
+	* libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.c:
+	* libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.c:
+	* libgnomedb/data-entries/gnome-db-data-cell-renderer-info.c:
+	* libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.c:
+	* libgnomedb/data-entries/marshal.list:
+	* libgnomedb/data-entries/plugins/Makefile.am:
+	* providers/evolution/Makefile.am:
+	* testing/Makefile.am:
+	Rename all libraries from -3 to -3.0.
+	Change libgnomedb_handlers into a convenience lib and merge it into
+	libgnomedb.  Fixes compilation with -Wl,--as-needed or -Wl,-z,defs 
+	and obsoletes the Win32 bootstrapping; patch in bug 419063.
+
+	* libgnomedb/data-entries/plugins/*:
+	Moved to libgnomedb/plugins to accomodate the merge.
+
+	* win32/Makefile.am:
+	* win32/dummy.la:
+	* win32/libgnomedb_handlers-3.def: Removed.
+
 2007-03-15  Murray Cumming  <murrayc@murrayc-desktop>
 
 	* Makefile.am:
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/Makefile.am src/libgnomedb/Makefile.am
--- origsrc/libgnomedb/Makefile.am	2007-03-19 20:48:33.000000000 -0500
+++ src/libgnomedb/Makefile.am	2007-03-19 20:48:52.687500000 -0500
@@ -1,11 +1,5 @@
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-if PLATFORM_WIN32
-WIN32_DIRECTORY=win32
-else
-WIN32_DIRECTORY=
-endif
-
 if HAVE_LIBGLADE
 LIBGLADE_DIRECTORY=glade
 else
@@ -26,7 +20,6 @@
 
 SUBDIRS = \
 	po \
-	$(WIN32_DIRECTORY) \
 	libgnomedb \
 	libgnomedb-extra \
 	$(GRAPHLIB_DIRECTORY) \
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/configure.in src/libgnomedb/configure.in
--- origsrc/libgnomedb/configure.in	2007-03-19 20:48:33.000000000 -0500
+++ src/libgnomedb/configure.in	2007-03-19 20:48:52.703125000 -0500
@@ -110,7 +110,7 @@
 dnl ******************************
 dnl Translations
 dnl ******************************
-GETTEXT_PACKAGE=libgnomedb-3
+GETTEXT_PACKAGE=libgnomedb-3.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 ALL_LINGUAS="ar az be ca cs da de dz el en_CA en_GB es eu fa fi fr ga gl hr hu it ja ka ko lt ml ms nb ne nl pl pt pt_BR ru rw sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_HK zh_TW"
@@ -351,12 +351,11 @@
 libgnomedb/Makefile
 libgnomedb/libgnomedb.h
 libgnomedb/data-entries/Makefile
-libgnomedb/data-entries/plugins/Makefile
+libgnomedb/plugins/Makefile
 libgnomedb-extra/Makefile
 libgnomedb-graph/Makefile
 po/Makefile.in
 testing/Makefile
-win32/Makefile
 extra/Makefile
 extra/demos/Makefile
 extra/demos/geninclude.pl
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/control-center/Makefile.am src/libgnomedb/control-center/Makefile.am
--- origsrc/libgnomedb/control-center/Makefile.am	2007-03-19 20:47:20.000000000 -0500
+++ src/libgnomedb/control-center/Makefile.am	2007-03-19 20:48:52.703125000 -0500
@@ -28,9 +28,8 @@
 	provider-config.h
 gnome_database_properties_3_0_LDADD=\
 	$(LIBGNOMEDB_LIBS) \
-	$(top_builddir)/libgnomedb/libgnomedb-3.la \
-	$(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la \
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la
+	$(top_builddir)/libgnomedb/libgnomedb-3.0.la \
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la
 
 @INTLTOOL_DESKTOP_RULE@
 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/doc/C/Makefile.am src/libgnomedb/doc/C/Makefile.am
--- origsrc/libgnomedb/doc/C/Makefile.am	2007-03-19 20:47:35.000000000 -0500
+++ src/libgnomedb/doc/C/Makefile.am	2007-03-19 20:48:52.718750000 -0500
@@ -35,11 +35,10 @@
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = $(LIBGNOMEDB_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"\
 	$(LIBGLADE_CFLAGS) $(LIBGNOMECANVAS_CFLAGS)
-GTKDOC_LIBS =   $(top_builddir)/libgnomedb/libgnomedb-3.la \
-        $(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/data-entries/plugins/libgnomedb_entry_builtin_plugins.la \
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la \
-        $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.la 
+GTKDOC_LIBS =   $(top_builddir)/libgnomedb/libgnomedb-3.0.la \
+	$(top_builddir)/libgnomedb/plugins/libgnomedb_entry_builtin_plugins.la \
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la \
+	$(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.0.la 
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/extra/Makefile.am src/libgnomedb/extra/Makefile.am
--- origsrc/libgnomedb/extra/Makefile.am	2007-03-19 20:48:20.000000000 -0500
+++ src/libgnomedb/extra/Makefile.am	2007-03-19 20:48:52.718750000 -0500
@@ -23,8 +23,7 @@
 	gnome-db-browser.c
 
 gnome_db_browser_LDADD = \
-	$(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la \
-	$(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la 
+	$(top_builddir)/libgnomedb/libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la
 
 EXTRA_DIST = README
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/extra/demos/Makefile.am src/libgnomedb/extra/demos/Makefile.am
--- origsrc/libgnomedb/extra/demos/Makefile.am	2007-03-19 20:48:20.000000000 -0500
+++ src/libgnomedb/extra/demos/Makefile.am	2007-03-19 20:48:53.109375000 -0500
@@ -3,7 +3,7 @@
 democodedir=$(datadir)/gnome-db/demo
 
 if HAVE_LIBGNOMECANVAS
-graphlib= $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.la
+graphlib= $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.0.la
 canvassources= graph.c
 else
 graphlib=
@@ -63,9 +63,8 @@
 
 gnome_db_demo_DEPENDENCIES = $(DEPS)
 gnome_db_demo_LDADD =  \
-	$(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
-        $(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la \
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la \
+	$(top_builddir)/libgnomedb/libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la \
         $(graphlib)
 
 democode_DATA = $(demos) $(demofiles)
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/glade/Makefile.am src/libgnomedb/glade/Makefile.am
--- origsrc/libgnomedb/glade/Makefile.am	2007-03-19 20:48:29.000000000 -0500
+++ src/libgnomedb/glade/Makefile.am	2007-03-19 20:48:53.125000000 -0500
@@ -11,8 +11,8 @@
 glademodule_LTLIBRARIES = libgnomedb-3.0.la
 
 libgnomedb_3_0_la_LIBADD = \
-	$(top_builddir)/libgnomedb/libgnomedb-3.la	\
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la	\
+	$(top_builddir)/libgnomedb/libgnomedb-3.0.la	\
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la	\
 	$(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS)
 
 libgnomedb_3_0_la_LDFLAGS = \
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/glade3/Makefile.am src/libgnomedb/glade3/Makefile.am
--- origsrc/libgnomedb/glade3/Makefile.am	2007-03-19 20:47:21.000000000 -0500
+++ src/libgnomedb/glade3/Makefile.am	2007-03-19 20:48:53.125000000 -0500
@@ -1,7 +1,7 @@
 @INTLTOOL_XML_NOMERGE_RULE@
 
 if HAVE_LIBGNOMECANVAS
-graphlib= $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.la
+graphlib= $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.0.la
 else
 graphlib=
 endif
@@ -14,8 +14,7 @@
 libgladegnomedb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 libgladegnomedb_la_LIBADD = \
 			    $(LIBGNOMEDB_LIBS) $(GLADE3_LIBS) \
-			    $(top_builddir)/libgnomedb/libgnomedb-3.la \
-			    $(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la \
+			    $(top_builddir)/libgnomedb/libgnomedb-3.0.la \
 			    $(graphlib)
 
 gladegnomedbdir = @GLADE3_MODULES_DIR@
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/Makefile.am src/libgnomedb/libgnomedb/Makefile.am
--- origsrc/libgnomedb/libgnomedb/Makefile.am	2007-03-19 20:48:29.000000000 -0500
+++ src/libgnomedb/libgnomedb/Makefile.am	2007-03-19 21:55:19.687500000 -0500
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libgnomedb-3.la
+lib_LTLIBRARIES = libgnomedb-3.0.la
 
-SUBDIRS = . data-entries
+SUBDIRS = data-entries plugins
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -20,10 +20,6 @@
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\"
 
-if PLATFORM_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libgnomedb_handlers-3.la
-endif
-
 if HAVE_GTKTWOTEN
 twoten_headers= gnome-db-dsn-assistant.h
 twoten_sources= gnome-db-dsn-assistant.c
@@ -144,14 +140,14 @@
 libgnomedb_built_cfiles = gnome-db-enum-types.c
 
 # Don't build the library until we have built the headers that it needs:
-$(OBJECTS) $(libgnomedb_3_la_OBJECTS): marshal.c $(libgnomedb_built_headers) $(libgnomedb_built_cfiles)
+$(OBJECTS) $(libgnomedb_3_0_la_OBJECTS): marshal.c $(libgnomedb_built_headers) $(libgnomedb_built_cfiles)
 
-libgnomedb_3_la_SOURCES = \
+libgnomedb_3_0_la_SOURCES = \
 	$(libgnomedb_built_cfiles) \
 	$(gnomedb_sources)
 
-libgnomedb_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
-libgnomedb_3_la_LIBADD = $(WIN32_BOOTSTRAP_LIBS) $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGLADE_LIBS) $(GCONF_LIBS)
+libgnomedb_3_0_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_3_0_la_LIBADD = data-entries/libgnomedb_handlers-3.0.la $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGLADE_LIBS) $(GCONF_LIBS)
 
 gnomedbincludedir=$(includedir)/libgnomedb-$(GNOMEDB_ABI_MAJOR_VERSION).$(GNOMEDB_ABI_MINOR_VERSION)/libgnomedb
 gnomedbinclude_HEADERS=$(gnomedb_public_headers) $(libgnomedb_built_headers) 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/Makefile.am src/libgnomedb/libgnomedb/data-entries/Makefile.am
--- origsrc/libgnomedb/libgnomedb/data-entries/Makefile.am	2007-03-19 20:48:25.000000000 -0500
+++ src/libgnomedb/libgnomedb/data-entries/Makefile.am	2007-03-19 20:48:53.171875000 -0500
@@ -1,6 +1,4 @@
-lib_LTLIBRARIES = libgnomedb_handlers-3.la
-
-SUBDIRS = . plugins
+noinst_LTLIBRARIES = libgnomedb_handlers-3.0.la
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) -I$(srcdir)/.. \
@@ -39,8 +37,9 @@
 libgnomedb_handlersincludedir=$(includedir)/libgnomedb-$(GNOMEDB_ABI_MAJOR_VERSION).$(GNOMEDB_ABI_MINOR_VERSION)/libgnomedb/data-entries
 libgnomedb_handlersinclude_HEADERS=$(libgnomedb_handlers_headers)
 
-libgnomedb_handlers_3_la_SOURCES = \
+libgnomedb_handlers_3_0_la_SOURCES = \
 	$(libgnomedb_handlers_headers) \
+	marshal.h \
 	gnome-db-data-cell-renderer-boolean.c \
 	gnome-db-data-cell-renderer-combo.c \
 	gnome-db-data-cell-renderer-info.c \
@@ -57,9 +56,11 @@
 	gnome-db-entry-wrapper.c \
 	gnome-db-format-entry.c
 
+# Don't build the library until we have built the headers that it needs:
+$(OBJECTS) $(libgnomedb_handlers_3_0_la_OBJECTS): marshal.h
 
-libgnomedb_handlers_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
-libgnomedb_handlers_3_la_LIBADD = ../libgnomedb-3.la $(LIBGNOMEDB_LIBS)
+marshal.h: marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=marshal > $@
 
 xmldir   = $(datadir)/gnome-db
 xml_in_files = \
@@ -70,5 +71,5 @@
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(xml_in_files)
-DISTCLEANFILES = $(xml_DATA)
\ No newline at end of file
+EXTRA_DIST = $(xml_in_files) marshal.list
+DISTCLEANFILES = $(xml_DATA)
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.c src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.c
--- origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.c	2007-03-19 20:48:24.000000000 -0500
+++ src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.c	2007-03-19 20:48:53.187500000 -0500
@@ -23,7 +23,7 @@
 #include <libgda/libgda.h>
 #include <glib/gi18n-lib.h>
 #include "gnome-db-data-cell-renderer-boolean.h"
-#include <libgnomedb/marshal.h>
+#include "marshal.h"
 #include <libgda/gda-enum-types.h>
 
 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.c src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.c
--- origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.c	2007-03-19 20:48:25.000000000 -0500
+++ src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.c	2007-03-19 20:48:53.203125000 -0500
@@ -24,7 +24,7 @@
 #include <glib/gi18n-lib.h>
 #include "gnome-db-entry-combo.h"
 #include "gnome-db-data-cell-renderer-combo.h"
-#include <libgnomedb/marshal.h>
+#include "marshal.h"
 #include <libgnomedb/gnome-db-combo.h>
 #include <libgnomedb/gnome-db-data-entry.h>
 #include <libgnomedb/utility.h>
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-info.c src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-info.c
--- origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-info.c	2007-03-19 20:48:24.000000000 -0500
+++ src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-info.c	2007-03-19 20:48:53.203125000 -0500
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 #include "gnome-db-data-cell-renderer-info.h"
-#include <libgnomedb/marshal.h>
+#include "marshal.h"
 #include <libgda/libgda.h>
 #include <gdk/gdkkeysyms.h>
 #include "utility.h"
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.c src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.c
--- origsrc/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.c	2007-03-19 20:48:24.000000000 -0500
+++ src/libgnomedb/libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.c	2007-03-19 20:48:53.218750000 -0500
@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <libgda/libgda.h>
 #include "gnome-db-data-cell-renderer-textual.h"
-#include <libgnomedb/marshal.h>
+#include "marshal.h"
 #include "gnome-db-data-entry.h"
 #include "gnome-db-entry-string.h"
 #include "gnome-db-entry-date.h"
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/marshal.list src/libgnomedb/libgnomedb/data-entries/marshal.list
--- origsrc/libgnomedb/libgnomedb/data-entries/marshal.list	1969-12-31 18:00:00.000000000 -0600
+++ src/libgnomedb/libgnomedb/data-entries/marshal.list	2007-03-19 20:48:53.234375000 -0500
@@ -0,0 +1,47 @@
+# see glib-genmarshal(1) for a detailed description of the file format,
+# possible parameter types are:
+#   VOID        indicates   no   return   type,  or  no  extra
+#               parameters. if VOID is used as  the  parameter
+#               list, no additional parameters may be present.
+#   BOOLEAN     for boolean types (gboolean)
+#   CHAR        for signed char types (gchar)
+#   UCHAR       for unsigned char types (guchar)
+#   INT         for signed integer types (gint)
+#   UINT        for unsigned integer types (guint)
+#   LONG        for signed long integer types (glong)
+#   ULONG       for unsigned long integer types (gulong)
+#   ENUM        for enumeration types (gint)
+#   FLAGS       for flag enumeration types (guint)
+#   FLOAT       for single-precision float types (gfloat)
+#   DOUBLE      for double-precision float types (gdouble)
+#   STRING      for string types (gchar*)
+#   PARAM       for GParamSpec or derived types  (GParamSpec*)
+#   BOXED       for boxed (anonymous but reference counted) types (GBoxed*)
+#   POINTER     for anonymous pointer types (gpointer)
+#   OBJECT      for GObject or derived types (GObject*)
+#   NONE        deprecated alias for VOID
+#   BOOL        deprecated alias for BOOLEAN
+
+
+
+VOID:VOID
+VOID:VOID,VOID
+VOID:POINTER
+VOID:POINTER,POINTER
+VOID:POINTER,UINT,UINT
+VOID:BOOLEAN
+VOID:ULONG
+VOID:OBJECT
+VOID:OBJECT,BOOL
+VOID:INT
+VOID:STRING,STRING
+VOID:STRING,BOXED
+VOID:STRING,POINTER,POINTER
+VOID:STRING,ENUM
+VOID:STRING
+STRING:STRING
+
+# These should not be necessary but the linker complains at runtime if they do not exist, though nothing seems to use them.
+VOID:POINTER,POINTER
+VOID:STRING,POINTER
+
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb/data-entries/plugins/Makefile.am src/libgnomedb/libgnomedb/data-entries/plugins/Makefile.am
--- origsrc/libgnomedb/libgnomedb/data-entries/plugins/Makefile.am	2007-03-19 20:48:23.000000000 -0500
+++ src/libgnomedb/libgnomedb/data-entries/plugins/Makefile.am	2007-03-19 20:48:53.234375000 -0500
@@ -2,7 +2,7 @@
 plugindir = $(libdir)/$(PACKAGE)/plugins
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir) -I$(srcdir)/.. \
+        -I$(top_srcdir) -I$(srcdir)/../data-entries \
         -I$(top_builddir) \
         $(LIBGNOMEDB_CFLAGS) \
         $(GTKSOURCEVIEW_CFLAGS) \
@@ -48,7 +48,7 @@
 	gnome-db-entry-pict.c 
 
 libgnomedb_entry_builtin_plugins_la_LDFLAGS = -module -export-dynamic -avoid-version $(NO_UNDEFINED)
-libgnomedb_entry_builtin_plugins_la_LIBADD = ../libgnomedb_handlers-3.la ../../libgnomedb-3.la $(LIBGNOMEDB_LIBS) -lcrypto
+libgnomedb_entry_builtin_plugins_la_LIBADD = ../libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) -lcrypto
 
 xmldir   = $(datadir)/gnome-db
 xml_in_files = \
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb-3.0.pc.in src/libgnomedb/libgnomedb-3.0.pc.in
--- origsrc/libgnomedb/libgnomedb-3.0.pc.in	2007-03-19 20:48:33.000000000 -0500
+++ src/libgnomedb/libgnomedb-3.0.pc.in	2007-03-19 20:48:53.250000000 -0500
@@ -8,6 +8,6 @@
 Description: Libgnomedb library
 Requires: @LIBGNOMEDB_REQUIRES@
 Version: @VERSION@
-Libs: -L${libdir} -lgnomedb-3 -lgnomedb_handlers-3
+Libs: -L${libdir} -lgnomedb-3.0
 Cflags: -I${includedir}/libgnomedb-@GNOMEDB_ABI_MAJOR_VERSION@.@GNOMEDB_ABI_MINOR_VERSION@
 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb-extra/Makefile.am src/libgnomedb/libgnomedb-extra/Makefile.am
--- origsrc/libgnomedb/libgnomedb-extra/Makefile.am	2007-03-19 20:48:01.000000000 -0500
+++ src/libgnomedb/libgnomedb-extra/Makefile.am	2007-03-19 21:08:56.875000000 -0500
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgnomedb_extra-3.la
+lib_LTLIBRARIES = libgnomedb_extra-3.0.la
 
 SUBDIRS = 
 
@@ -83,16 +83,16 @@
 libgnomedb_extra_built_cfiles = extra_marshal.c gnome-db-extra-enum-types.c
 
 # Don't build the library until we have built the headers that it needs:
-$(OBJECTS) $(libgnomedb_extra_3_la_OBJECTS): extra_marshal.c $(libgnomedb_extra_built_headers) $(libgnomedb_extra_built_cfiles)
+$(OBJECTS) $(libgnomedb_extra_3_0_la_OBJECTS): extra_marshal.c $(libgnomedb_extra_built_headers) $(libgnomedb_extra_built_cfiles)
 
 
 libgnomedb_extraincludedir=$(includedir)/libgnomedb-$(GNOMEDB_ABI_MAJOR_VERSION).$(GNOMEDB_ABI_MINOR_VERSION)/libgnomedb-extra
 libgnomedb_extrainclude_HEADERS=$(libgnomedb_extra_headers) $(libgnomedb_extra_built_headers)
 
 # Don't build the library until we have built the headers that it needs:
-$(OBJECTS) $(libgnomedb_extra_3_la_OBJECTS): extra_marshal.c extra_marshal.h
+$(OBJECTS) $(libgnomedb_extra_3_0_la_OBJECTS): extra_marshal.c extra_marshal.h
 
-libgnomedb_extra_3_la_SOURCES = \
+libgnomedb_extra_3_0_la_SOURCES = \
 	$(global_header) \
 	$(libgnomedb_extra_headers) \
         $(libgnomedb_extra_built_headers) \
@@ -117,8 +117,8 @@
 	sel-tables.c 
 
 
-libgnomedb_extra_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
-libgnomedb_extra_3_la_LIBADD = ../libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGNOMECANVAS_LIBS)
+libgnomedb_extra_3_0_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_extra_3_0_la_LIBADD = ../libgnomedb/libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGNOMECANVAS_LIBS)
 
 extra_marshal.h: extra_marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=extra_marshal > $@
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb-extra-3.0.pc.in src/libgnomedb/libgnomedb-extra-3.0.pc.in
--- origsrc/libgnomedb/libgnomedb-extra-3.0.pc.in	2007-03-19 20:48:33.000000000 -0500
+++ src/libgnomedb/libgnomedb-extra-3.0.pc.in	2007-03-19 20:48:53.328125000 -0500
@@ -8,6 +8,6 @@
 Description: Extra widgets associated with libgnomedb
 Requires: libgnomedb-3.0
 Version: @VERSION@
-Libs: -L${libdir} -lgnomedb_extra-3
+Libs: -L${libdir} -lgnomedb_extra-3.0
 Cflags: -I${includedir}/libgnomedb-@GNOMEDB_ABI_MAJOR_VERSION@.@GNOMEDB_ABI_MINOR_VERSION@
 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb-graph/Makefile.am src/libgnomedb/libgnomedb-graph/Makefile.am
--- origsrc/libgnomedb/libgnomedb-graph/Makefile.am	2007-03-19 20:47:23.000000000 -0500
+++ src/libgnomedb/libgnomedb-graph/Makefile.am	2007-03-19 20:48:53.343750000 -0500
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgnomedb_graph-3.la
+lib_LTLIBRARIES = libgnomedb_graph-3.0.la
 
 SUBDIRS = 
 
@@ -39,7 +39,7 @@
 libgnomedb_graphincludedir=$(includedir)/libgnomedb-$(GNOMEDB_ABI_MAJOR_VERSION).$(GNOMEDB_ABI_MINOR_VERSION)/libgnomedb-graph
 libgnomedb_graphinclude_HEADERS=$(libgnomedb_graph_headers)
 
-libgnomedb_graph_3_la_SOURCES = \
+libgnomedb_graph_3_0_la_SOURCES = \
 	$(global_header) \
 	$(libgnomedb_graph_headers) \
 	graph-utility.c \
@@ -56,5 +56,5 @@
 	gnome-db-canvas-tip.c 
 
 
-libgnomedb_graph_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
-libgnomedb_graph_3_la_LIBADD = ../libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGNOMECANVAS_LIBS)
+libgnomedb_graph_3_0_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_graph_3_0_la_LIBADD = ../libgnomedb/libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGNOMECANVAS_LIBS)
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/libgnomedb-graph-3.0.pc.in src/libgnomedb/libgnomedb-graph-3.0.pc.in
--- origsrc/libgnomedb/libgnomedb-graph-3.0.pc.in	2007-03-19 20:48:33.000000000 -0500
+++ src/libgnomedb/libgnomedb-graph-3.0.pc.in	2007-03-19 20:48:53.343750000 -0500
@@ -8,6 +8,6 @@
 Description: Graphs library associated with libgnomedb
 Requires: libgnomedb-3.0
 Version: @VERSION@
-Libs: -L${libdir} -lgnomedb_graph-3
+Libs: -L${libdir} -lgnomedb_graph-3.0
 Cflags: -I${includedir}/libgnomedb-@GNOMEDB_ABI_MAJOR_VERSION@.@GNOMEDB_ABI_MINOR_VERSION@
 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/providers/evolution/Makefile.am src/libgnomedb/providers/evolution/Makefile.am
--- origsrc/libgnomedb/providers/evolution/Makefile.am	2007-03-19 20:47:41.000000000 -0500
+++ src/libgnomedb/providers/evolution/Makefile.am	2007-03-19 20:48:53.359375000 -0500
@@ -16,7 +16,7 @@
 	gda-evolution-provider.c \
 	gda-evolution-provider.h \
 	libmain.c
-libgda_evolution_la_LDFLAGS = -export-dynamic -module -avoid-version
+libgda_evolution_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libgda_evolution_la_LIBADD = \
 	$(LIBGNOMEDB_LIBS) \
 	$(GDA_EVOLUTION_LIBS)
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/testing/Makefile.am src/libgnomedb/testing/Makefile.am
--- origsrc/libgnomedb/testing/Makefile.am	2007-03-19 20:47:40.000000000 -0500
+++ src/libgnomedb/testing/Makefile.am	2007-03-19 20:48:53.359375000 -0500
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = test-dyn-widgets test-handlers
 
 if HAVE_LIBGNOMECANVAS
-graphlib= $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.la
+graphlib= $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.0.la
 else
 graphlib=
 endif
@@ -14,14 +14,12 @@
 	$(LIBGNOMECANVAS_CFLAGS)
 
 test_dyn_widgets_SOURCES = test-dyn-widgets.c
-test_dyn_widgets_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
-	$(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la \
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la \
+test_dyn_widgets_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la \
         $(LIBGNOMECANVAS_LIBS) $(graphlib)
 
 test_handlers_SOURCES = test-handlers.c
-test_handlers_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
-	$(top_builddir)/libgnomedb/data-entries/libgnomedb_handlers-3.la \
-	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.la \
+test_handlers_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
+	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-3.0.la \
         $(LIBGNOMECANVAS_LIBS) $(graphlib)
 
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/win32/Makefile.am src/libgnomedb/win32/Makefile.am
--- origsrc/libgnomedb/win32/Makefile.am	2007-03-19 20:48:21.000000000 -0500
+++ src/libgnomedb/win32/Makefile.am	1969-12-31 18:00:00.000000000 -0600
@@ -1,30 +0,0 @@
-#
-# The .def files were manually generated. Could be automated as follows:
-#
-# echo "EXPORTS" > $lib.def
-# nm $lib.{a,so} | grep ' T _' | sed 's/.* T _/\t/' | sort -bu >> $lib.def
-#
-
-EXTRA_DIST = 	\
-	dummy.la	\
-	libgnomedb_handlers-3.def
-
-BOOTSTRAP_LIBS =	\
-	libgnomedb_handlers-3.la
-
-noinst_DATA = $(BOOTSTRAP_LIBS)
-
-libgnomedb_handlers-3.la: dummy.la libgnomedb_handlers-3.def
-	mkdir -p .libs
-	dlltool --output-lib=.libs/libgnomedb_handlers-3.dll.a --dllname=$(SOPREFIX)gnomedb_handlers-3-4.dll --input-def=$(srcdir)/libgnomedb_handlers-3.def
-	sed -e s!%DLL%!$(SOPREFIX)gnomedb_handlers-3-4! -e s!%LIB%!libgnomedb_handlers-3! -e s!%PFX%!$(prefix)! < $(srcdir)/dummy.la > $@
-
-install-exec-local: $(BOOTSTRAP_LIBS)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	for la in $(BOOTSTRAP_LIBS) ; do \
-		implib=`echo $$la | sed -e s!\.la!.dll.a!` ; \
-		$(INSTALL) .libs/$$implib $(DESTDIR)$(libdir) ; \
-		sed -e s!installed=no!installed=yes! < $$la > $(DESTDIR)$(libdir)/$$la ; \
-	done
-
-CLEANFILES = $(BOOTSTRAP_LIBS)
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/win32/dummy.la src/libgnomedb/win32/dummy.la
--- origsrc/libgnomedb/win32/dummy.la	2007-03-19 20:48:21.000000000 -0500
+++ src/libgnomedb/win32/dummy.la	1969-12-31 18:00:00.000000000 -0600
@@ -1,32 +0,0 @@
-# %LIB%.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool - well, actually not, hacked manually
-
-# The name that we can dlopen(3).
-dlname='%DLL%.dll'
-
-# Names of this library.
-library_names='%LIB%.dll.a'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Version information for %LIB%
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='%PFX%/lib'
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x makefile.in -x configure -x '*.stamp' -x '*.html' -x '*.bak' -x '*.sgml' -x '*.tmpl' -x '*.txt' -x '*.xml' -x '*.args' -x '*.devhelp*' -x '*.css' -x '*.hierarchy' -x '*.interfaces' -x '*.prerequisites' -x '*.signals' -x '*.top' -x '*.bottom' -x gtk-doc.make -x gtk-doc.m4 -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in origsrc/libgnomedb/win32/libgnomedb_handlers-3.def src/libgnomedb/win32/libgnomedb_handlers-3.def
--- origsrc/libgnomedb/win32/libgnomedb_handlers-3.def	2007-03-19 20:48:21.000000000 -0500
+++ src/libgnomedb/win32/libgnomedb_handlers-3.def	1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-EXPORTS
-	gnome_db_data_cell_renderer_boolean_new
-	gnome_db_data_cell_renderer_combo_new
-	gnome_db_data_cell_renderer_info_new
-	gnome_db_data_cell_renderer_textual_new
-	gnome_db_entry_boolean_new
-	gnome_db_entry_combo_get_type
-	gnome_db_entry_combo_get_values
-	gnome_db_entry_combo_get_values_orig
-	gnome_db_entry_combo_new
-	gnome_db_entry_combo_set_values
-	gnome_db_entry_combo_set_values_orig
-	gnome_db_entry_date_new
-	gnome_db_entry_none_new
-	gnome_db_entry_string_new
-	gnome_db_entry_time_new
-	gnome_db_entry_timestamp_new
