File deb-0001-Adjust-default-paths.patch of Package puppet

From: Stig Sandbeck Mathisen <ssm@debian.org>
Date: Mon, 16 May 2016 12:59:38 +0200
Subject: Adjust default paths

---
 lib/puppet/defaults.rb      |  2 +-
 lib/puppet/util/run_mode.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index f63a08a..f76ce1e 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -1206,7 +1206,7 @@ EOT
       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
     },
     :basemodulepath => {
-      :default => "$codedir/modules#{File::PATH_SEPARATOR}/opt/puppetlabs/puppet/modules",
+      :default => "$codedir/modules#{File::PATH_SEPARATOR}/usr/share/puppet/modules",
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
index cf6c461..a112ef0 100644
--- a/lib/puppet/util/run_mode.rb
+++ b/lib/puppet/util/run_mode.rb
@@ -59,23 +59,23 @@ module Puppet
 
     class UnixRunMode < RunMode
       def conf_dir
-        which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet")
+        which_dir("/etc/puppet", "~/.puppet/etc")
       end
 
       def code_dir
-        which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code")
+        which_dir("/etc/puppet/code", "~/.puppet/etc/code")
       end
 
       def var_dir
-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
+        which_dir("/var/cache/puppet", "~/.puppet/cache")
       end
 
       def run_dir
-        which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
+        which_dir("/run/puppet", "~/.puppet/var/run")
       end
 
       def log_dir
-        which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log")
+        which_dir("/var/log/puppet", "~/.puppet/var/log")
       end
     end