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 --- templates/Debian/sources.list.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'templates') 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 From 045e1fc748c83b55ce03c5cb2aa0a8ae29904975 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 7 Feb 2011 11:40:00 +0100 Subject: Stop hard-coding Wheezy name in Squeeze's pinning template. Every needed function has been updated since Squeeze was released and we can thus use a nice generic template. --- templates/Debian/preferences_squeeze.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb index f21562d..3de7959 100644 --- a/templates/Debian/preferences_squeeze.erb +++ b/templates/Debian/preferences_squeeze.erb @@ -8,9 +8,9 @@ Package: * Pin: origin backports.debian.org Pin-Priority: 200 -Explanation: Debian wheezy +Explanation: Debian <%= next_codename %> Package: * -Pin: release o=Debian,n=wheezy +Pin: release o=Debian,n=<%= next_codename %> Pin-Priority: 2 Explanation: Debian sid -- cgit v1.2.3 From 840ea9ed9d3e0a26e5a70db2143ebb3f0fea13b4 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 14 Feb 2011 10:52:25 +0100 Subject: Debian Squeeze pinning: pin squeeze-updates as much as regular squeeze. The previous template was indeed ensuring no package from squeeze-updates could be easily or automatically installed. --- templates/Debian/preferences_squeeze.erb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'templates') diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb index 3de7959..5e15d27 100644 --- a/templates/Debian/preferences_squeeze.erb +++ b/templates/Debian/preferences_squeeze.erb @@ -3,6 +3,11 @@ Package: * Pin: release o=Debian,n=<%= codename %> Pin-Priority: 990 +Explanation: Debian <%= codename %>-updates +Package: * +Pin: release o=Debian,n=<%= codename %>-updates +Pin-Priority: 990 + Explanation: Debian backports Package: * Pin: origin backports.debian.org -- cgit v1.2.3