Imported Upstream version 0.11.91upstream/0.11.91

28 files changed, 204 insertions, 96 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9e6fc62..ab64603 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 34da120..17b0c45 100644
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index fa814f8..cbee2fa 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -144,7 +144,7 @@ check_PROGRAMS =				\
 # failing tests
 noinst_PROGRAMS =				\
 	gst/gstpipeline				\
-	libs/collectpads2
+	libs/collectpads
 
 # elements to ignore for the state tests
 # STATE_IGNORE_ELEMENTS =
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index 8546a23..b261337 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -72,7 +72,7 @@ check_PROGRAMS = gst/gstatomicqueue$(EXEEXT) gst/gstbuffer$(EXEEXT) \
 	libs/bytereader$(EXEEXT) libs/bytewriter$(EXEEXT) \
 	libs/gstnetclientclock$(EXEEXT) \
 	libs/gstnettimeprovider$(EXEEXT) libs/transform1$(EXEEXT)
-noinst_PROGRAMS = gst/gstpipeline$(EXEEXT) libs/collectpads2$(EXEEXT)
+noinst_PROGRAMS = gst/gstpipeline$(EXEEXT) libs/collectpads$(EXEEXT)
 subdir = tests/check
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
@@ -558,10 +558,10 @@ libs_bytewriter_LDADD = $(LDADD)
 libs_bytewriter_DEPENDENCIES = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \
 	$(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
 	$(am__DEPENDENCIES_1)
-libs_collectpads2_SOURCES = libs/collectpads2.c
-libs_collectpads2_OBJECTS = collectpads2.$(OBJEXT)
-libs_collectpads2_LDADD = $(LDADD)
-libs_collectpads2_DEPENDENCIES = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \
+libs_collectpads_SOURCES = libs/collectpads.c
+libs_collectpads_OBJECTS = collectpads.$(OBJEXT)
+libs_collectpads_LDADD = $(LDADD)
+libs_collectpads_DEPENDENCIES = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \
 	$(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
 	$(am__DEPENDENCIES_1)
 libs_controller_SOURCES = libs/controller.c
@@ -700,7 +700,7 @@ SOURCES = elements/capsfilter.c elements/fakesink.c elements/fakesrc.c \
 	gst/gsttag.c gst/gsttagsetter.c gst/gsttask.c gst/gsttoc.c \
 	gst/gsttocsetter.c gst/gsturi.c gst/gstutils.c gst/gstvalue.c \
 	libs/adapter.c libs/basesink.c libs/basesrc.c libs/bitreader.c \
-	libs/bytereader.c libs/bytewriter.c libs/collectpads2.c \
+	libs/bytereader.c libs/bytewriter.c libs/collectpads.c \
 	libs/controller.c $(libs_gstlibscpp_SOURCES) \
 	libs/gstnetclientclock.c libs/gstnettimeprovider.c \
 	libs/transform1.c libs/typefindhelper.c pipelines/cleanup.c \
@@ -727,7 +727,7 @@ DIST_SOURCES = elements/capsfilter.c elements/fakesink.c \
 	gst/gsttag.c gst/gsttagsetter.c gst/gsttask.c gst/gsttoc.c \
 	gst/gsttocsetter.c gst/gsturi.c gst/gstutils.c gst/gstvalue.c \
 	libs/adapter.c libs/basesink.c libs/basesrc.c libs/bitreader.c \
-	libs/bytereader.c libs/bytewriter.c libs/collectpads2.c \
+	libs/bytereader.c libs/bytewriter.c libs/collectpads.c \
 	libs/controller.c $(libs_gstlibscpp_SOURCES) \
 	libs/gstnetclientclock.c libs/gstnettimeprovider.c \
 	libs/transform1.c libs/typefindhelper.c pipelines/cleanup.c \
@@ -1423,9 +1423,9 @@ libs/bytereader$(EXEEXT): $(libs_bytereader_OBJECTS) $(libs_bytereader_DEPENDENC
 libs/bytewriter$(EXEEXT): $(libs_bytewriter_OBJECTS) $(libs_bytewriter_DEPENDENCIES) $(EXTRA_libs_bytewriter_DEPENDENCIES) libs/$(am__dirstamp)
 	@rm -f libs/bytewriter$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(libs_bytewriter_OBJECTS) $(libs_bytewriter_LDADD) $(LIBS)
-libs/collectpads2$(EXEEXT): $(libs_collectpads2_OBJECTS) $(libs_collectpads2_DEPENDENCIES) $(EXTRA_libs_collectpads2_DEPENDENCIES) libs/$(am__dirstamp)
-	@rm -f libs/collectpads2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libs_collectpads2_OBJECTS) $(libs_collectpads2_LDADD) $(LIBS)
+libs/collectpads$(EXEEXT): $(libs_collectpads_OBJECTS) $(libs_collectpads_DEPENDENCIES) $(EXTRA_libs_collectpads_DEPENDENCIES) libs/$(am__dirstamp)
+	@rm -f libs/collectpads$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(libs_collectpads_OBJECTS) $(libs_collectpads_LDADD) $(LIBS)
 libs/controller$(EXEEXT): $(libs_controller_OBJECTS) $(libs_controller_DEPENDENCIES) $(EXTRA_libs_controller_DEPENDENCIES) libs/$(am__dirstamp)
 	@rm -f libs/controller$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(libs_controller_OBJECTS) $(libs_controller_LDADD) $(LIBS)
@@ -1483,7 +1483,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytewriter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/capsfilter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cleanup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collectpads2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collectpads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controller.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elements_fdsrc-fdsrc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elements_filesrc-filesrc.Po@am__quote@
@@ -2457,19 +2457,19 @@ bytewriter.obj: libs/bytewriter.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bytewriter.obj `if test -f 'libs/bytewriter.c'; then $(CYGPATH_W) 'libs/bytewriter.c'; else $(CYGPATH_W) '$(srcdir)/libs/bytewriter.c'; fi`
 
-collectpads2.o: libs/collectpads2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads2.o -MD -MP -MF $(DEPDIR)/collectpads2.Tpo -c -o collectpads2.o `test -f 'libs/collectpads2.c' || echo '$(srcdir)/'`libs/collectpads2.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/collectpads2.Tpo $(DEPDIR)/collectpads2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libs/collectpads2.c' object='collectpads2.o' libtool=no @AMDEPBACKSLASH@
+collectpads.o: libs/collectpads.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads.o -MD -MP -MF $(DEPDIR)/collectpads.Tpo -c -o collectpads.o `test -f 'libs/collectpads.c' || echo '$(srcdir)/'`libs/collectpads.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/collectpads.Tpo $(DEPDIR)/collectpads.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libs/collectpads.c' object='collectpads.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads2.o `test -f 'libs/collectpads2.c' || echo '$(srcdir)/'`libs/collectpads2.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads.o `test -f 'libs/collectpads.c' || echo '$(srcdir)/'`libs/collectpads.c
 
-collectpads2.obj: libs/collectpads2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads2.obj -MD -MP -MF $(DEPDIR)/collectpads2.Tpo -c -o collectpads2.obj `if test -f 'libs/collectpads2.c'; then $(CYGPATH_W) 'libs/collectpads2.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads2.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/collectpads2.Tpo $(DEPDIR)/collectpads2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libs/collectpads2.c' object='collectpads2.obj' libtool=no @AMDEPBACKSLASH@
+collectpads.obj: libs/collectpads.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads.obj -MD -MP -MF $(DEPDIR)/collectpads.Tpo -c -o collectpads.obj `if test -f 'libs/collectpads.c'; then $(CYGPATH_W) 'libs/collectpads.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/collectpads.Tpo $(DEPDIR)/collectpads.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libs/collectpads.c' object='collectpads.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads2.obj `if test -f 'libs/collectpads2.c'; then $(CYGPATH_W) 'libs/collectpads2.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads2.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads.obj `if test -f 'libs/collectpads.c'; then $(CYGPATH_W) 'libs/collectpads.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads.c'; fi`
 
 controller.o: libs/controller.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT controller.o -MD -MP -MF $(DEPDIR)/controller.Tpo -c -o controller.o `test -f 'libs/controller.c' || echo '$(srcdir)/'`libs/controller.c
diff --git a/tests/check/elements/filesrc.c b/tests/check/elements/filesrc.c
index 8fd9bc2..2a3fac4 100644
--- a/tests/check/elements/filesrc.c
+++ b/tests/check/elements/filesrc.c
@@ -404,6 +404,7 @@ GST_START_TEST (test_uri_interface)
 
 GST_END_TEST;
 
+#ifdef G_OS_UNIX
 static void
 check_uri_for_uri (GstElement * e, const gchar * in_uri, const gchar * uri)
 {
@@ -459,6 +460,7 @@ check_uri_for_location (GstElement * e, const gchar * location,
 
   g_free (query_uri);
 }
+#endif
 
 GST_START_TEST (test_uri_query)
 {
diff --git a/tests/check/elements/queue2.c b/tests/check/elements/queue2.c
index 598cfef..e850730 100644
--- a/tests/check/elements/queue2.c
+++ b/tests/check/elements/queue2.c
@@ -249,6 +249,7 @@ GST_START_TEST (test_filled_read)
           &buffer) == GST_FLOW_OK);
 
   fail_unless (gst_buffer_get_size (buffer) == 4 * 1024);
+  gst_buffer_unref (buffer);
 
   gst_element_set_state (queue2, GST_STATE_NULL);
 
diff --git a/tests/check/gst/gstmeta.c b/tests/check/gst/gstmeta.c
index 2840196..73b5d56 100644
--- a/tests/check/gst/gstmeta.c
+++ b/tests/check/gst/gstmeta.c
@@ -210,6 +210,40 @@ GST_START_TEST (test_meta_test)
 
 GST_END_TEST;
 
+static gboolean
+foreach_meta (GstBuffer * buffer, GstMeta ** meta, gpointer user_data)
+{
+  /* try to remove */
+  *meta = NULL;
+  return TRUE;
+}
+
+GST_START_TEST (test_meta_locked)
+{
+  GstBuffer *buffer;
+  GstMetaTest *meta;
+
+  buffer = gst_buffer_new_and_alloc (4);
+  fail_if (buffer == NULL);
+
+  /* add some metadata */
+  meta = GST_META_TEST_ADD (buffer);
+  fail_if (meta == NULL);
+  GST_META_FLAG_SET (meta, GST_META_FLAG_LOCKED);
+
+  ASSERT_CRITICAL (gst_buffer_remove_meta (buffer, (GstMeta *) meta));
+  ASSERT_CRITICAL (gst_buffer_foreach_meta (buffer, foreach_meta, NULL));
+
+  GST_META_FLAG_UNSET (meta, GST_META_FLAG_LOCKED);
+
+  gst_buffer_remove_meta (buffer, (GstMeta *) meta);
+
+  /* clean up */
+  gst_buffer_unref (buffer);
+}
+
+GST_END_TEST;
+
 static Suite *
 gst_buffermeta_suite (void)
 {
@@ -218,6 +252,7 @@ gst_buffermeta_suite (void)
 
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_meta_test);
+  tcase_add_test (tc_chain, test_meta_locked);
 
   return s;
 }
diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c
index cb5ef36..88f93fa 100644
--- a/tests/check/gst/gstpad.c
+++ b/tests/check/gst/gstpad.c
@@ -1085,6 +1085,7 @@ test_queue_src_caps_notify (gboolean link_queue)
 {
   GstElement *queue;
   GstPad *src, *sink, *another_pad;
+  GstCaps *caps;
 
   queue = gst_element_factory_make ("queue", NULL);
   fail_unless (queue != NULL);
@@ -1111,7 +1112,9 @@ test_queue_src_caps_notify (gboolean link_queue)
 
   g_signal_connect (src, "notify::caps", G_CALLBACK (caps_notify), NULL);
 
-  gst_pad_send_event (sink, gst_event_new_caps (gst_caps_from_string ("caps")));
+  caps = gst_caps_from_string ("caps");
+  gst_pad_send_event (sink, gst_event_new_caps (caps));
+  gst_caps_unref (caps);
 
   g_usleep (10000);
 
diff --git a/tests/check/gst/gstplugin.c b/tests/check/gst/gstplugin.c
index 3db1150..0824b06 100644
--- a/tests/check/gst/gstplugin.c
+++ b/tests/check/gst/gstplugin.c
@@ -61,7 +61,7 @@ GST_START_TEST (test_registry)
 
     /* one for the registry, one for the list */
     GST_DEBUG ("refcount %d %s", GST_OBJECT_REFCOUNT_VALUE (plugin),
-        plugin->desc.name);
+        gst_plugin_get_name (plugin));
     ASSERT_OBJECT_REFCOUNT (plugin, "plugin in registry", 2);
 
     gst_object_unref (plugin);
@@ -145,11 +145,12 @@ GST_START_TEST (test_find_plugin)
   fail_if (plugin == NULL, "Failed to find coreelements plugin");
   ASSERT_OBJECT_REFCOUNT (plugin, "plugin", 2);
 
-  fail_unless_equals_string (plugin->desc.version, VERSION);
-  fail_unless_equals_string (plugin->desc.license, "LGPL");
-  fail_unless_equals_string (plugin->desc.source, "gstreamer");
-  fail_unless_equals_string (plugin->desc.package, GST_PACKAGE_NAME);
-  fail_unless_equals_string (plugin->desc.origin, GST_PACKAGE_ORIGIN);
+  fail_unless_equals_string (gst_plugin_get_version (plugin), VERSION);
+  fail_unless_equals_string (gst_plugin_get_license (plugin), "LGPL");
+  fail_unless_equals_string (gst_plugin_get_source (plugin), "gstreamer");
+  fail_unless_equals_string (gst_plugin_get_package (plugin), GST_PACKAGE_NAME);
+  fail_unless_equals_string (gst_plugin_get_origin (plugin),
+      GST_PACKAGE_ORIGIN);
 
   gst_object_unref (plugin);
 }
