From eacffc85c0af930adc3181a0315180f7965106ca Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Sat, 19 Jan 2019 17:18:45 +0100
Subject: [PATCH] Copyright header simplification

---
 LICENSE                         | 3 +--
 ice/gem/extconf.rb              | 4 +---
 ice/gem/ice.gemspec             | 4 +---
 ice/pypi/setup.py               | 4 +---
 ice/rpm/glacier2router.amazon   | 2 +-
 ice/rpm/glacier2router.service  | 2 +-
 ice/rpm/ice.spec                | 4 +---
 ice/rpm/icegridgui              | 4 +---
 ice/rpm/icegridnode.amazon      | 2 +-
 ice/rpm/icegridnode.service     | 2 +-
 ice/rpm/icegridregistry.amazon  | 2 +-
 ice/rpm/icegridregistry.service | 2 +-
 icehashpassword/setup.py        | 4 +---
 mcpp/rpm/mcpp.spec              | 2 +-
 14 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8a81429..f512ece 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) 2014-present, ZeroC, Inc.
-All rights reserved.
+Copyright (c) ZeroC, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
diff --git a/ice/gem/extconf.rb b/ice/gem/extconf.rb
index 1eef6c1..ecffe9e 100644
--- a/ice/gem/extconf.rb
+++ b/ice/gem/extconf.rb
@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 require "mkmf"
 require "rbconfig"
diff --git a/ice/gem/ice.gemspec b/ice/gem/ice.gemspec
index aaece3d..40570ed 100644
--- a/ice/gem/ice.gemspec
+++ b/ice/gem/ice.gemspec
@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
diff --git a/ice/pypi/setup.py b/ice/pypi/setup.py
index b6a66cb..488b8f8 100644
--- a/ice/pypi/setup.py
+++ b/ice/pypi/setup.py
@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 # Always prefer setuptools over distutils
 try:
diff --git a/ice/rpm/glacier2router.amazon b/ice/rpm/glacier2router.amazon
index 8faea27..9a29405 100755
--- a/ice/rpm/glacier2router.amazon
+++ b/ice/rpm/glacier2router.amazon
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2007-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 # glacier2router    This shell script takes care of starting and
 #                   stopping the glacier2router daemon.
diff --git a/ice/rpm/glacier2router.service b/ice/rpm/glacier2router.service
index 30c95eb..dfafa30 100644
--- a/ice/rpm/glacier2router.service
+++ b/ice/rpm/glacier2router.service
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
 [Unit]
diff --git a/ice/rpm/ice.spec b/ice/rpm/ice.spec
index 8d125ea..7f5010b 100644
--- a/ice/rpm/ice.spec
+++ b/ice/rpm/ice.spec
@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 #
 # git_tag, when defined, is typically a branch, for example master
diff --git a/ice/rpm/icegridgui b/ice/rpm/icegridgui
index 725b44d..110cd79 100755
--- a/ice/rpm/icegridgui
+++ b/ice/rpm/icegridgui
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-# **********************************************************************
 #
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 exec java -cp `build-classpath icegridgui` com.zeroc.IceGridGUI.MainProxy $@
diff --git a/ice/rpm/icegridnode.amazon b/ice/rpm/icegridnode.amazon
index f041075..8877758 100755
--- a/ice/rpm/icegridnode.amazon
+++ b/ice/rpm/icegridnode.amazon
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2007-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 # icegridnode   This shell script takes care of starting and
 #               stopping the icegridnode daemon.
diff --git a/ice/rpm/icegridnode.service b/ice/rpm/icegridnode.service
index e272127..7fd3a14 100644
--- a/ice/rpm/icegridnode.service
+++ b/ice/rpm/icegridnode.service
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
 [Unit]
diff --git a/ice/rpm/icegridregistry.amazon b/ice/rpm/icegridregistry.amazon
index f9d26a9..4a9e966 100755
--- a/ice/rpm/icegridregistry.amazon
+++ b/ice/rpm/icegridregistry.amazon
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2007-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 # icegridregistry   This shell script takes care of starting and
 #                   stopping the icegridregistry daemon.
diff --git a/ice/rpm/icegridregistry.service b/ice/rpm/icegridregistry.service
index 2eebb0f..ba9986d 100644
--- a/ice/rpm/icegridregistry.service
+++ b/ice/rpm/icegridregistry.service
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
 [Unit]
diff --git a/icehashpassword/setup.py b/icehashpassword/setup.py
index 7489825..c5ce9e2 100644
--- a/icehashpassword/setup.py
+++ b/icehashpassword/setup.py
@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 try:
     from setuptools import setup
diff --git a/mcpp/rpm/mcpp.spec b/mcpp/rpm/mcpp.spec
index 8f006d9..0ae1c82 100644
--- a/mcpp/rpm/mcpp.spec
+++ b/mcpp/rpm/mcpp.spec
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
 # the github version tag without v prefix