Merge branch 'master' of git://labs.riseup.net/shared-apt

3 files changed, 5 insertions, 4 deletions

diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
index 6bc4b6b..f57dd2a 100644
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ b/lib/puppet/parser/functions/debian_nextcodename.rb
@@ -3,7 +3,8 @@ module Puppet::Parser::Functions
     case args[0]
       when "etch"    then "lenny"
       when "lenny"   then "squeeze"
-      when "squeeze" then "sid"
+      when "squeeze" then "wheezy"
+      when "wheezy"  then "sid"
       when "sid"     then "experimental"
       else "sid"
     end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
index 64feb66..857edf3 100644
--- a/lib/puppet/parser/functions/debian_release.rb
+++ b/lib/puppet/parser/functions/debian_release.rb
@@ -1,9 +1,8 @@
 module Puppet::Parser::Functions
   newfunction(:debian_release, :type => :rvalue) do |args|
     case args[0]
-      when 'etch'         then 'oldstable'
-      when 'lenny'        then 'stable'
-      when 'squeeze'      then 'testing'
+      when 'lenny'        then 'oldstable'
+      when 'squeeze'      then 'stable'
       when 'wheezy'       then 'testing'
       when 'sid'          then 'unstable'
       when 'experimental' then 'experimental'
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
index 4b135d0..ff58f72 100644
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ b/lib/puppet/parser/functions/debian_release_version.rb
@@ -3,6 +3,7 @@ module Puppet::Parser::Functions
     case args[0]
       when 'etch'         then '4.0'
       when 'lenny'        then '5.0'
+      when 'squeeze'      then '6.0'
       else ''
     end
   end