diff --git a/tests/check/gst/gstpoll.c b/tests/check/gst/gstpoll.c
index 612cda1..d25c421 100644
--- a/tests/check/gst/gstpoll.c
+++ b/tests/check/gst/gstpoll.c
@@ -26,7 +26,6 @@
 #ifdef G_OS_WIN32
 #include <winsock2.h>
 #include <fcntl.h>
-#define EINPROGRESS WSAEINPROGRESS
 #else
 #include <sys/socket.h>
 #endif
diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c
index ca6c2c9..4eee4f1 100644
--- a/tests/check/gst/gsturi.c
+++ b/tests/check/gst/gsturi.c
@@ -105,6 +105,30 @@ GST_END_TEST;
 
 #endif /* G_OS_WIN32 */
 
+GST_START_TEST (test_uri_misc)
+{
+  /* require at least three characters for the protocol */
+  fail_if (gst_uri_is_valid ("B:\\foo.txt"));
+  fail_if (gst_uri_is_valid ("B:/foo.txt"));
+  fail_if (gst_uri_is_valid ("B://foo.txt"));
+  fail_if (gst_uri_is_valid ("B:foo.txt"));
+
+  fail_if (gst_uri_is_valid ("AB:\\foo.txt"));
+  fail_if (gst_uri_is_valid ("AB:/foo.txt"));
+  fail_if (gst_uri_is_valid ("AB://foo.txt"));
+  fail_if (gst_uri_is_valid ("AB:foo.txt"));
+
+  fail_unless (gst_uri_is_valid ("ABC:/foo.txt"));
+  fail_unless (gst_uri_is_valid ("ABC://foo.txt"));
+  fail_unless (gst_uri_is_valid ("ABC:foo.txt"));
+
+  fail_unless (gst_uri_is_valid ("ABCD:/foo.txt"));
+  fail_unless (gst_uri_is_valid ("ABCD://foo.txt"));
+  fail_unless (gst_uri_is_valid ("ABCD:foo.txt"));
+}
+
+GST_END_TEST;
+
 static Suite *
 gst_uri_suite (void)
 {
@@ -116,6 +140,7 @@ gst_uri_suite (void)
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_protocol_case);
   tcase_add_test (tc_chain, test_uri_get_location);
