xserver: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Feb 27 19:19:04 UTC 2023


 composite/compalloc.c                               |    2 +-
 composite/compext.c                                 |    2 +-
 composite/compinit.c                                |    2 +-
 composite/compint.h                                 |    2 +-
 composite/compoverlay.c                             |    2 +-
 composite/compwindow.c                              |    2 +-
 dix/dispatch.c                                      |    2 +-
 dix/events.c                                        |    2 +-
 dix/resource.c                                      |    2 +-
 fb/fbcmap_mi.c                                      |    2 +-
 hw/xfree86/os-support/solaris/solaris-amd64.S       |    2 +-
 hw/xfree86/os-support/solaris/solaris-ia32.S        |    2 +-
 hw/xfree86/os-support/solaris/solaris-sparcv8plus.S |    2 +-
 hw/xfree86/os-support/solaris/sun_VTsw.c            |    2 +-
 hw/xfree86/os-support/solaris/sun_agp.c             |    2 +-
 hw/xfree86/os-support/solaris/sun_apm.c             |    2 +-
 hw/xfree86/os-support/solaris/sun_bell.c            |    2 +-
 hw/xfree86/os-support/solaris/sun_vid.c             |    2 +-
 include/Xprintf.h                                   |    2 +-
 include/Xserver.d                                   |    2 +-
 include/probes.h                                    |    2 +-
 mi/micmap.c                                         |    2 +-
 os/access.c                                         |    2 +-
 os/client.c                                         |    2 +-
 os/xprintf.c                                        |    2 +-
 test/string.c                                       |    2 +-
 test/xi1/protocol-xchangedevicecontrol.c            |    2 +-
 xfixes/cursor.c                                     |    2 +-
 xfixes/disconnect.c                                 |    2 +-
 xfixes/xfixes.c                                     |    2 +-
 xfixes/xfixesint.h                                  |    2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit d6b20f5e36591e7719b38359d46003425ff3eab8
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 25 09:40:41 2023 -0800

    Remove "All rights reserved" from Oracle copyright notices
    
    Oracle no longer includes this term in our copyright & license notices.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/composite/compalloc.c b/composite/compalloc.c
index eaabf0d91..acd215002 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/composite/compext.c b/composite/compext.c
index 34a2a5363..31ebbbf67 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/composite/compinit.c b/composite/compinit.c
index a62c8d3c4..5d05ee109 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/composite/compint.h b/composite/compint.h
index 423b641ff..cb73c386d 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/composite/compoverlay.c b/composite/compoverlay.c
index 20c860d5f..eb2d86e0d 100644
--- a/composite/compoverlay.c
+++ b/composite/compoverlay.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 73a1871a0..4e2494b86 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/dix/dispatch.c b/dix/dispatch.c
index efcec5c81..eaac39b7c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -74,7 +74,7 @@ Equipment Corporation.
 ******************************************************************/
 
 /* XSERVER_DTRACE additions:
- * Copyright (c) 2005-2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005-2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/dix/events.c b/dix/events.c
index 86f5357e8..2a5c2683a 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -74,7 +74,7 @@ Equipment Corporation.
 ******************************************************************/
 
 /*
- * Copyright (c) 2003-2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003-2005, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/dix/resource.c b/dix/resource.c
index 055e6934e..b8c4d1d7e 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -72,7 +72,7 @@ Equipment Corporation.
 
 ******************************************************************/
 /* XSERVER_DTRACE additions:
- * Copyright (c) 2005-2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005-2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
index d9976ce9f..c9c6d8027 100644
--- a/fb/fbcmap_mi.c
+++ b/fb/fbcmap_mi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1987, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/solaris-amd64.S b/hw/xfree86/os-support/solaris/solaris-amd64.S
index 4cc0642dd..830c9c6ee 100644
--- a/hw/xfree86/os-support/solaris/solaris-amd64.S
+++ b/hw/xfree86/os-support/solaris/solaris-amd64.S
@@ -1,4 +1,4 @@
-/ Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+/ Copyright (c) 2005, Oracle and/or its affiliates.
 / 
 / Permission is hereby granted, free of charge, to any person obtaining a
 / copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/solaris-ia32.S b/hw/xfree86/os-support/solaris/solaris-ia32.S
index 74d787d31..00e8d5fba 100644
--- a/hw/xfree86/os-support/solaris/solaris-ia32.S
+++ b/hw/xfree86/os-support/solaris/solaris-ia32.S
@@ -1,4 +1,4 @@
-/ Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+/ Copyright (c) 2004, Oracle and/or its affiliates.
 / 
 / Permission is hereby granted, free of charge, to any person obtaining a
 / copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
index 0ecafb352..4c448d970 100644
--- a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
+++ b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, Oracle and/or its affiliates.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/sun_VTsw.c b/hw/xfree86/os-support/solaris/sun_VTsw.c
index 573358b43..d4c383496 100644
--- a/hw/xfree86/os-support/solaris/sun_VTsw.c
+++ b/hw/xfree86/os-support/solaris/sun_VTsw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
index fb58eca81..d8bff2fda 100644
--- a/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/hw/xfree86/os-support/solaris/sun_agp.c
@@ -6,7 +6,7 @@
  * Copyright © 2000 VA Linux Systems, Inc.
  * Copyright © 2001 The XFree86 Project, Inc.
  */
-/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index 368f21eef..11549aaf0 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -27,7 +27,7 @@
  * XFree86 Project.
  */
 
-/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index 883728e51..69ea50c47 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2005, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004-2005, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 8e94fcced..a546f1f53 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -22,7 +22,7 @@
  * OF THIS SOFTWARE.
  *
  */
-/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/include/Xprintf.h b/include/Xprintf.h
index 9e8cdc5dc..ede615dd6 100644
--- a/include/Xprintf.h
+++ b/include/Xprintf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/include/Xserver.d b/include/Xserver.d
index 4a233e1f6..cca33efa6 100644
--- a/include/Xserver.d
+++ b/include/Xserver.d
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2006, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005-2006, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/include/probes.h b/include/probes.h
index f2ed40fe3..b7d69f57c 100644
--- a/include/probes.h
+++ b/include/probes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/mi/micmap.c b/mi/micmap.c
index 7003a5326..0bbe4f70d 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1987, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/os/access.c b/os/access.c
index 61ee8e30f..900796cad 100644
--- a/os/access.c
+++ b/os/access.c
@@ -54,7 +54,7 @@ SOFTWARE.
 ******************************************************************/
 
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/os/client.c b/os/client.c
index 922172cc5..953431bd9 100644
--- a/os/client.c
+++ b/os/client.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). All
  * rights reserved.
- * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1993, 2010, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/os/xprintf.c b/os/xprintf.c
index 80caa5790..e19e1ca03 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -34,7 +34,7 @@
  * use or other dealings in this Software without prior written authorization.
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/test/string.c b/test/string.c
index 3feb88260..3fd0fb76e 100644
--- a/test/string.c
+++ b/test/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c
index e386d0c09..f3e2b1472 100644
--- a/test/xi1/protocol-xchangedevicecontrol.c
+++ b/test/xi1/protocol-xchangedevicecontrol.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index c5d4554b2..83282ff0e 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  * Copyright 2010 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c
index 77932725e..28aac45aa 100644
--- a/xfixes/disconnect.c
+++ b/xfixes/disconnect.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  * Copyright 2010 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index ecb6f298f..3d044f918 100644
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  * Copyright 2010, 2021 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index cf9a8f9bd..a1dd6fe63 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates.
  * Copyright 2010, 2021 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a


More information about the xorg-commit mailing list