Merge branch 'develop' of github.com:saltstack/salt into develop

debian/control

@@ -10,23 +10,25 @@ Build-Depends: debhelper (>= 7.0.50~),
                python-yaml,
                python-crypto,
                python-m2crypto,
-               python-pyzmq (>= 2.1.9),
+               python-zmq (>= 2.1.9),
                libzmq1 (>= 2.1.9),
                libzmq-dev (>= 2.1.9),
                python (>= 2.6),
+               python-dev (>= 2.6),
                python-jinja2
 Standards-Version: 3.9.2
 Homepage: http://saltstack.org
 #Vcs-Git: git://git.debian.org/collab-maint/salt.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/salt.git;a=summary
 
-Package: salt-master
-Architecture: all
+
+Package: salt-common
+Architecture: any
 Depends:    ${python:Depends},
             ${misc:Depends}
-Description: This package provides a remote manager to administer servers.
- This package is a powerful remote execution manager that can be used to
- administer servers in a fast and efficient way.
+Description: Shared libraries that salt requires for all packages
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
  .
  It allows commands to be executed across large groups of servers. This
  means systems can be easily managed, but data can also be easily gathered.
@@ -38,14 +40,42 @@ Description: This package provides a remote manager to administer servers.
  .
  Between the remote execution system, and state management Salt addresses
  the backbone of cloud and data center management.
+ .
+ This particular package provides shared libraries that salt-master, salt-minion,
+ and salt-syndic require to function.
+
+
+Package: salt-master
+Architecture: all
+Depends:    ${python:Depends},
+            ${misc:Depends},
+            salt-common
+Description: This package provides a remote manager to administer servers via salt
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of servers. This
+ means systems can be easily managed, but data can also be easily gathered.
+ Quick introspection into running systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a remote
+ system. Salt addresses this problem as well, the salt state system uses
+ salt state files to define the state a server needs to be in.
+ .
+ Between the remote execution system, and state management Salt addresses
+ the backbone of cloud and data center management.
+ .
+ This particular package provides the salt controller.
+
 
 Package: salt-minion
 Architecture: all
 Depends:    ${python:Depends},
-            ${misc:Depends}
-Description: salt-minion represents the client package for salt
- This package is a powerful remote execution manager that can be used to
- administer servers in a fast and efficient way.
+            ${misc:Depends},
+            salt-common
+Description: This package represents the client package for salt
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
  .
  It allows commands to be executed across large groups of servers. This
  means systems can be easily managed, but data can also be easily gathered.
@@ -57,3 +87,27 @@ Description: salt-minion represents the client package for salt
  .
  Between the remote execution system, and state management Salt addresses
  the backbone of cloud and data center management.
+ .
+ This particular package provides the worker / agent for salt.
+Package: salt-syndic
+Architecture: all
+Depends:    ${python:Depends},
+            ${misc:Depends},
+            salt-master
+Description: salt-syndic represents the master-of-masters for salt
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of servers. This
+ means systems can be easily managed, but data can also be easily gathered.
+ Quick introspection into running systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a remote
+ system. Salt addresses this problem as well, the salt state system uses
+ salt state files to define the state a server needs to be in.
+ .
+ Between the remote execution system, and state management Salt addresses
+ the backbone of cloud and data center management.
+ .
+ This particular package provides the master of masters for salt-- it enables the management
+ of multiple masters at a time.

debian/rules

@@ -3,10 +3,10 @@
 %:
 	dh $@
 
-override_dh_installinit:
-	dh_installinit --no-start --name="salt-master"
-	dh_installinit --no-start --name="salt-minion"
-	dh_installinit --no-start --name="salt-syndic"
+#override_dh_installinit:
+#	dh_installinit --no-start --name="salt-master"
+#	dh_installinit --no-start --name="salt-minion"
+#	dh_installinit --no-start --name="salt-syndic"
 
 get-orig-source:
 	git clone https://github.com/saltstack/salt.git

debian/salt-common.install

@@ -0,0 +1,9 @@
+usr/share/man/man1/salt-minion.1
+usr/share/man/man1/salt-call.1
+usr/share/man/man1/salt-key.1
+usr/share/man/man1/salt-master.1
+usr/share/man/man1/salt-syndic.1
+usr/share/man/man1/salt-cp.1
+usr/share/man/man1/salt.1
+conf/minion /etc/salt/minion
+salt/* /usr/share/salt/

debian/salt-master.install

@@ -1,15 +1 @@
-usr/share/man/man1/salt-master.1
-usr/share/man/man1/salt.1
-usr/share/man/man7/salt.7
-usr/share/man/man1/salt-key.1
-usr/share/man/man1/salt-cp.1
-usr/share/man/man1/salt-run.1
-usr/share/man/man1/salt-syndic.1
-scripts/salt /usr/share/salt/salt
-scripts/salt-master /usr/share/salt/salt-master
-scripts/salt-syndic /usr/share/salt/salt-syndic
-scripts/salt-cp /usr/share/salt/salt-cp
-scripts/salt-key /usr/share/salt/salt-key
-scripts/salt-run /usr/share/salt/salt-run
 conf/master /etc/salt/master
-debian/salt.salt-master.init /etc/init.d/salt-master

debian/salt-master.manpages

@@ -4,4 +4,3 @@ doc/man/salt-master.1
 doc/man/salt-key.1
 doc/man/salt-cp.1
 doc/man/salt-run.1
-doc/man/salt-syndic.1

debian/salt-minion.install

@@ -1,6 +1,4 @@
-usr/share/man/man1/salt-call.1
-usr/share/man/man1/salt-minion.1
 scripts/salt-minion /usr/share/salt/salt-minion
 scripts/salt-call /usr/share/salt/salt-call
-debian/salt.salt-minion.init /etc/init.d/salt-minion
+modules/* /usr/share/salt/modules/
 conf/minion /etc/salt/minion

debian/salt-syndic.manpages

@@ -0,0 +1 @@
+doc/man/salt-syndic.1

salt/log.py

@@ -2,7 +2,7 @@
     salt.log
     ~~~~~~~~
 
-    This is were Salt's logging get's setup.
+    This is where Salt's logging gets set up.
 
 
     :copyright: 2011 :email:`Pedro Algarvio (pedro@algarvio.me)`

salt/msgpack/COPYING

@@ -1,14 +0,0 @@
-Copyright (C) 2008-2011 INADA Naoki <songofacandy@gmail.com>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-