Fix up copyright lines.

diff --git a/p11-kit/conf.c b/p11-kit/conf.c
index 6c83407a62fc68d2e3f3f590e5eec6555b64d8b1..de42745f035a2a4709841bf9168d59ae6af40de5 100644 (file)
--- 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 84138d2249ea6b0ba4da4f912452ff7a9f058ed6..81e0fb8057a187a1bd51079b64be97a86e45ef8c 100644 (file)
--- 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 836e717036553c2e6a9944947f23a9889fa0ce6b..1bb9d61af55db65dd2823b4d1a55aec78474f819 100644 (file)
--- 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 eb3c496f1eda66d20c8b1ed3496dd9c78e6cbecb..649b98bb12a16da71277cb304473b53f284c4610 100644 (file)
--- 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 e7e913aef229c45f28a61a55e458189756040325..7bd70e3148697ed05149ecdf464fe50d69c22209 100644 (file)
--- 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 5fbe1eba961e24433e129e6fe229173b707af3e1..56d53941652a75828278668249cfec9447882eb6 100644 (file)
--- 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 fd28a190976ad2ff0d795163f0988e17320bd801..e8c401588c543591b5232582b5339b93dcbb2955 100644 (file)
--- 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 f5bf3d59e7e5f3f26aef5c3b9586c71903c254ba..27abf6ca10f37c397e58f934f820cf859e68e619 100644 (file)
--- 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 b3de330c857a0f07e76220a74e2c710da5982d45..7dcfa4f748c66b8d3aa32439848990d8a33c59e0 100644 (file)
--- 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 516e70b3bb8114cbffb807232927b69a7111a61f..2b9e79cd1645da387dd28dcbd19e6c66c058ce19 100644 (file)
--- 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 73f06ec43a5a677a2be0d8deb9ed3699fd7156e6..2e005c72feec16fded44248e230583ca5380acd7 100644 (file)
--- 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