+  tcase_add_test (tc_chain, test_uri_misc);
 #ifdef G_OS_WIN32
   tcase_add_test (tc_chain, test_win32_uri);
 #endif
diff --git a/tests/check/libs/adapter.c b/tests/check/libs/adapter.c
index bf356b9..e3b801a 100644
--- a/tests/check/libs/adapter.c
+++ b/tests/check/libs/adapter.c
@@ -257,8 +257,10 @@ GST_START_TEST (test_take3)
   avail = gst_adapter_available (adapter);
   fail_unless (avail == 0);
 
-  /* the data should be the same */
+#if 0
+  /* the data should be the same FIXME, implement span in adapter again. */
   fail_unless (info.data == info2.data);
+#endif
 
   gst_buffer_unmap (buffer2, &info2);
   gst_buffer_unref (buffer2);
@@ -805,6 +807,33 @@ GST_START_TEST (test_take_list)
 
 GST_END_TEST;
 
+GST_START_TEST (test_merge)
+{
+  GstAdapter *adapter;
+  GstBuffer *buffer;
+  gint i;
+
+  adapter = gst_adapter_new ();
+  fail_if (adapter == NULL);
+
+  buffer = gst_buffer_new_and_alloc (10);
+  fail_if (buffer == NULL);
+  gst_adapter_push (adapter, buffer);
+
+  for (i = 0; i < 1000; i++) {
+    buffer = gst_buffer_new_and_alloc (10);
+    gst_adapter_push (adapter, buffer);
+
+    fail_unless (gst_adapter_map (adapter, 20) != NULL);
+    gst_adapter_unmap (adapter);
+
+    gst_adapter_flush (adapter, 10);
+  }
+  g_object_unref (adapter);
+}
+
+GST_END_TEST;
+
 static Suite *
 gst_adapter_suite (void)
 {
@@ -823,6 +852,7 @@ gst_adapter_suite (void)
   tcase_add_test (tc_chain, test_timestamp);
   tcase_add_test (tc_chain, test_scan);
   tcase_add_test (tc_chain, test_take_list);
+  tcase_add_test (tc_chain, test_merge);
 
   return s;
 }
