Import patches-applied version 2.2.14-0ubuntu1 to applied/ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 68754fe67f1b3da2e6ca45885641941b3229698a
Unapplied parent: 63aafec1b1a480947da7d5579c3ffc66b8fe5bdb

New changelog entries:
  * New upstream release (LP: #1701350).
  * debian/copyright:
    - Refreshed copyright content.

1 files changed, 10 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index fb53be7..094abb5 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,11 @@ def set_systemd_files(data_files, dest="/lib/systemd/system",
     data_files.append((dest, src))
 
 
-def set_rc_files(data_files, dest="/etc/rc.d/", src=["init/freebsd/waagent"]):
+def set_freebsd_rc_files(data_files, dest="/etc/rc.d/", src=["init/freebsd/waagent"]):
+    data_files.append((dest, src))
+
+
+def set_openbsd_rc_files(data_files, dest="/etc/rc.d/", src=["init/openbsd/waagent"]):
     data_files.append((dest, src))
 
 
@@ -143,7 +147,11 @@ def get_data_files(name, version, fullname):
     elif name == 'freebsd':
         set_bin_files(data_files, dest="/usr/local/sbin")
         set_conf_files(data_files, src=["config/freebsd/waagent.conf"])
-        set_rc_files(data_files)
+        set_freebsd_rc_files(data_files)
+    elif name == 'openbsd':
+        set_bin_files(data_files, dest="/usr/local/sbin")
+        set_conf_files(data_files, src=["config/openbsd/waagent.conf"])
+        set_openbsd_rc_files(data_files)
     else:
         # Use default setting
         set_bin_files(data_files)