Fix up copyright lines.

11 files changed, 13 insertions, 15 deletions

diff --git a/p11-kit/conf.c b/p11-kit/conf.c
index 6c83407..de42745 100644
--- a/p11-kit/conf.c
+++ b/p11-kit/conf.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2005, Stefan Walter
- * All rights reserved.
+ * Copyright (c) 2005 Stefan Walter
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/conf.h b/p11-kit/conf.h
index 84138d2..81e0fb8 100644
--- a/p11-kit/conf.h
+++ b/p11-kit/conf.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2011, Collabora Ltd.
- * Copyright (c) 2005, Stefan Walter
+ * Copyright (c) 2005 Stefan Walter
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/hash.c b/p11-kit/hash.c
index 836e717..1bb9d61 100644
--- a/p11-kit/hash.c
+++ b/p11-kit/hash.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2004, Stefan Walter
- * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (c) 2004 Stefan Walter
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/hash.h b/p11-kit/hash.h
index eb3c496..649b98b 100644
--- a/p11-kit/hash.h
+++ b/p11-kit/hash.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2004, Stefan Walter
- * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (c) 2004 Stefan Walter
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/p11-kit-lib.c b/p11-kit/p11-kit-lib.c
index e7e913a..7bd70e3 100644
--- a/p11-kit/p11-kit-lib.c
+++ b/p11-kit/p11-kit-lib.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011 Collabora Ltd.
  * Copyright (C) 2008 Stefan Walter
+ * Copyright (C) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/p11-kit-private.h b/p11-kit/p11-kit-private.h
index 5fbe1eb..56d5394 100644
--- a/p11-kit/p11-kit-private.h
+++ b/p11-kit/p11-kit-private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/p11-kit-proxy.c b/p11-kit/p11-kit-proxy.c
index fd28a19..e8c4015 100644
--- a/p11-kit/p11-kit-proxy.c
+++ b/p11-kit/p11-kit-proxy.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011 Collabora Ltd.
  * Copyright (C) 2008 Stefan Walter
+ * Copyright (C) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/p11-kit-uri.h b/p11-kit/p11-kit-uri.h
index f5bf3d5..27abf6c 100644
--- a/p11-kit/p11-kit-uri.h
+++ b/p11-kit/p11-kit-uri.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/p11-kit.h b/p11-kit/p11-kit.h
index b3de330..7dcfa4f 100644
--- a/p11-kit/p11-kit.h
+++ b/p11-kit/p11-kit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (c) 2011 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/util.c b/p11-kit/util.c
index 516e70b..2b9e79c 100644
--- a/p11-kit/util.c
+++ b/p11-kit/util.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2011 Collabora Ltd
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/p11-kit/util.h b/p11-kit/util.h
index 73f06ec..2e005c7 100644
--- a/p11-kit/util.h
+++ b/p11-kit/util.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2011 Collabora Ltd
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions