From e19b574e23f8bd591609b4108eea5e42ee8eafd9 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 7 Feb 2011 11:17:07 +0100 Subject: 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 --- README | 4 +++- templates/Debian/sources.list.erb | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README b/README index 61ffb1d..6489272 100644 --- 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 f2e8fd8..3a810e3 100644 --- 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 -%> -- cgit v1.2.3