From 6a212c5768c2468cda76685f9d0c0e2734339441 Mon Sep 17 00:00:00 2001
From: Sean Channel <pentabular@gmail.com>
Date: Fri, 25 Jan 2013 11:33:43 -0800
Subject: [PATCH 1/2] install from @madduck

---
 doc/topics/installation/debian.rst | 95 +++++++++++++++++++++++-------
 1 file changed, 73 insertions(+), 22 deletions(-)

diff --git a/doc/topics/installation/debian.rst b/doc/topics/installation/debian.rst
index 9d9139510e6b..de8fa05ca533 100644
--- a/doc/topics/installation/debian.rst
+++ b/doc/topics/installation/debian.rst
@@ -1,25 +1,86 @@
-======
-Debian
-======
+===================
+Debian Installation
+===================
 
-Installation
-============
+Currently the latest packages for Debian are published in Martin F. Krafft's
+personal debian.org repository. 
 
-Salt is currently available in in the Debian package tree:
+Confiure Apt
+------------
 
-http://packages.debian.org/source/salt
+Setup apt to install Salt from the repository and use Debian's stable (squeeze)
+backports for dependencies:
 
-If you're running a Debian release more recent than Wheezy use:
+.. code-block:: bash
+
+    for i in salt-{common,master,minion,syndic,doc}; do
+    echo "Package: $i"
+    echo "Pin: release a=squeeze-backports"
+    echo "Pin-Priority: 600"
+    echo
+    done > /etc/apt/preferences.d/local-salt-backport.pref 
+
+Add repository
+--------------
+
+Add the repository to the list of sources:
+
+.. code-block:: bash
+
+    cat <<_eof > /etc/apt/sources.list.d/local-madduck-backports.list
+        deb http://debian.madduck.net/repo squeeze-backports main
+        deb-src http://debian.madduck.net/repo squeeze-backports main
+    _eof 
+
+Import the repository key.
+
+.. code-block:: bash
+
+    wget -q -O- "http://debian.madduck.net/repo/gpg/archive.key" | apt-key add -
+
+.. note:: 
+ 
+    You can optionally verify the key integrity with ``sha512sum`` using the 
+    public key signature shown here. E.g::
+
+        echo "8b1983fc2d2c55c83e2bbc15d93c3fc090c8e0e92c04ece555a6b6d8ff26de8b4fc2ccbe1bbd16a6357ff86b8b69fd261e90d61350e07a518d50fc9f5f0a1eb3 archive.key" | sha512sum -c 
+
+Update the package database:
+
+.. code-block:: bash
+
+    apt-get update
+
+
+Install packages
+----------------
+
+Install the Salt master, minion, or syndic from the repository with the apt-get 
+command. These examples each install one daemon, but more than one package name 
+may be given at a time:
+
+.. code-block:: bash
+
+    apt-get install salt-master 
 
 .. code-block:: bash
 
-    apt-get install salt-master
     apt-get install salt-minion
 
-As of this writing salt is only available in Debian unstable.
+.. code-block:: bash
+
+    apt-get install salt-syndic
+
+.. _Debian-config:
+
+Post-installation tasks
+=======================
+
+Now go to the :doc:`Configuring Salt</topics/configuration>` page.
+
 
-Squeeze
-=======
+Packages from Source
+====================
 
 To build your own salt Debian packages on squeeze use:
 
@@ -51,16 +112,6 @@ salt-master packages. For example:
 
 The last command pulls in the required dependencies for your salt packages.
 
-Wheezy
-======
-
-Backports for Wheezy should be available shortly after it's release.
-
 For more information how to use debian-backports see
 http://backports-master.debian.org/Instructions/
 
-Post-installation tasks
-=======================
-
-Now go to the :doc:`Configuring Salt</topics/configuration>` page.
-

From 88249e219fc0ee5a94192fccc4f06e7087e311c6 Mon Sep 17 00:00:00 2001
From: Sean Channel <pentabular@gmail.com>
Date: Fri, 25 Jan 2013 11:40:24 -0800
Subject: [PATCH 2/2] add sysvinit-utils to pinnings

---
 doc/topics/installation/debian.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/topics/installation/debian.rst b/doc/topics/installation/debian.rst
index de8fa05ca533..e1e2284dab7c 100644
--- a/doc/topics/installation/debian.rst
+++ b/doc/topics/installation/debian.rst
@@ -13,7 +13,7 @@ backports for dependencies:
 
 .. code-block:: bash
 
-    for i in salt-{common,master,minion,syndic,doc}; do
+    for i in salt-{common,master,minion,syndic,doc} sysvinit-utils; do
     echo "Package: $i"
     echo "Pin: release a=squeeze-backports"
     echo "Pin-Priority: 600"