diff --git a/tests/check/libs/collectpads2.c b/tests/check/libs/collectpads.c
index 2a04aa2..72cac1b 100644
--- a/tests/check/libs/collectpads2.c
+++ b/tests/check/libs/collectpads.c
@@ -1,5 +1,5 @@
 /*
- * collectpads.c - GstCollectPads2 testsuite
+ * collectpads.c - GstCollectPads testsuite
  * Copyright (C) 2006 Alessandro Decina <alessandro@nnva.org>
  *
  * Authors:
@@ -22,7 +22,7 @@
  */
 
 #include <gst/check/gstcheck.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
 
 #define fail_unless_collected(expected)           \
 G_STMT_START {                                    \
@@ -36,11 +36,11 @@ G_STMT_START {                                    \
 typedef struct
 {
   char foo;
-} BadCollectData2;
+} BadCollectData;
 
 typedef struct
 {
-  GstCollectData2 data;
+  GstCollectData data;
   GstPad *pad;
   GstBuffer *buffer;
   GstEvent *event;
@@ -56,7 +56,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS_ANY);
 
-static GstCollectPads2 *collect;
+static GstCollectPads *collect;
 static gboolean collected;
 static GstPad *srcpad1, *srcpad2;
 static GstPad *sinkpad1, *sinkpad2;
@@ -66,7 +66,7 @@ static GMutex *lock;
 static GCond *cond;
 
 static GstFlowReturn
-collected_cb (GstCollectPads2 * pads, gpointer user_data)
+collected_cb (GstCollectPads * pads, gpointer user_data)
 {
   g_mutex_lock (lock);
   collected = TRUE;
@@ -100,8 +100,8 @@ push_event (gpointer user_data)
 static void
 setup (void)
 {
-  collect = gst_collect_pads2_new ();
-  gst_collect_pads2_set_function (collect, collected_cb, NULL);
+  collect = gst_collect_pads_new ();
+  gst_collect_pads_set_function (collect, collected_cb, NULL);
 
   srcpad1 = gst_pad_new_from_static_template (&srctemplate, "src1");
   srcpad2 = gst_pad_new_from_static_template (&srctemplate, "src2");
@@ -134,15 +134,15 @@ teardown (void)
 
 GST_START_TEST (test_pad_add_remove)
 {
-  ASSERT_CRITICAL (gst_collect_pads2_add_pad (collect, sinkpad1,
-          sizeof (BadCollectData2)));
+  ASSERT_CRITICAL (gst_collect_pads_add_pad (collect, sinkpad1,
+          sizeof (BadCollectData)));
 
-  data1 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data1 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad1, sizeof (TestData));
   fail_unless (data1 != NULL);
 
-  fail_unless (gst_collect_pads2_remove_pad (collect, sinkpad2) == FALSE);
-  fail_unless (gst_collect_pads2_remove_pad (collect, sinkpad1) == TRUE);
+  fail_unless (gst_collect_pads_remove_pad (collect, sinkpad2) == FALSE);
+  fail_unless (gst_collect_pads_remove_pad (collect, sinkpad1) == TRUE);
 }
 
 GST_END_TEST;
@@ -152,11 +152,11 @@ GST_START_TEST (test_collect)
   GstBuffer *buf1, *buf2, *tmp;
   GThread *thread1, *thread2;
 
-  data1 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data1 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad1, sizeof (TestData));
   fail_unless (data1 != NULL);
 
-  data2 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data2 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad2, sizeof (TestData));
   fail_unless (data2 != NULL);
 
