Standardize licences to LGPLv3, update years, remove authors Fixes: #1483664

Approved by: Daniel d'Andrada

91 files changed, 146 insertions, 223 deletions

diff --git a/debian/copyright b/debian/copyright
index f213ba2..f29743d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ License: GPL-3
 
 Files: tests/*
 Copyright: 2013-2014 Canonical Ltd.
-License: GPL-3
+License: LGPL-3
 
 License: LGPL-3
  This package is free software; you can redistribute it and/or
diff --git a/src/common/abstractdbusservicemonitor.cpp b/src/common/abstractdbusservicemonitor.cpp
index e0f8ab2..f3630d9 100644
--- a/src/common/abstractdbusservicemonitor.cpp
+++ b/src/common/abstractdbusservicemonitor.cpp
@@ -1,20 +1,16 @@
 /*
  * Copyright (C) 2011-2015 Canonical, Ltd.
  *
- * Authors:
- *  Ugo Riboni <ugo.riboni@canonical.com>
- *  Gerry Boland <gerry.boland@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 version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/common/abstractdbusservicemonitor.h b/src/common/abstractdbusservicemonitor.h
index 12b9141..8527c25 100644
--- a/src/common/abstractdbusservicemonitor.h
+++ b/src/common/abstractdbusservicemonitor.h
@@ -1,20 +1,16 @@
 /*
  * Copyright (C) 2011-2015 Canonical, Ltd.
  *
- * Authors:
- *  Ugo Riboni <ugo.riboni@canonical.com>
- *  Gerry Boland <gerry.boland@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 version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/modules/Unity/Application/applicationcontroller.h b/src/modules/Unity/Application/applicationcontroller.h
index 5046efc..3098fcb 100644
--- a/src/modules/Unity/Application/applicationcontroller.h
+++ b/src/modules/Unity/Application/applicationcontroller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/applicationscreenshotprovider.cpp b/src/modules/Unity/Application/applicationscreenshotprovider.cpp
index d782c33..d85df7e 100644
--- a/src/modules/Unity/Application/applicationscreenshotprovider.cpp
+++ b/src/modules/Unity/Application/applicationscreenshotprovider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/applicationscreenshotprovider.h b/src/modules/Unity/Application/applicationscreenshotprovider.h
index 6e1ca64..a9eff31 100644
--- a/src/modules/Unity/Application/applicationscreenshotprovider.h
+++ b/src/modules/Unity/Application/applicationscreenshotprovider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/dbuswindowstack.cpp b/src/modules/Unity/Application/dbuswindowstack.cpp
index c20143e..c7d3815 100644
--- a/src/modules/Unity/Application/dbuswindowstack.cpp
+++ b/src/modules/Unity/Application/dbuswindowstack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/dbuswindowstack.h b/src/modules/Unity/Application/dbuswindowstack.h
index 900b69d..df2a1b2 100644
--- a/src/modules/Unity/Application/dbuswindowstack.h
+++ b/src/modules/Unity/Application/dbuswindowstack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/desktopfilereader.cpp b/src/modules/Unity/Application/desktopfilereader.cpp
index 2c2963a..e7f4d5f 100644
--- a/src/modules/Unity/Application/desktopfilereader.cpp
+++ b/src/modules/Unity/Application/desktopfilereader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/desktopfilereader.h b/src/modules/Unity/Application/desktopfilereader.h
index 771855b..2cd09fb 100644
--- a/src/modules/Unity/Application/desktopfilereader.h
+++ b/src/modules/Unity/Application/desktopfilereader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/mirbuffersgtexture.cpp b/src/modules/Unity/Application/mirbuffersgtexture.cpp
index a8d5db9..777ad49 100644
--- a/src/modules/Unity/Application/mirbuffersgtexture.cpp
+++ b/src/modules/Unity/Application/mirbuffersgtexture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/mirbuffersgtexture.h b/src/modules/Unity/Application/mirbuffersgtexture.h
index 84b0763..81ae080 100644
--- a/src/modules/Unity/Application/mirbuffersgtexture.h
+++ b/src/modules/Unity/Application/mirbuffersgtexture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef MIRBUFFERSGTEXTURE_H
diff --git a/src/modules/Unity/Application/mirsurfaceitem.cpp b/src/modules/Unity/Application/mirsurfaceitem.cpp
index e8f1f2b..8b2710c 100644
--- a/src/modules/Unity/Application/mirsurfaceitem.cpp
+++ b/src/modules/Unity/Application/mirsurfaceitem.cpp
@@ -12,10 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel d'Andrada <daniel.dandrada@canonical.com>
- *     Gerry Boland <gerry.boland@canonical.com>
  */
 
 // local
