Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.

Merging one more commit.

Conflicts:
	files/preferences
	templates/Debian/sources.list.deb-src.erb
	templates/Debian/sources.list.volatile.erb
	templates/Ubuntu/sources.list.backports.erb
	templates/Ubuntu/sources.list.deb-src.erb

diff --cc templates/Debian/sources.list.erb
index 67da85d048d72b0f015dd6c90dc7e3a8d9717d40,ab029cac427f453bbd2b1c9a80d93f469fcf6fae..7fb9bdfa083e3d31892097041e4a1e5ecbd41431
--- 1/templates/Debian/sources.list.erb
--- 2/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@@ -1,62 -1,13 +1,63 @@@
  # This file is brought to you by puppet
+ # all local modifications will be overwritten
  
 -# basic <%= lsbdistcodename %>
 -deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free
 -# security suppport
 -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%>
 -# There is no security mirror for <%= lsbdistcodename %>
 +### Debian current: <%= codename %>
 +
 +# basic
 +deb <%= debian_url %> <%= codename %> <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= debian_url %> <%= codename %> <%= repos %>
 +<% end -%>
 +
 +# security
 +<% if (release == "unstable" || release == "experimental") -%>
 +# There is no security support for <%= release %>
 +<% else -%>
 +deb <%= security_url %> <%= codename %>/updates <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= security_url %> <%= codename %>/updates <%= repos %>
 +<% end -%>
 +<% end -%>
 +
 +# backports
 +<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
 +# There is no backports archive for <%= release %>
 +<% else -%>
 +deb <%= backports_url %> <%= codename %>-backports <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= backports_url %> <%= codename %>-backports <%= repos %>
 +<% end -%>
 +<% end -%>
 +
 +<% if use_volatile -%>
 +# volatile
 +<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
 +# There is no volatile archive for <%= release %>
 +<% else -%>
 +deb <%= volatile_url %> <%= codename %>/volatile <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= volatile_url %> <%= codename %>/volatile <%= repos %>
 +<% end -%>
 +<% end -%>
 +<% end -%>
 +
 +<% if use_next_release then -%>
 +### Debian next: <%= next_codename %>
 +
 +# basic
 +deb <%= debian_url %> <%= next_codename %> <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= debian_url %> <%= next_codename %> <%= repos %>
 +<% end -%>
 +
 +# security
 +<% if (next_release == "unstable" || next_release == "experimental") -%>
 +# There is no security support for <%= next_release %>
  <% else -%>
 -deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free
 +deb <%= security_url %> <%= next_codename %>/updates <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= security_url %> <%= next_codename %>/updates <%= repos %>
 +<% end -%>
  <% end -%>
  
  # backports

diff --cc templates/Ubuntu/sources.list.erb
index 1486e95d7f651578fef4ad4d510c0e7aaa86f38e,a37fffc16d2795168ac49268e13be890031c0ff0..2a25d6f6dcd9da1080f14f6d4fea1d90b7c84ead
--- 1/templates/Ubuntu/sources.list.erb
--- 2/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@@ -1,25 -1,13 +1,26 @@@
  # This file is brought to you by puppet
+ # all local modifications will be overwritten
  
  # basic <%= lsbdistcodename %>
 -deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse
 +deb <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %>
 +<% end -%>
  
  # updates
 -deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates main restricted universe multiverse
 +deb <%= ubuntu_url %> <%= lsbdistcodename %>-updates <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-updates <%= repos %>
 +<% end -%>
  
  # security suppport
 -deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security main restricted universe multiverse
 -
 +deb <%= ubuntu_url %> <%= lsbdistcodename %>-security <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-security <%= repos %>
 +<% end -%>
  
 +# backports
 +deb <%= ubuntu_url %> <%= lsbdistcodename %>-backports main <%= repos %>
 +<% if include_src then -%>
 +deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-backports <%= repos >
 +<% end -%>