Merge branch 'master' of git://git.puppet.immerda.ch/module-apt

Conflicts:
	templates/Debian/sources.list.erb

diff --cc manifests/init.pp
Simple merge

diff --cc templates/Debian/sources.list.erb
index 8c9b28d7a03d8aaaa4619563aa22a962458b0537,dee6ce56b842ad89ef58556f383189d58b61c46b..37f1c35d1d4956bef50dcb391bb283c94105851a
--- 1/templates/Debian/sources.list.erb
--- 2/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@@ -10,14 -10,14 +10,14 @@@ deb-src <%= debian_url %> <%= codename 
  <% end -%>
  
  # security
 -<% if ((release=scope.lookupvar('apt::release')) == "unstable" || release == "experimental") -%>
 -# There is no security support for <%= release %>
 -<% else -%>
 +<% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%>
  deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
- <% if include_src -%>
+ <%   if include_src -%>
  deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
 -<%   end
 -   end -%>
 +<% end -%>
 +<% else -%>
 +# There is no security support for <%= release %>
 +<% end -%>
  
  # backports
  <% if (release == "testing" || release == "unstable" || release == "experimental") -%>
@@@ -31,28 -31,16 +31,28 @@@ deb-src <%= backports_url %> <%= codena
  
  <% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
  # volatile
- <% if (release == "testing" || release == "unstable" || release == "experimental") -%>
+ <%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
  # There is no volatile archive for <%= release %>
- <% else -%>
+ <%   else -%>
  deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
- <% if include_src -%>
+ <%     if include_src -%>
  deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
- <% end -%>
- <% end -%>
- <% end -%>
+ <%     end
+      end
+    end -%>
  
 +<% if use_lts=scope.lookupvar('apt::use_lts') -%>
 +# LTS
 +<% if release != "oldstable" -%>
 +# There is no LTS archive for <%= release %>
 +<% else -%>
 +deb <%= debian_url %> <%= codename %>-lts <%= lrepos %>
 +<% if include_src -%>
 +deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %>
 +<% end -%>
 +<% end -%>
 +<% end -%>
 +
  <% if next_release=scope.lookupvar('apt::use_next_release') -%>
  ### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>