diff --git a/src/modules/Unity/Application/mirsurfacemanager.cpp b/src/modules/Unity/Application/mirsurfacemanager.cpp
index 9b32363..262600f 100644
--- a/src/modules/Unity/Application/mirsurfacemanager.cpp
+++ b/src/modules/Unity/Application/mirsurfacemanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/mirsurfacemanager.h b/src/modules/Unity/Application/mirsurfacemanager.h
index 83ede11..ec79d88 100644
--- a/src/modules/Unity/Application/mirsurfacemanager.h
+++ b/src/modules/Unity/Application/mirsurfacemanager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/plugin.cpp b/src/modules/Unity/Application/plugin.cpp
index 5d03c43..d610101 100644
--- a/src/modules/Unity/Application/plugin.cpp
+++ b/src/modules/Unity/Application/plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/proc_info.cpp b/src/modules/Unity/Application/proc_info.cpp
index 1bd0d51..0ad0efa 100644
--- a/src/modules/Unity/Application/proc_info.cpp
+++ b/src/modules/Unity/Application/proc_info.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/proc_info.h b/src/modules/Unity/Application/proc_info.h
index a5501ad..e700187 100644
--- a/src/modules/Unity/Application/proc_info.h
+++ b/src/modules/Unity/Application/proc_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/session.cpp b/src/modules/Unity/Application/session.cpp
index 2cd1024..033e188 100644
--- a/src/modules/Unity/Application/session.cpp
+++ b/src/modules/Unity/Application/session.cpp
@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2014,2015 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/modules/Unity/Application/session.h b/src/modules/Unity/Application/session.h
index cbc4cac..f80d36e 100644
--- a/src/modules/Unity/Application/session.h
+++ b/src/modules/Unity/Application/session.h
@@ -1,16 +1,16 @@
 /*
  * Copyright (C) 2014-2015 Canonical, Ltd.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/modules/Unity/Application/session_interface.h b/src/modules/Unity/Application/session_interface.h
index 186e372..819b581 100644
--- a/src/modules/Unity/Application/session_interface.h
+++ b/src/modules/Unity/Application/session_interface.h
@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2014,2015 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/modules/Unity/Application/sessionmanager.cpp b/src/modules/Unity/Application/sessionmanager.cpp
index 9b5e14f..706440a 100644
--- a/src/modules/Unity/Application/sessionmanager.cpp
+++ b/src/modules/Unity/Application/sessionmanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/sessionmanager.h b/src/modules/Unity/Application/sessionmanager.h
index ee62f37..cb9ac93 100644
--- a/src/modules/Unity/Application/sessionmanager.h
+++ b/src/modules/Unity/Application/sessionmanager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/taskcontroller.cpp b/src/modules/Unity/Application/taskcontroller.cpp
index 1d9ef0d..a55c640 100644
--- a/src/modules/Unity/Application/taskcontroller.cpp
+++ b/src/modules/Unity/Application/taskcontroller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Ricardo Mendoza <ricardo.mendoza@canonical.com>
  */
 
 // local
diff --git a/src/modules/Unity/Application/taskcontroller.h b/src/modules/Unity/Application/taskcontroller.h
index c9a5591..0f82250 100644
--- a/src/modules/Unity/Application/taskcontroller.h
+++ b/src/modules/Unity/Application/taskcontroller.h
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Ricardo Mendoza <ricardo.mendoza@canonical.com>
  */
 
 #ifndef TASKCONTROLLER_H
