[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.1.rc3-1-42-g73e3678

[Mathias Gug]

The following commit has been merged in the master branch:
commit 73e36780e706cd36a12ee8aa9ff1255d7611593a
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Fri Sep 24 16:14:24 2010 -0400

    Clean up puppet dependencies.
    
    * debian/control:
      - move all puppet dependencies to puppet-common since all the code is
        actually located in puppet-common.
      - move libaugeas from a recommend to a dependency.

diff --git a/debian/changelog b/debian/changelog
index ec4cb06..9f68099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ puppet (2.6.1-1) UNRELEASED; urgency=low
   * debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
     set the location of the CRL in apache2 configuration. Fix apache2 
     configuration on upgrade as well (LP: #641001).
+  * debian/control:
+    - move all puppet dependencies to puppet-common since all the code is
+      actually located in puppet-common. 
+    - move libaugeas from a recommend to a dependency.
 
   [ Stig Sandbeck Mathisen ]
   * Fix "require" path for puppet queue.
diff --git a/debian/control b/debian/control
index 94a6060..3181e85 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,33 @@ Vcs-Git: git://git.debian.org/git/pkg-puppet/puppet.git
 Vcs-Browser: http://git.debian.org/?p=pkg-puppet/puppet.git
 Homepage: http://projects.puppetlabs.com/projects/puppet
 
+Package: puppet-common
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, libaugeas-ruby1.8, adduser, facter, lsb-base
+Recommends: lsb-release, debconf-utils
+Suggests: libselinux-ruby1.8
+Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)
+Description: Centralized configuration management
+ Puppet lets you centrally manage every important aspect of your system
+ using a cross-platform specification language that manages all the
+ separate elements normally aggregated in different files, like users,
+ cron jobs, and hosts, along with obviously discrete elements like
+ packages, services, and files.
+ .
+ Puppet's simple declarative specification language provides powerful
+ classing abilities for drawing out the similarities between hosts while
+ allowing them to be as specific as necessary, and it handles dependency
+ and prerequisite relationships between objects clearly and explicitly.
+ .
+ This package contains the puppet software and documentation.  For the startup
+ scripts needed to run the puppet agent and master, see the "puppet" and
+ "puppetmaster" packages, respectively.
+
 Package: puppet
 Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser, facter, lsb-base, puppet-common (= ${binary:Version})
-Recommends: rdoc, libaugeas-ruby1.8
-Suggests: puppet-el, vim-puppet, libselinux-ruby1.8, etckeeper
+Depends: ${misc:Depends},  puppet-common (= ${binary:Version})
+Recommends: rdoc
+Suggests: puppet-el, vim-puppet, etckeeper
 Description: Centralized configuration management - agent startup and compatibility scripts
  This package contains the startup script and compatbility scripts for the
  puppet agent, which is the process responsible for configuring the local node.
@@ -94,27 +116,6 @@ Description: Centralised configuration management - master setup to run under mo
  and prerequisite relationships between objects clearly and explicitly.
  .
 
-Package: puppet-common
-Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser, facter
-Recommends: lsb-release, debconf-utils
-Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)
-Description: Centralized configuration management
- Puppet lets you centrally manage every important aspect of your system
- using a cross-platform specification language that manages all the
- separate elements normally aggregated in different files, like users,
- cron jobs, and hosts, along with obviously discrete elements like
- packages, services, and files.
- .
- Puppet's simple declarative specification language provides powerful
- classing abilities for drawing out the similarities between hosts while
- allowing them to be as specific as necessary, and it handles dependency
- and prerequisite relationships between objects clearly and explicitly.
- .
- This package contains the puppet software and documentation.  For the startup
- scripts needed to run the puppet agent and master, see the "puppet" and
- "puppetmaster" packages, respectively.
-
 Package: vim-puppet
 Architecture: all
 Depends: ${misc:Depends}

-- 
Puppet packaging for Debian