[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit c014c297eb69fa856f17a0faa69d478a338e788b
Author: Rein Henrichs <reinh at reinh.com>
Date:   Tue Mar 30 17:35:49 2010 -0700

    Renaming the old puppet executable

diff --git a/bin/puppet b/bin/main
old mode 100755
new mode 100644
similarity index 96%
rename from bin/puppet
rename to bin/main
index 931e3a9..542bf40
--- a/bin/puppet
+++ b/bin/main
@@ -67,5 +67,5 @@
 # Copyright (c) 2005 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
-require 'puppet/application/puppet'
-Puppet::Application[:puppet].run
+require 'puppet/application/main'
+Puppet::Application[:main].run
diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/main.rb
similarity index 99%
rename from lib/puppet/application/puppet.rb
rename to lib/puppet/application/main.rb
index 2f7946b..faa3176 100644
--- a/lib/puppet/application/puppet.rb
+++ b/lib/puppet/application/main.rb
@@ -4,7 +4,7 @@ require 'puppet/configurer'
 require 'puppet/network/handler'
 require 'puppet/network/client'
 
-Puppet::Application.new(:puppet) do
+Puppet::Application.new(:main) do
 
     should_parse_config
 

-- 
Puppet packaging for Debian