diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2012-08-31 12:49:33 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2012-08-31 12:49:33 -0700 |
| commit | 13704e115202eb733efc8b36c94306afc0860762 (patch) | |
| tree | 4e696baf72791728ecb8eaa02d46251b07173e40 /tasks | |
| parent | 5162b61fa98683942e675e17ec63acbec999eb75 (diff) | |
| parent | 1a7feff7ed09569c6b4552ade73583383674a146 (diff) | |
| download | puppet-13704e115202eb733efc8b36c94306afc0860762.tar.gz | |
Merge remote-tracking branch 'origin/2.7.x' into 3.x
Conflicts:
Rakefile
ext/redhat/puppet.spec.erb
lib/puppet/defaults.rb
spec/integration/defaults_spec.rb
tasks/rake/apple.rake
Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/rake/templates/prototype.plist.erb | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/tasks/rake/templates/prototype.plist.erb b/tasks/rake/templates/prototype.plist.erb deleted file mode 100644 index e56659a6b..000000000 --- a/tasks/rake/templates/prototype.plist.erb +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleIdentifier</key> - <string><%= @title %></string> - <key>CFBundleShortVersionString</key> - <string><%= @version %></string> - <key>IFMajorVersion</key> - <integer><%= @package_major_version %></integer> - <key>IFMinorVersion</key> - <integer><%= @package_minor_version %></integer> - <key>IFPkgBuildDate</key> - <date><%= @build_date %></date> - <key>IFPkgFlagAllowBackRev</key> - <false/> - <key>IFPkgFlagAuthorizationAction</key> - <string>RootAuthorization</string> - <key>IFPkgFlagDefaultLocation</key> - <string>/</string> - <key>IFPkgFlagFollowLinks</key> - <true/> - <key>IFPkgFlagInstallFat</key> - <false/> - <key>IFPkgFlagIsRequired</key> - <false/> - <key>IFPkgFlagOverwritePermissions</key> - <false/> - <key>IFPkgFlagRelocatable</key> - <false/> - <key>IFPkgFlagRestartAction</key> - <string><%= @pm_restart %></string> - <key>IFPkgFlagRootVolumeOnly</key> - <true/> - <key>IFPkgFlagUpdateInstalledLanguages</key> - <false/> -</dict> -</plist> |