diff --git a/src/modules/Unity/Application/ubuntukeyboardinfo.cpp b/src/modules/Unity/Application/ubuntukeyboardinfo.cpp
index 96ded0e..2cbb9ca 100644
--- a/src/modules/Unity/Application/ubuntukeyboardinfo.cpp
+++ b/src/modules/Unity/Application/ubuntukeyboardinfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/modules/Unity/Application/ubuntukeyboardinfo.h b/src/modules/Unity/Application/ubuntukeyboardinfo.h
index a124b58..49f21fb 100644
--- a/src/modules/Unity/Application/ubuntukeyboardinfo.h
+++ b/src/modules/Unity/Application/ubuntukeyboardinfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/clipboard.cpp b/src/platforms/mirserver/clipboard.cpp
index e115cf7..2121fa4 100644
--- a/src/platforms/mirserver/clipboard.cpp
+++ b/src/platforms/mirserver/clipboard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #include "clipboard.h"
diff --git a/src/platforms/mirserver/clipboard.h b/src/platforms/mirserver/clipboard.h
index 2675a33..d74275f 100644
--- a/src/platforms/mirserver/clipboard.h
+++ b/src/platforms/mirserver/clipboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #ifndef QTMIR_CLIPBOARD_H
diff --git a/src/platforms/mirserver/display.cpp b/src/platforms/mirserver/display.cpp
index 7228f6e..5ae9c48 100644
--- a/src/platforms/mirserver/display.cpp
+++ b/src/platforms/mirserver/display.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #include "display.h"
diff --git a/src/platforms/mirserver/display.h b/src/platforms/mirserver/display.h
index bc77381..c8d8a18 100644
--- a/src/platforms/mirserver/display.h
+++ b/src/platforms/mirserver/display.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef DISPLAY_H
diff --git a/src/platforms/mirserver/displaywindow.cpp b/src/platforms/mirserver/displaywindow.cpp
index a7d0298..550edbf 100644
--- a/src/platforms/mirserver/displaywindow.cpp
+++ b/src/platforms/mirserver/displaywindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,9 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <gerry.boland@canonical.com>
- *          Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #include "displaywindow.h"
diff --git a/src/platforms/mirserver/displaywindow.h b/src/platforms/mirserver/displaywindow.h
index 086877c..4ff9780 100644
--- a/src/platforms/mirserver/displaywindow.h
+++ b/src/platforms/mirserver/displaywindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef DISPLAYWINDOW_H
diff --git a/src/platforms/mirserver/miropenglcontext.cpp b/src/platforms/mirserver/miropenglcontext.cpp
index 6c9360a..d3c3e52 100644
--- a/src/platforms/mirserver/miropenglcontext.cpp
+++ b/src/platforms/mirserver/miropenglcontext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #include "miropenglcontext.h"
diff --git a/src/platforms/mirserver/miropenglcontext.h b/src/platforms/mirserver/miropenglcontext.h
index c1d6274..ef19a53 100644
--- a/src/platforms/mirserver/miropenglcontext.h
+++ b/src/platforms/mirserver/miropenglcontext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef MIROPENGLCONTEXT_H
diff --git a/src/platforms/mirserver/mirserver.cpp b/src/platforms/mirserver/mirserver.cpp
index f7bb74a..f182aba 100644
--- a/src/platforms/mirserver/mirserver.cpp
+++ b/src/platforms/mirserver/mirserver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/mirserver.h b/src/platforms/mirserver/mirserver.h
index 3956f9c..39b847e 100644
--- a/src/platforms/mirserver/mirserver.h
+++ b/src/platforms/mirserver/mirserver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/mirserverintegration.cpp b/src/platforms/mirserver/mirserverintegration.cpp
index 12d6544..d2820cf 100644
--- a/src/platforms/mirserver/mirserverintegration.cpp
+++ b/src/platforms/mirserver/mirserverintegration.cpp
@@ -12,9 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <gerry.boland@canonical.com>
- *          Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #include "mirserverintegration.h"
diff --git a/src/platforms/mirserver/mirserverintegration.h b/src/platforms/mirserver/mirserverintegration.h
index cc719e8..2437c80 100644
--- a/src/platforms/mirserver/mirserverintegration.h
+++ b/src/platforms/mirserver/mirserverintegration.h
@@ -12,9 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <gerry.boland@canonical.com>
- *          Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #ifndef MIRSERVERINTEGRATION_H
diff --git a/src/platforms/mirserver/mirserverstatuslistener.cpp b/src/platforms/mirserver/mirserverstatuslistener.cpp
index f684464..290647a 100644
--- a/src/platforms/mirserver/mirserverstatuslistener.cpp
+++ b/src/platforms/mirserver/mirserverstatuslistener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/mirserverstatuslistener.h b/src/platforms/mirserver/mirserverstatuslistener.h
index a4b7bb6..a8140c7 100644
--- a/src/platforms/mirserver/mirserverstatuslistener.h
+++ b/src/platforms/mirserver/mirserverstatuslistener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/mirwindowmanager.cpp b/src/platforms/mirserver/mirwindowmanager.cpp
index cae66d4..2123e73 100644
--- a/src/platforms/mirserver/mirwindowmanager.cpp
+++ b/src/platforms/mirserver/mirwindowmanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2015 Canonical Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/mirwindowmanager.h b/src/platforms/mirserver/mirwindowmanager.h
index 0ec1839..1a9e871 100644
--- a/src/platforms/mirserver/mirwindowmanager.h
+++ b/src/platforms/mirserver/mirwindowmanager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2015 Canonical Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/nativeinterface.cpp b/src/platforms/mirserver/nativeinterface.cpp
index 6cc4c0d..cec3b71 100644
--- a/src/platforms/mirserver/nativeinterface.cpp
+++ b/src/platforms/mirserver/nativeinterface.cpp
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #include "nativeinterface.h"
diff --git a/src/platforms/mirserver/nativeinterface.h b/src/platforms/mirserver/nativeinterface.h
index da97663..647dbdc 100644
--- a/src/platforms/mirserver/nativeinterface.h
+++ b/src/platforms/mirserver/nativeinterface.h
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef NATIVEINTEGRATION_H
diff --git a/src/platforms/mirserver/plugin.cpp b/src/platforms/mirserver/plugin.cpp
index cb53add..cbae1cf 100644
--- a/src/platforms/mirserver/plugin.cpp
+++ b/src/platforms/mirserver/plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #include "plugin.h"
diff --git a/src/platforms/mirserver/plugin.h b/src/platforms/mirserver/plugin.h
index 87a7e8a..09f9729 100644
--- a/src/platforms/mirserver/plugin.h
+++ b/src/platforms/mirserver/plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef PLUGIN_H
diff --git a/src/platforms/mirserver/promptsessionlistener.cpp b/src/platforms/mirserver/promptsessionlistener.cpp
index ba6ce50..6ffd3a8 100644
--- a/src/platforms/mirserver/promptsessionlistener.cpp
+++ b/src/platforms/mirserver/promptsessionlistener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/promptsessionlistener.h b/src/platforms/mirserver/promptsessionlistener.h
index 8753092..c36950e 100644
--- a/src/platforms/mirserver/promptsessionlistener.h
+++ b/src/platforms/mirserver/promptsessionlistener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/qtcompositor.cpp b/src/platforms/mirserver/qtcompositor.cpp
index 5014139..72d6200 100644
--- a/src/platforms/mirserver/qtcompositor.cpp
+++ b/src/platforms/mirserver/qtcompositor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,9 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <gerry.boland@canonical.com>
- *          Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #include "qtcompositor.h"
diff --git a/src/platforms/mirserver/qtcompositor.h b/src/platforms/mirserver/qtcompositor.h
index a6d2352..254753d 100644
--- a/src/platforms/mirserver/qtcompositor.h
+++ b/src/platforms/mirserver/qtcompositor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Gerry Boland <gerry.boland@canonical.com>
  */
 
 #ifndef QTCOMPOSITOR_H
