From: Alexander Wirt <formorer@formorer.de>
Date: Wed, 14 Feb 2018 18:34:01 +0000 (+0100)
Subject: Merge pull request #13 from anarcat/patch-1
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=65c3d435ec30ba126a4867eb09d34c4a48c3737a;hp=-c;p=grml.org.git

Merge pull request #13 from anarcat/patch-1

debian repository instructions improvements
---

65c3d435ec30ba126a4867eb09d34c4a48c3737a
diff --combined files/index.html.tt2
index 9451319,51574ba..4e3f02f
--- a/files/index.html.tt2
+++ b/files/index.html.tt2
@@@ -44,6 -44,35 +44,35 @@@
  #  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: 05483D2F0A254E5BC12AC73021E0CA38EA2EA4AB</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 /etc/apt/trusted.gpg.d/grml.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,40 -84,40 +84,40 @@@
  
          <h2><a name="debian"></a>Package lists for the current release</h2>
  
 -        <h3>grml32-full 2014.11</h3>
 +        <h3>grml32-full 2017.05</h3>
  
          <ul>
 -          <li><a href="grml32-full_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
 -          <li><a href="grml32-full_2014.11/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
 +          <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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</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 2014.11</h3>
 +        <h3>grml64-full 2017.05</h3>
  
          <ul>
 -          <li><a href="grml64-full_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
 -          <li><a href="grml64-full_2014.11/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
 +          <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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</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 2014.11</h3>
 +        <h3>grml32-small 2017.05</h3>
  
          <ul>
 -          <li><a href="grml32-small_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
 -          <li><a href="grml32-small_2014.11/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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</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-small 2014.11</h3>
 +        <h3>grml64-small 2017.05</h3>
  
          <ul>
 -          <li><a href="grml64-small_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
 -          <li><a href="grml64-small_2014.11/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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</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>