@@ -164,7 +164,7 @@ GST_START_TEST (test_collect)
   buf2 = gst_buffer_new ();
 
   /* start collect pads */
-  gst_collect_pads2_start (collect);
+  gst_collect_pads_start (collect);
 
   /* push buffers on the pads */
   data1->pad = srcpad1;
@@ -180,9 +180,9 @@ GST_START_TEST (test_collect)
   /* now both pads have a buffer */
   fail_unless_collected (TRUE);
 
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1);
   fail_unless (tmp == buf1);
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2);
   fail_unless (tmp == buf2);
 
   /* these will return immediately as at this point the threads have been
@@ -190,7 +190,7 @@ GST_START_TEST (test_collect)
   g_thread_join (thread1);
   g_thread_join (thread2);
 
-  gst_collect_pads2_stop (collect);
+  gst_collect_pads_stop (collect);
 
   gst_buffer_unref (buf1);
   gst_buffer_unref (buf2);
@@ -203,18 +203,18 @@ GST_START_TEST (test_collect_eos)
   GstBuffer *buf1, *tmp;
   GThread *thread1, *thread2;
 
-  data1 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data1 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad1, sizeof (TestData));
   fail_unless (data1 != NULL);
 
-  data2 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data2 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad2, sizeof (TestData));
   fail_unless (data2 != NULL);
 
   buf1 = gst_buffer_new ();
 
   /* start collect pads */