diff --git a/src/platforms/mirserver/qteventfeeder.cpp b/src/platforms/mirserver/qteventfeeder.cpp
index e51c8d1..d5c2e18 100644
--- a/src/platforms/mirserver/qteventfeeder.cpp
+++ b/src/platforms/mirserver/qteventfeeder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,9 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
- *              Gerry Boland <gerry.boland@canonical.com>
  */
 
 #include "qteventfeeder.h"
diff --git a/src/platforms/mirserver/qteventfeeder.h b/src/platforms/mirserver/qteventfeeder.h
index d786715..3bc8217 100644
--- a/src/platforms/mirserver/qteventfeeder.h
+++ b/src/platforms/mirserver/qteventfeeder.h
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #ifndef MIR_QT_EVENT_FEEDER_H
diff --git a/src/platforms/mirserver/screen.cpp b/src/platforms/mirserver/screen.cpp
index 291cc8e..eb586f7 100644
--- a/src/platforms/mirserver/screen.cpp
+++ b/src/platforms/mirserver/screen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,10 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Daniel d'Andrada <daniel.dandrada@canonical.com>
- *   Gerry Boland <gerry.boland@canonical.com>
  */
 
 // local
diff --git a/src/platforms/mirserver/screen.h b/src/platforms/mirserver/screen.h
index 8aa58dd..163e76e 100644
--- a/src/platforms/mirserver/screen.h
+++ b/src/platforms/mirserver/screen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,9 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <gerry.boland@canonical.com>
- *          Daniel d'Andrada <daniel.dandrada@canonical.com>
  */
 
 #ifndef SCREEN_H
