Merge branch 'master' into 4.0-pre-not-stable

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	docs/changelog

cdist/conf/type/__apt_ppa/man.text

@@ -16,7 +16,8 @@ This cdist type allows manage ubuntu ppa repositories.
 REQUIRED PARAMETERS
 -------------------
 state::
-   The state the ppa should be in, either "present" or "absent".
+   The state the ppa should be in, either 'present' or 'absent'.
+   Defaults to 'present'
 
 
 OPTIONAL PARAMETERS
@@ -29,6 +30,8 @@ EXAMPLES
 
 --------------------------------------------------------------------------------
 # Enable a ppa repository
+__apt_ppa ppa:sans-intern/missing-bits
+# same as
 __apt_ppa ppa:sans-intern/missing-bits --state present
 
 # Disable a ppa repository
@@ -43,5 +46,5 @@ SEE ALSO
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).

cdist/conf/type/__apt_ppa/manifest

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -20,9 +20,10 @@
 
 name="$__object_id"
 
-__package python-software-properties --state present
+__package software-properties-common
+__package python-software-properties
 
-require="__package/python-software-properties" \
+require="__package/software-properties-common __package/python-software-properties" \
    __file /usr/local/bin/remove-apt-repository \
    --source "$__type/files/remove-apt-repository" \
    --mode 0755

cdist/conf/type/__apt_ppa/parameter/default/state

@@ -0,0 +1 @@
+present

docs/changelog

@@ -8,7 +8,10 @@ Changelog
 	* Core: Integrate initial install support
 	* Core: Integrate initial preos support
 
-3.0.3:
+3.0.4:
+	* Type __apt_ppa: Install required software (Steven Armstrong)
+
+3.0.3: 2014-01-22
 	* Core: Enhance error message when requirement is missing object id
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n