From f9a99b21b2ee1fe231a7218cef6d5462d5c37769 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Sun, 8 Apr 2018 21:34:22 +0200
Subject: [PATCH] Fix copyrights

---
 .../r/library/fastrGrid/grDevices/InitWindowedDevice.java       | 2 +-
 com.oracle.truffle.r.native/run/R.sh                            | 2 +-
 com.oracle.truffle.r.native/run/Rscript.sh                      | 2 +-
 com.oracle.truffle.r.native/run/Rscript_exec.sh                 | 2 +-
 .../r/runtime/instrument/memprof/MemAllocProfilerPaths.java     | 2 +-
 mx.fastr/copyrights/overrides                                   | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java
index 0b360cff1b..8f0ae0caea 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/grDevices/InitWindowedDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.native/run/R.sh b/com.oracle.truffle.r.native/run/R.sh
index af7bf7df38..2c6e2bae38 100644
--- a/com.oracle.truffle.r.native/run/R.sh
+++ b/com.oracle.truffle.r.native/run/R.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.native/run/Rscript.sh b/com.oracle.truffle.r.native/run/Rscript.sh
index 863b98abf2..cd45f7f25b 100755
--- a/com.oracle.truffle.r.native/run/Rscript.sh
+++ b/com.oracle.truffle.r.native/run/Rscript.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.native/run/Rscript_exec.sh b/com.oracle.truffle.r.native/run/Rscript_exec.sh
index d60986df11..3a61daba20 100644
--- a/com.oracle.truffle.r.native/run/Rscript_exec.sh
+++ b/com.oracle.truffle.r.native/run/Rscript_exec.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/instrument/memprof/MemAllocProfilerPaths.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/instrument/memprof/MemAllocProfilerPaths.java
index 6aeb9b2101..90370f29aa 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/instrument/memprof/MemAllocProfilerPaths.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/instrument/memprof/MemAllocProfilerPaths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index 7b0d3d3e6f..33d09ed2aa 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -957,7 +957,6 @@ com.oracle.truffle.r.pkgs/rJava/src/java/ArrayDimensionException.java,rjava.copy
 com.oracle.truffle.r.pkgs/rJava/src/java/ArrayWrapper.java,rjava.copyright
 com.oracle.truffle.r.pkgs/rJava/src/java/DummyPoint.java,rjava.copyright
 com.oracle.truffle.r.pkgs/rJava/src/java/FlatException.java,rjava.copyright
-com.oracle.truffle.r.pkgs/rJava/src/java/Makefile,rjava.copyright
 com.oracle.truffle.r.pkgs/rJava/src/java/NotAnArrayException.java,rjava.copyright
 com.oracle.truffle.r.pkgs/rJava/src/java/NotComparableException.java,rjava.copyright
 com.oracle.truffle.r.pkgs/rJava/src/java/ObjectArrayException.java,rjava.copyright
-- 
GitLab