From b8b427ecc916b71e54e38cbae2497ba7c08b6cc3 Mon Sep 17 00:00:00 2001
From: Corey Quinn <corey@sequestered.net>
Date: Tue, 17 Jan 2012 12:48:26 -0800
Subject: [PATCH] Updating rules and install files

---
 debian/control             | 4 ++--
 debian/rules               | 8 ++------
 debian/salt-common.install | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index f522ea2d80..17c7e48937 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                python-m2crypto,
                python-zmq (>= 2.1.9),
                libzmq-dev (>= 2.1.9),
-               python (>= 2.6),
-               python-dev (>= 2.6),
+               python-all-dev,
                python-jinja2
 Standards-Version: 3.9.2
 Homepage: http://saltstack.org
@@ -24,6 +23,7 @@ Package: salt-common
 Architecture: any
 Depends: ${python:Depends},
          ${misc:Depends},
+         ${shlibs:Depends},
          python-support,
          cython,
          python-setuptools,
diff --git a/debian/rules b/debian/rules
index 5bde0a66ba..04dfdf8f28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
-
+#export DH_VERBOSE=1
 %:
-	dh $@
-override_dh_auto_build:
-	python setup.py build
-override_dh_auto_install:
-	python setup.py install
+	dh $@ --buildsystem=python_distutils
 #override_dh_installinit:
 #	dh_installinit --no-start --name="salt-master"
 #	dh_installinit --no-start --name="salt-minion"
diff --git a/debian/salt-common.install b/debian/salt-common.install
index 1c847b7b1e..06237cb262 100644
--- a/debian/salt-common.install
+++ b/debian/salt-common.install
@@ -21,3 +21,4 @@ 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