-  gst_collect_pads2_start (collect);
+  gst_collect_pads_start (collect);
 
   /* push a buffer on srcpad1 and EOS on srcpad2 */
   data1->pad = srcpad1;
@@ -229,10 +229,10 @@ GST_START_TEST (test_collect_eos)
   /* now sinkpad1 has a buffer and sinkpad2 has EOS */
   fail_unless_collected (TRUE);
 
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1);
   fail_unless (tmp == buf1);
   /* sinkpad2 has EOS so a NULL buffer is returned */
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2);
   fail_unless (tmp == NULL);
 
   /* these will return immediately as when the data is popped the threads are
@@ -240,7 +240,7 @@ GST_START_TEST (test_collect_eos)
   g_thread_join (thread1);
   g_thread_join (thread2);
 
-  gst_collect_pads2_stop (collect);
+  gst_collect_pads_stop (collect);
 
   gst_buffer_unref (buf1);
 }
@@ -252,18 +252,18 @@ GST_START_TEST (test_collect_twice)
   GstBuffer *buf1, *buf2, *tmp;
   GThread *thread1, *thread2;
 
-  data1 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data1 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad1, sizeof (TestData));
   fail_unless (data1 != NULL);
 
-  data2 = (TestData *) gst_collect_pads2_add_pad (collect,
+  data2 = (TestData *) gst_collect_pads_add_pad (collect,
       sinkpad2, sizeof (TestData));
   fail_unless (data2 != NULL);
 
   buf1 = gst_buffer_new ();
 
   /* start collect pads */
-  gst_collect_pads2_start (collect);
+  gst_collect_pads_start (collect);
 
   /* queue a buffer */
   data1->pad = srcpad1;
