X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=files%2Findex.html.tt2;h=cf9ecde19153c23ca7575c92b6182fd1ac07478c;hb=f020a452b21774e3064df6ad27c502a167cdb3da;hp=71f4a887c27c951048a12a936825e1ebf322556f;hpb=1fce34f10ff6bdb0dc2bf3500c5f50a94e611bbd;p=grml.org.git

diff --git a/files/index.html.tt2 b/files/index.html.tt2
index 71f4a88..cf9ecde 100644
--- a/files/index.html.tt2
+++ b/files/index.html.tt2
@@ -38,12 +38,41 @@
 	<p>Note that using the Grml repository on standard Debian systems is <b>not recommended</b>. If you just want our console configuration, read <a href="http://grml.org/console/">"Make console work comfortable"</a>.</p>
 
 	<pre class="rahmen">
-# Signing key is available in grml-archive-keyring
+# Signing key is available in grml-debian-keyring
 #  deb     http://deb.grml.org/ grml-stable main
 #  deb-src http://deb.grml.org/ grml-stable main
 #  deb     http://deb.grml.org/ grml-testing main
 #  deb-src http://deb.grml.org/ grml-testing main</pre>
 
+	<p>If you are running Debian stretch or later, you may want to use the following <code>.sources</code> file, which will enforce the suite name and signing keys:</p>
+
+	<pre class="rahmen">
+Types: deb deb-src
+URIs: http://deb.grml.org/
+Suites: grml-stable grml-testing
+Architectures: i386 amd64
+Components: main
+Signed-By: /usr/share/keyrings/grml-archive-keyring.gpg</pre>
+
+	<p>Then the following <a href="https://manpages.debian.org/apt_preferences">preferences file</a> will keep packages from GRML to replace normal Debian packages, in <code>/etc/apt/preferences.d/grml.pref</code>:</p>
+	
+	<pre class="rahmen">
+Package: *
+Pin: release a=grml-stable
+Pin-Priority: 100
+
+Package: *
+Pin: release a=grml-testing
+Pin-Priority: 100</pre>
+
+	<p>Also  note that you may have trouble installing the <code>grml-debian-keyring</code> package as APT will complain about the missing key. A workaround is to download it directly:</p>
+	
+	<pre class="rahmen">
+sudo wget -O /usr/share/keyrings/grml-archive-keyring.gpg http://deb.grml.org/repo-key.gpg
+sudo apt-get update
+sudo apt-get install grml-debian-keyring
+</pre>
+
         <h2><a name="wallpapers"></a>Wallpapers and other media files provided by Grml</h2>
 
 	<p>Wallpapers, CD covers and similar media files are available in the
@@ -55,20 +84,40 @@
 
         <h2><a name="debian"></a>Package lists for the current release</h2>
 
-        <h3>grml32 2011.12</h3>
+        <h3>grml32-full 2017.05</h3>
+
+        <ul>
+          <li><a href="grml32-full_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-full_2017.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml32-full_2017.05/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+        </ul>
+
+        <h3>grml64-full 2017.05</h3>
+
+        <ul>
+          <li><a href="grml64-full_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-full_2017.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml64-full_2017.05/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+        </ul>
+
+        <h3>grml32-small 2017.05</h3>
 
         <ul>
-          <li><a href="grml32_2011.12/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml32_2011.12/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="grml32-small_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-small_2017.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
           <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml32-small_2017.05/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml64 2011.12</h3>
+        <h3>grml64-small 2017.05</h3>
 
         <ul>
-          <li><a href="grml64_2011.12/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml64_2011.12/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="grml64-small_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-small_2017.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
           <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml64-small_2017.05/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
       </div>