Merge pull request #660 from KB1JWQ/master

Ubuntu / Debian packaging updated

debian/changelog

@@ -1,3 +1,9 @@
+salt (0.9.6-1) lucid; urgency=low
+
+  *  Bump version; time to upgrade
+
+ -- Corey Quinn <corey@sequestered.net>  Tue, 07 Feb 2012 18:15:20 -0800
+
 salt (0.9.5-1) unstable; urgency=low
 
   * First package release. (Closes: #643789)

debian/control

@@ -3,7 +3,6 @@ Section: admin
 Priority: optional
 Maintainer: Corey Quinn <corey@sequestered.net>
 Build-Depends: debhelper (>= 7.0.50~),
-               python-support,
                cython,
                python-yaml,
                python-setuptools,
@@ -24,7 +23,6 @@ Architecture: any
 Depends: ${python:Depends},
          ${misc:Depends},
          ${shlibs:Depends},
-         python-support,
          cython,
          python-setuptools,
          python-yaml,
@@ -34,7 +32,8 @@ Depends: ${python:Depends},
          libzmq-dev (>= 2.1.9),
          python,
          python-dev,
-         python-jinja2
+         python-jinja2,
+         msgpack-python
 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.

debian/copyright

@@ -1,7 +1,7 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: salt
 Upstream-Contact: salt-users@googlegroups.com
-Source: https://github.com/downloads/saltstack/salt/salt-0.9.5.tar.gz
+Source: https://github.com/downloads/saltstack/salt/salt-0.9.6.tar.gz
 
 Files: *
 Copyright: 2012 Thomas S Hatch <thatch45@gmail.com>

debian/rules

@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 %:
-	dh $@ --buildsystem=python_distutils
-#override_dh_installinit:
-#	dh_installinit --no-start --name="salt-master"
-#	dh_installinit --no-start --name="salt-minion"
-#	dh_installinit --no-start --name="salt-syndic"
-
+	dh $@ #--with python2
+#dh_override_auto_build:
+	python setup.py build #--install-layout=deb build
 get-orig-source:
 	git clone https://github.com/saltstack/salt.git
-	mv salt salt-0.9.5
-	tar -zcvf salt_0.9.5.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.5
-	rm -rf salt-0.9.5
+	mv salt salt-0.9.6
+	tar -zcvf salt_0.9.6.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.6
+	rm -rf salt-0.9.6

debian/salt-common.install

@@ -1,25 +1,2 @@
-salt/exceptions.py /usr/share/salt
-salt/loader.py /usr/share/salt
-salt/master.py /usr/share/salt
-salt/client.py /usr/share/salt
-salt/runner.py /usr/share/salt
-salt/output.py /usr/share/salt
-salt/minion.py /usr/share/salt
-salt/version.py /usr/share/salt
-salt/config.py /usr/share/salt
-salt/state.py /usr/share/salt
-salt/log.py /usr/share/salt
-salt/__init__.py /usr/share/salt
-salt/payload.py /usr/share/salt
-salt/crypt.py /usr/share/salt
-salt/runners /usr/share/salt/
-salt/renderers /usr/share/salt/
-salt/returners /usr/share/salt/
-salt/ext /usr/share/salt/
-salt/msgpack /usr/share/salt/
-salt/grains /usr/share/salt/
-salt/cli /usr/share/salt/
-salt/states /usr/share/salt/
-salt/utils /usr/share/salt/
-usr/lib/python2*/dist-packages/salt/msgpack
+usr/lib/python2*/dist-packages/salt/
 debian/lintian-overrides /usr/share/lintian/overrides/salt-common

debian/salt-master.install

@@ -1,6 +1,6 @@
-conf/master.template /etc/salt/master
-scripts/salt-key /usr/share/salt
-scripts/salt /usr/share/salt
-scripts/salt-run /usr/share/salt
-scripts/salt-cp /usr/share/salt
-scripts/salt-master /usr/share/salt
+conf/master.template /etc/salt
+scripts/salt-master /usr/bin
+scripts/salt-cp /usr/bin
+scripts/salt-run /usr/bin
+scripts/salt-key /usr/bin
+scripts/salt /usr/bin

debian/salt-master.links

@@ -1,5 +0,0 @@
-usr/share/salt/salt /usr/bin/salt
-usr/share/salt/salt-master /usr/bin/salt-master
-usr/share/salt/salt-cp /usr/bin/salt-cp
-usr/share/salt/salt-key /usr/bin/salt-key
-usr/share/salt/salt-run /usr/bin/salt-run

debian/salt-minion.install

@@ -1,4 +1,3 @@
-scripts/salt-minion /usr/share/salt
-scripts/salt-call /usr/share/salt
-salt/modules /usr/share/salt/modules
-conf/minion.template /etc/salt/minion
+conf/minion.template /etc/salt
+scripts/salt-minion /usr/bin
+scripts/salt-call /usr/bin

debian/salt-minion.links

@@ -1,2 +0,0 @@
-usr/share/salt/salt-minion /usr/bin/salt-minion
-usr/share/salt/salt-call /usr/bin/salt-call

debian/salt-syndic.install

@@ -1 +1 @@
-scripts/salt-syndic /usr/share/salt
+scripts/salt-syndic /usr/bin

debian/salt-syndic.links

@@ -1 +1 @@
-usr/share/salt/salt-syndic /usr/bin/salt-syndic
+usr/lib/python2*/dist-packages/salt/salt-syndic /usr/bin/salt-syndic

salt/grains/core.py

@@ -211,7 +211,7 @@ def _virtual(osdata):
                 if grains.get('productname', '') == 'HVM domU':
                     # Requires dmidecode!
                     grains['virtual_subtype'] = 'Xen HVM DomU'
-                elif os.path.isfile('/proc/xen/capabilities'):
+                elif os.path.isfile('/proc/xen/capabilities') and os.access('/proc/xen/capabilities', os.R_OK):
                     caps = open('/proc/xen/capabilities')
                     if 'control_d' not in caps.read():
                         # Tested on CentOS 5.5 / 2.6.18-194.3.1.el5xen