Merge branch 'master' into ubuntu-master

Conflicts:

	templates/html/head.tmpl

diff --git a/bin/extract_changelogs b/bin/extract_changelogs
index 7d6f3e4769bafb894f7469b1b5c26443db6b2c80..9a85a7dc51e8f41f6f28aead28fd549b1fa48381 100755 (executable)
--- a/bin/extract_changelogs
+++ b/bin/extract_changelogs
@@ -40,13 +40,28 @@ for part in $parts; do
 done
 
 if [ "$successful" -eq 1 ]; then
-    find "${htmldir}/changelogs/" -name log -cmin +14440 \
+    find -H "${htmldir}/changelogs/" -name log -cmin +14440 \
      | while read logfile; do
        dir=$(dirname "$logfile")
        echo deleting $dir
        rm -r "$dir"
        rmdir --ignore-fail-on-non-empty $(dirname "$dir")
     done
+    cdir=$(pwd)
+    find -H "${htmldir}/changelogs/" -name current -not -xtype d \
+     | while read link; do
+       dir=$(dirname "$link")
+       echo repairing current link $link
+       rm -v "$link"
+       target=$(ls -t1 "$dir" | tail -n1)
+       if [ -n "$target" ]; then
+               cd $dir && ln -sv $target current
+               cd $cdir
+       else
+               rmdir -v $dir
+       fi
+    done
+
 else
     echo clean-up skipped because at least one of the extraction runs failed >&2
 fi

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index a021d5559623d232ed72c7cc3b96bfbbe08a14c4..57339a287d85d002e935c14748b07a7a65e51c51 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -23,15 +23,20 @@
 <p>[% g('If you are running %s, it is strongly suggested to use a package manager like <a href="%s">aptitude</a> or <a href="%s">synaptic</a> to download and install packages, instead of doing so manually via this website.',
        organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]</p>
 <p>[% g('You should be able to use any of the listed mirrors by adding a line to your <kbd>/etc/apt/sources.list</kbd> like this:') %]</p>
-[% IF archive != "security" %]
+[% IF archive == "volatile" %]
 <pre>
-deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
+deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite.replace('-','/') %] main [% section IF section != main_section %]
 </pre>
 <p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
-[% ELSE %]
+[% ELSIF archive == "security" %]
 <pre>
 deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] main [% section IF section != main_section %]
 </pre>
+[% ELSE %]
+<pre>
+deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
+</pre>
+<p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
 [%- END %]
 [% IF suite == "experimental" %]
 <h2>[% g('Experimental package') %]</h2>