@@ -280,10 +280,10 @@ GST_START_TEST (test_collect_twice)
   /* one of the pads has a buffer, the other has EOS */
   fail_unless_collected (TRUE);
 
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1);
   fail_unless (tmp == buf1);
   /* there's nothing to pop from the one which received EOS */
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2);
   fail_unless (tmp == NULL);
 
   /* these will return immediately as at this point the threads have been
@@ -291,13 +291,13 @@ GST_START_TEST (test_collect_twice)
   g_thread_join (thread1);
   g_thread_join (thread2);
 
-  gst_collect_pads2_stop (collect);
+  gst_collect_pads_stop (collect);
   collected = FALSE;
 
   buf2 = gst_buffer_new ();
 
   /* start collect pads */
-  gst_collect_pads2_start (collect);
+  gst_collect_pads_start (collect);
 
   /* push buffers on the pads */
   data1->pad = srcpad1;
@@ -313,9 +313,9 @@ GST_START_TEST (test_collect_twice)
   /* now both pads have a buffer */
   fail_unless_collected (TRUE);
 
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1);
   fail_unless (tmp == buf1);
-  tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2);
+  tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2);
   fail_unless (tmp == buf2);
 
   /* these will return immediately as at this point the threads have been
@@ -323,7 +323,7 @@ GST_START_TEST (test_collect_twice)
   g_thread_join (thread1);
   g_thread_join (thread2);
 
-  gst_collect_pads2_stop (collect);
+  gst_collect_pads_stop (collect);
 
   gst_buffer_unref (buf1);
   gst_buffer_unref (buf2);
@@ -333,12 +333,12 @@ GST_START_TEST (test_collect_twice)
 GST_END_TEST;
 
 static Suite *
-gst_collect_pads2_suite (void)
+gst_collect_pads_suite (void)
 {
   Suite *suite;
   TCase *general;
 
-  suite = suite_create ("GstCollectPads2");
+  suite = suite_create ("GstCollectPads");
   general = tcase_create ("general");
   suite_add_tcase (suite, general);
   tcase_add_checked_fixture (general, setup, teardown);
@@ -350,4 +350,4 @@ gst_collect_pads2_suite (void)
   return suite;
 }
 
-GST_CHECK_MAIN (gst_collect_pads2);
+GST_CHECK_MAIN (gst_collect_pads);
diff --git a/tests/check/libs/controller.c b/tests/check/libs/controller.c
index 68388c7..c8d9528 100644
--- a/tests/check/libs/controller.c
+++ b/tests/check/libs/controller.c
@@ -605,6 +605,7 @@ GST_START_TEST (controller_interpolation_linear_value_array)
   GstElement *elem;
   gdouble *raw_values;
   GValue *g_values;
+  gint *values;
 
   elem = gst_element_factory_make ("testobj", NULL);
 
@@ -633,10 +634,10 @@ GST_START_TEST (controller_interpolation_linear_value_array)
 
   g_free (raw_values);
 
-  /* now pull in mapped values for some timestamps */
+  /* now pull in mapped GValues for some timestamps */
   g_values = g_new0 (GValue, 3);
 
