Starting from Squeeze, Debian Volatile is deprecated in favor of CODENAME-updates.

Take this into account in the Debian sources.list template:
  - go on using volatile.d.o for <= Lenny sources lines
  - start using CODENAME-updates for Squeeze and newer.

Reference: http://lists.debian.org/debian-volatile/2011/01/msg00008.html

diff --git a/README b/README
index 61ffb1da0b1e98439ae0f0411c9a226d706f9daa..6489272714e9960991ef8ce7de37e6df0900dc8d 100644 (file)
--- a/README
+++ b/README
@@ -112,7 +112,9 @@ Here's an example of setting the proxy to 'http://proxy.domain' at port 666:
 $apt_volatile_enabled
 -----------------
 
-If this variable is set to true the Debian Volatile sources are added.
+If this variable is set to true the Debian Volatile sources (until
+Lenny) or CODENAME-updates (such as squeeze-updates, supported since
+Squeeze) are added.
 By default this is false for backward compatibility with older
 versions of this module.
 

diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index f2e8fd883368c840c01899156dc107deb31d6c68..3a810e310271584a9cecb5a1edc12ca75702e567 100644 (file)
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -34,10 +34,17 @@ deb-src <%= backports_url %> <%= codename %>-backports <%= repos %>
 <% if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no volatile archive for <%= release %>
 <% else -%>
+<% if (codename == "lenny" || codename == "etch") -%>
 deb <%= volatile_url %> <%= codename %>/volatile <%= repos %>
 <% if include_src then -%>
 deb-src <%= volatile_url %> <%= codename %>/volatile <%= repos %>
 <% end -%>
+<% else -%>
+deb <%= debian_url %> <%= codename %>-updates <%= repos %>
+<% if include_src then -%>
+deb-src <%= debian_url %> <%= codename %>-updates <%= repos %>
+<% end -%>
+<% end -%>
 <% end -%>
 <% end -%>
 
@@ -75,10 +82,17 @@ deb-src <%= backports_url %> <%= next_codename %>-backports <%= repos %>
 <% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
 # There is no volatile archive for <%= next_release %>
 <% else -%>
+<% if (next_codename == "lenny" || next_codename == "etch") -%>
 deb <%= volatile_url %> <%= next_codename %>/volatile <%= repos %>
 <% if include_src then -%>
 deb-src <%= volatile_url %> <%= next_codename %>/volatile <%= repos %>
 <% end -%>
+<% else -%>
+deb <%= debian_url %> <%= next_codename %>-updates <%= repos %>
+<% if include_src then -%>
+deb-src <%= debian_url %> <%= next_codename %>-updates <%= repos %>
+<% end -%>
+<% end -%>
 <% end -%>
 <% end -%>
 <% end -%>