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

debian/control

@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                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
@@ -57,3 +58,23 @@ 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.
+
+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.

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-master.install

@@ -4,12 +4,9 @@ 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

@@ -2,5 +2,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
 conf/minion /etc/salt/minion

debian/salt-syndic.install

@@ -0,0 +1,2 @@
+usr/share/man/man1/salt-syndic.1
+scripts/salt-syndic /usr/share/salt/salt-syndic

debian/salt-syndic.manpages

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