-  fail_unless (gst_object_get_value_array (GST_OBJECT (elem), "int",
+  fail_unless (gst_object_get_g_value_array (GST_OBJECT (elem), "int",
           0, GST_SECOND / 2, 3, g_values));
   fail_unless_equals_int (g_value_get_int (&g_values[0]), 0);
   fail_unless_equals_int (g_value_get_int (&g_values[1]), 50);
@@ -644,6 +645,17 @@ GST_START_TEST (controller_interpolation_linear_value_array)
 
   g_free (g_values);
 
+  /* now pull in mapped values for some timestamps */
+  values = g_new0 (gint, 3);
+
+  fail_unless (gst_object_get_value_array (GST_OBJECT (elem), "int",
+          0, GST_SECOND / 2, 3, values));
+  fail_unless_equals_int (values[0], 0);
+  fail_unless_equals_int (values[1], 50);
+  fail_unless_equals_int (values[2], 100);
+
+  g_free (values);
+
   gst_object_unref (cs);
   gst_object_unref (elem);
 }
diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc
index 29939a3..0009ec3 100644
--- a/tests/check/libs/gstlibscpp.cc
+++ b/tests/check/libs/gstlibscpp.cc
@@ -31,7 +31,7 @@
 #include <gst/base/gstbitreader.h>
 #include <gst/base/gstbytereader.h>
 #include <gst/base/gstbytewriter.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
 #include <gst/base/gstpushsrc.h>
 #include <gst/base/gsttypefindhelper.h>
 
diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in
index 1be1810..2b91820 100644
--- a/tests/examples/Makefile.in
+++ b/tests/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/adapter/Makefile.in b/tests/examples/adapter/Makefile.in
index 2855e15..eff729e 100644
--- a/tests/examples/adapter/Makefile.in
+++ b/tests/examples/adapter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/controller/Makefile.in b/tests/examples/controller/Makefile.in
index 263defe..9dae073 100644
--- a/tests/examples/controller/Makefile.in
+++ b/tests/examples/controller/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/controller/control-sources.c b/tests/examples/controller/control-sources.c
index 950cee2..7d74a87 100644
--- a/tests/examples/controller/control-sources.c
+++ b/tests/examples/controller/control-sources.c
@@ -230,15 +230,15 @@ test_interpolation (void)
 
   g_object_set (cs, "mode", GST_INTERPOLATION_MODE_NONE, NULL);
   v1 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1);
 
   g_object_set (cs, "mode", GST_INTERPOLATION_MODE_LINEAR, NULL);
   v2 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2);
 
   g_object_set (cs, "mode", GST_INTERPOLATION_MODE_CUBIC, NULL);
   v3 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3);
 
   for (t = 0; t < n_values; t++) {
     i1 = g_value_get_int (&v1[t]);
@@ -320,23 +320,23 @@ test_lfo (void)
 
   g_object_set (cs, "waveform", GST_LFO_WAVEFORM_SINE, NULL);
   v1 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1);
 
   g_object_set (cs, "waveform", GST_LFO_WAVEFORM_SQUARE, NULL);
   v2 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2);
 
   g_object_set (cs, "waveform", GST_LFO_WAVEFORM_SAW, NULL);
   v3 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3);
 
   g_object_set (cs, "waveform", GST_LFO_WAVEFORM_REVERSE_SAW, NULL);
   v4 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v4);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v4);
 
   g_object_set (cs, "waveform", GST_LFO_WAVEFORM_TRIANGLE, NULL);
   v5 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v5);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v5);
 
   for (t = 0; t < n_values; t++) {
     i1 = g_value_get_int (&v1[t]);
@@ -418,7 +418,7 @@ test_chained_lfo (void)
   n_values = 40 * 10;
 
   v1 = g_new0 (GValue, n_values);
-  gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1);
+  gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1);
 
   for (t = 0; t < n_values; t++) {
     i1 = g_value_get_int (&v1[t]);
diff --git a/tests/examples/helloworld/Makefile.in b/tests/examples/helloworld/Makefile.in
index 3d6b019..0b76d4a 100644
--- a/tests/examples/helloworld/Makefile.in
+++ b/tests/examples/helloworld/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/launch/Makefile.in b/tests/examples/launch/Makefile.in
index 254433f..dc26c1e 100644
--- a/tests/examples/launch/Makefile.in
+++ b/tests/examples/launch/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/manual/Makefile.in b/tests/examples/manual/Makefile.in
index 4b86cef..ea8c449 100644
--- a/tests/examples/manual/Makefile.in
+++ b/tests/examples/manual/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/metadata/Makefile.in b/tests/examples/metadata/Makefile.in
index 9b2f4fb..a3817bb 100644
--- a/tests/examples/metadata/Makefile.in
+++ b/tests/examples/metadata/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/queue/Makefile.in b/tests/examples/queue/Makefile.in
index 7bd50f3..9a25fc8 100644
--- a/tests/examples/queue/Makefile.in
+++ b/tests/examples/queue/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/stepping/Makefile.in b/tests/examples/stepping/Makefile.in
index 2f29500..e7d9916 100644
--- a/tests/examples/stepping/Makefile.in
+++ b/tests/examples/stepping/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/streams/Makefile.in b/tests/examples/streams/Makefile.in
index fcdcb2d..12cb5a0 100644
--- a/tests/examples/streams/Makefile.in
+++ b/tests/examples/streams/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/examples/typefind/Makefile.in b/tests/examples/typefind/Makefile.in
index 62589cd..843995f 100644
--- a/tests/examples/typefind/Makefile.in
+++ b/tests/examples/typefind/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 75c9826..2ad1eea 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,