diff --git a/src/platforms/mirserver/services.cpp b/src/platforms/mirserver/services.cpp
index e9b1fd0..db31b79 100644
--- a/src/platforms/mirserver/services.cpp
+++ b/src/platforms/mirserver/services.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/services.h b/src/platforms/mirserver/services.h
index 06ac34e..f571681 100644
--- a/src/platforms/mirserver/services.h
+++ b/src/platforms/mirserver/services.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/sessionauthorizer.cpp b/src/platforms/mirserver/sessionauthorizer.cpp
index 42f7629..7cae915 100644
--- a/src/platforms/mirserver/sessionauthorizer.cpp
+++ b/src/platforms/mirserver/sessionauthorizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/sessionauthorizer.h b/src/platforms/mirserver/sessionauthorizer.h
index b24c6be..a58f0ba 100644
--- a/src/platforms/mirserver/sessionauthorizer.h
+++ b/src/platforms/mirserver/sessionauthorizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/sessionlistener.cpp b/src/platforms/mirserver/sessionlistener.cpp
index 5fe9bc8..39118d6 100644
--- a/src/platforms/mirserver/sessionlistener.cpp
+++ b/src/platforms/mirserver/sessionlistener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/sessionlistener.h b/src/platforms/mirserver/sessionlistener.h
index f114be6..902fbae 100644
--- a/src/platforms/mirserver/sessionlistener.h
+++ b/src/platforms/mirserver/sessionlistener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/surfaceobserver.cpp b/src/platforms/mirserver/surfaceobserver.cpp
index 97f2733..9421d18 100644
--- a/src/platforms/mirserver/surfaceobserver.cpp
+++ b/src/platforms/mirserver/surfaceobserver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/surfaceobserver.h b/src/platforms/mirserver/surfaceobserver.h
index b29e186..4f9103f 100644
--- a/src/platforms/mirserver/surfaceobserver.h
+++ b/src/platforms/mirserver/surfaceobserver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/ubuntutheme.cpp b/src/platforms/mirserver/ubuntutheme.cpp
index a12acd3..af6e2ad 100644
--- a/src/platforms/mirserver/ubuntutheme.cpp
+++ b/src/platforms/mirserver/ubuntutheme.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/src/platforms/mirserver/ubuntutheme.h b/src/platforms/mirserver/ubuntutheme.h
index 8c3f68b..8be7788 100644
--- a/src/platforms/mirserver/ubuntutheme.h
+++ b/src/platforms/mirserver/ubuntutheme.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
diff --git a/tests/mirserver/Clipboard/clipboard_test.cpp b/tests/mirserver/Clipboard/clipboard_test.cpp
index 0dcd13f..bbd2c52 100644
--- a/tests/mirserver/Clipboard/clipboard_test.cpp
+++ b/tests/mirserver/Clipboard/clipboard_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <gtest/gtest.h>
diff --git a/tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp b/tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp
index 8ebf8a4..2c0ddd0 100644
--- a/tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp
+++ b/tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <gmock/gmock.h>
diff --git a/tests/mirserver/Screen/screen_test.cpp b/tests/mirserver/Screen/screen_test.cpp
index be0461d..33ba3de 100644
--- a/tests/mirserver/Screen/screen_test.cpp
+++ b/tests/mirserver/Screen/screen_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <gmock/gmock.h>
diff --git a/tests/modules/Application/application_test.cpp b/tests/modules/Application/application_test.cpp
index e2b0e19..419da24 100644
--- a/tests/modules/Application/application_test.cpp
+++ b/tests/modules/Application/application_test.cpp
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <gmock/gmock.h>
diff --git a/tests/modules/ApplicationManager/application_manager_test.cpp b/tests/modules/ApplicationManager/application_manager_test.cpp
index a21a5c8..fb33a0a 100644
--- a/tests/modules/ApplicationManager/application_manager_test.cpp
+++ b/tests/modules/ApplicationManager/application_manager_test.cpp
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
diff --git a/tests/modules/DesktopFileReader/desktopfilereader_test.cpp b/tests/modules/DesktopFileReader/desktopfilereader_test.cpp
index ca7d8eb..88032e4 100644
--- a/tests/modules/DesktopFileReader/desktopfilereader_test.cpp
+++ b/tests/modules/DesktopFileReader/desktopfilereader_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <Unity/Application/desktopfilereader.h>
diff --git a/tests/modules/General/objectlistmodel_test.cpp b/tests/modules/General/objectlistmodel_test.cpp
index 8603d99..a2bbd88 100644
--- a/tests/modules/General/objectlistmodel_test.cpp
+++ b/tests/modules/General/objectlistmodel_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <Unity/Application/objectlistmodel.h>
diff --git a/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp b/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp
index bc6a0de..0f5eace 100644
--- a/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp
+++ b/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
diff --git a/tests/modules/SessionManager/session_manager_test.cpp b/tests/modules/SessionManager/session_manager_test.cpp
index 0a1a806..7441d66 100644
--- a/tests/modules/SessionManager/session_manager_test.cpp
+++ b/tests/modules/SessionManager/session_manager_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <thread>
diff --git a/tests/modules/SessionManager/session_test.cpp b/tests/modules/SessionManager/session_test.cpp
index 3f0e0e8..42cee39 100644
--- a/tests/modules/SessionManager/session_test.cpp
+++ b/tests/modules/SessionManager/session_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014,2015 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <qtmir_test.h>
diff --git a/tests/modules/SharedWakelock/sharedwakelock_test.cpp b/tests/modules/SharedWakelock/sharedwakelock_test.cpp
index 3ad5eba..eada879 100644
--- a/tests/modules/SharedWakelock/sharedwakelock_test.cpp
+++ b/tests/modules/SharedWakelock/sharedwakelock_test.cpp
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <Unity/Application/sharedwakelock.h>
diff --git a/tests/modules/TaskController/taskcontroller_test.cpp b/tests/modules/TaskController/taskcontroller_test.cpp
index 7cda28d..e1b89e5 100644
--- a/tests/modules/TaskController/taskcontroller_test.cpp
+++ b/tests/modules/TaskController/taskcontroller_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include <Unity/Application/taskcontroller.h>
diff --git a/tests/modules/common/mock_application_controller.h b/tests/modules/common/mock_application_controller.h
index 31870fa..b9c4346 100644
--- a/tests/modules/common/mock_application_controller.h
+++ b/tests/modules/common/mock_application_controller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_APPLICATION_CONTROLLER_H
diff --git a/tests/modules/common/mock_desktop_file_reader.h b/tests/modules/common/mock_desktop_file_reader.h
index e01a5d1..07fa969 100644
--- a/tests/modules/common/mock_desktop_file_reader.h
+++ b/tests/modules/common/mock_desktop_file_reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_DESKTOP_FILE_READER_H
diff --git a/tests/modules/common/mock_mir_session.h b/tests/modules/common/mock_mir_session.h
index ce2339c..88918ee 100644
--- a/tests/modules/common/mock_mir_session.h
+++ b/tests/modules/common/mock_mir_session.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_MIR_SCENE_SESSION_H
diff --git a/tests/modules/common/mock_mirsurfaceitem.h b/tests/modules/common/mock_mirsurfaceitem.h
index 84409bf..ac23c56 100644
--- a/tests/modules/common/mock_mirsurfaceitem.h
+++ b/tests/modules/common/mock_mirsurfaceitem.h
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_QTMIR_MIRSURFACEITEM_H
diff --git a/tests/modules/common/mock_proc_info.h b/tests/modules/common/mock_proc_info.h
index de1a69a..1921cac 100644
--- a/tests/modules/common/mock_proc_info.h
+++ b/tests/modules/common/mock_proc_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_PROC_INFO_H
diff --git a/tests/modules/common/mock_prompt_session.h b/tests/modules/common/mock_prompt_session.h
index 2aa2cd8..8a7f776 100644
--- a/tests/modules/common/mock_prompt_session.h
+++ b/tests/modules/common/mock_prompt_session.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_MIR_PROMPT_SESSION_H
diff --git a/tests/modules/common/mock_prompt_session_manager.h b/tests/modules/common/mock_prompt_session_manager.h
index c5b943f..7803a6a 100644
--- a/tests/modules/common/mock_prompt_session_manager.h
+++ b/tests/modules/common/mock_prompt_session_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_MIR_SCENE_PROMPT_SESSION_MANAGER_H_
diff --git a/tests/modules/common/mock_renderable.h b/tests/modules/common/mock_renderable.h
index 853f32a..b4a3ab9 100644
--- a/tests/modules/common/mock_renderable.h
+++ b/tests/modules/common/mock_renderable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_MIR_GRAPHICS_RENDERABLE_H
diff --git a/tests/modules/common/mock_session.h b/tests/modules/common/mock_session.h
index 08941cb..7b33911 100644
--- a/tests/modules/common/mock_session.h
+++ b/tests/modules/common/mock_session.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_QTMIR_SESSION_H
diff --git a/tests/modules/common/mock_surface.h b/tests/modules/common/mock_surface.h
index 8ded667..0b580cf 100644
--- a/tests/modules/common/mock_surface.h
+++ b/tests/modules/common/mock_surface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MOCK_MIR_SCENE_SURFACE_H
diff --git a/tests/modules/common/qtmir_test.cpp b/tests/modules/common/qtmir_test.cpp
index 33a6c27..35c9674 100644
--- a/tests/modules/common/qtmir_test.cpp
+++ b/tests/modules/common/qtmir_test.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "qtmir_test.h"
 
 namespace qtmir {
diff --git a/tests/modules/common/qtmir_test.h b/tests/modules/common/qtmir_test.h
index 7832a73..c59003c 100644
--- a/tests/modules/common/qtmir_test.h
+++ b/tests/modules/common/qtmir_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014,2015 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef QT_MIR_TEST_FRAMEWORK_H
diff --git a/tests/modules/common/stub_input_channel.h b/tests/modules/common/stub_input_channel.h
index 1207ec0..8d8201d 100644
--- a/tests/modules/common/stub_input_channel.h
+++ b/tests/modules/common/stub_input_channel.h
@@ -1,19 +1,17 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
- * 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 published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <robert.carr@canonical.com>
  */
 
 #ifndef MIR_TEST_DOUBLES_STUB_INPUT_CHANNEL_H_
diff --git a/tests/modules/common/stub_scene_surface.h b/tests/modules/common/stub_scene_surface.h
index 05fcc57..e5c5503 100644
--- a/tests/modules/common/stub_scene_surface.h
+++ b/tests/modules/common/stub_scene_surface.h
@@ -1,19 +1,17 @@
 /*
- * Copyright © 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
- * 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 published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
  */
 
 #ifndef MIR_TEST_DOUBLES_STUB_SCENE_SURFACE_H_