test/{c,direct}: Fix copyright headers

10 files changed, 27 insertions, 32 deletions

diff --git a/test/c/Makefile.am b/test/c/Makefile.am
index 696af4be..7f404f44 100644
--- a/test/c/Makefile.am
+++ b/test/c/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.decl
-
 INCLUDES = \
   -I$(top_srcdir)/src -I$(top_builddir)/src \
   $(GIO_UNIX_CFLAGS) \
diff --git a/test/c/test-event.c b/test/c/test-event.c
index 169cf400..9e511daf 100644
--- a/test/c/test-event.c
+++ b/test/c/test-event.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
- *
  */
 
 #include <glib.h>
diff --git a/test/c/test-log.c b/test/c/test-log.c
index fb18c972..4ae286b3 100644
--- a/test/c/test-log.c
+++ b/test/c/test-log.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
- *
  */
 
 #include <glib.h>
diff --git a/test/c/test-mimetypes.c b/test/c/test-mimetypes.c
index 897c5a5c..c6399a78 100644
--- a/test/c/test-mimetypes.c
+++ b/test/c/test-mimetypes.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
- *
  */
 
 #include <glib.h>
@@ -100,4 +99,4 @@ main (int   argc,
               setup, test_scheme_none, teardown);
   
   return g_test_run();
-}
\ No newline at end of file
+}
diff --git a/test/c/test-monitor.c b/test/c/test-monitor.c
index 698deab4..7941705a 100644
--- a/test/c/test-monitor.c
+++ b/test/c/test-monitor.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
- *
  */
 
 #include <glib.h>
@@ -79,4 +78,4 @@ main (int   argc,
               setup, test_create, teardown);
   
   return g_test_run();
-}
\ No newline at end of file
+}
diff --git a/test/c/test-symbols.c b/test/c/test-symbols.c
index c584f092..c05c271d 100644
--- a/test/c/test-symbols.c
+++ b/test/c/test-symbols.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Michal Hruby <michal.mhr@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Michal Hruby <michal.mhr@gmail.com>
- *
  */
 
 #include <glib.h>
diff --git a/test/c/test-timerange.c b/test/c/test-timerange.c
index 34ed54e2..6c90ddca 100644
--- a/test/c/test-timerange.c
+++ b/test/c/test-timerange.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
- *
  */
 
 #include <glib.h>
diff --git a/test/c/test-timestamp.c b/test/c/test-timestamp.c
index 41925599..c0043b15 100644
--- a/test/c/test-timestamp.c
+++ b/test/c/test-timestamp.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright © 2010 Canonical Ltd.
+ *             By Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -13,8 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
- *
  */
 
 #include <glib.h>
@@ -182,4 +181,4 @@ main (int   argc,
               setup, test_next_midnight, teardown);
   
   return g_test_run();
-}
\ No newline at end of file
+}
diff --git a/test/direct/event-test.vala b/test/direct/event-test.vala
index 226604ee..0a04a0bf 100644
--- a/test/direct/event-test.vala
+++ b/test/direct/event-test.vala
@@ -1,7 +1,9 @@
-/* datamodel-test.vala
+/* event-test.vala
  *
- * Copyright © 2012 Canonical Ltd.
- *             By Siegfried-A. Gevatter <siegfried.gevatter@collabora.co.uk>
+ * Copyright © 2012 Christian Dywan <christian@twotoasts.de>
+ *
+ * Based upon a C implementation (© 2010 Canonical Ltd) by:
+ *  Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
diff --git a/test/direct/log-test.vala b/test/direct/log-test.vala
index c94d219b..2d9207d5 100644
--- a/test/direct/log-test.vala
+++ b/test/direct/log-test.vala
@@ -1,7 +1,9 @@
-/* datamodel-test.vala
+/* log-test.vala
  *
- * Copyright © 2012 Canonical Ltd.
- *             By Siegfried-A. Gevatter <siegfried.gevatter@collabora.co.uk>
+ * Copyright © 2012 Christian Dywan <christian@twotoasts.de>
+ *
+ * Based upon a C implementation (© 2010 Canonical Ltd) by:
+ *  Mikkel Kamstrup Erlandsen <mikkel.kamstrup@canonical.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by