[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Hamradio blend website and live images

Howdy,

Following this discussion earlier this week, here's my first pass at the patch for the english website - 

The bulk of the changes are as follows: 
  * Big updates to english/blends/hamradio
    - Removed mentions of the Live images from all pages
    - Changed the "Get" section to a single page about Metapackages
    - Updated navigation links on index and navbar
    - Removed the "Download 8.5.0 banner 
    - Updated the Makefile to make reflect the new Get page
  * Added Hamradio blend to the released list in english/blends/

Any comments/feedback?

-- 
  Hibby
  MM0RFN

On Fri, 29 Jan 2021, at 3:01 PM, Dave Hibberd wrote:
> Great - I'm happy to make changes and pass on patches. 
> 
> -- 
>   Hibby
>   MM0RFN
> 
> On Fri, 29 Jan 2021, at 2:44 PM, Christoph Berg wrote:
> > Re: Dave Hibberd
> > > I'm happy to go along with that, it'll reduce fatigue and maintenance requirement long term. I think the only other blend that promises an image is debian-gis who also have an 8.5.0 image on their page, so that's a good indicator it's not the direction blends have taken.
> > > 
> > > I'll go talk to debian-www about how best to go about removing that section from the website :)
> > 
> > Fwiw, I have access to webwml if there are patches to commit.
> > 
> > Christoph
> > 
> >
> 
>
diff --git a/english/blends/hamradio/Makefile b/english/blends/hamradio/Makefile
index 4d5b2286493..d034445f28e 100644
--- a/english/blends/hamradio/Makefile
+++ b/english/blends/hamradio/Makefile
@@ -18,3 +18,5 @@ contact.$(LANGUAGE).html: contact.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template
 support.$(LANGUAGE).html: support.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml navbar.inc $(TEMPLDIR)/blends/hamradio.wml
 
 fun.$(LANGUAGE).html: fun.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml navbar.inc $(TEMPLDIR)/blends/hamradio.wml
+
+get.$(LANGUAGE).html: get.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml navbar.inc $(TEMPLDIR)/blends/hamradio.wml
diff --git a/english/blends/hamradio/about.wml b/english/blends/hamradio/about.wml
index c4a4ebad66a..1b6560014b3 100644
--- a/english/blends/hamradio/about.wml
+++ b/english/blends/hamradio/about.wml
@@ -1,6 +1,4 @@
-#use wml::debian::blend title="About the Blend"
-#use "navbar.inc"
-# $Id$
+
 
 <p>The <b>Debian Hamradio Pure Blend</b> is a project of the <a
 href="https://wiki.debian.org/DebianHams/";>Debian Hamradio Maintainers Team</a>
@@ -10,26 +8,14 @@ that is configured to support a particular target group out-of-the-box. This
 blend aims to support the needs of radio amateurs.</p>
 
 <p>The Blend is built from a curated list of amateur radio software in Debian.
-The two main outputs from the Blend are a collection of "metapackages" and live
-images that can be put onto a DVD or a USB stick.</p>
-
-<h2>Metapackages</h2>
+The software has been categorized and collected into categories that can be
+installed. Each category has its own Metapackage</p>
 
 <p>Metapackages in Debian are packages that can be installed just like other
 packages but that do not contain any software themselves, instead instructing
 the packaging system to install a group of other packages.</p>
 
-<p>See <a href="./get/metapackages">using the metapackages</a> for more
+<p>See <a href="./get">using the metapackages</a> for more
 information on which metapackages are available and how to install the
 metapackages on an existing Debian system.</p>
 
-<h2>Live Images</h2>
-
-<p>If you're new to Debian and you'd like to try the Debian Hamradio Pure Blend
-without installing it on your computer, or if you'd like to perform a fresh
-installation of Debian with all the amateur radio software ready-to-go, you
-might find the live images useful. Images are produced that can be run from
-DVDs or USB sticks on both 32-bit and 64-bit Intel architectures.</p>
-
-<p>See the <a href="./get/live">live images page</a> for more information.</p>
-
diff --git a/english/blends/hamradio/dev.wml b/english/blends/hamradio/dev.wml
index a5b871c3b60..55bb04d9019 100644
--- a/english/blends/hamradio/dev.wml
+++ b/english/blends/hamradio/dev.wml
@@ -33,24 +33,3 @@ installed to build the source.</i></p>
 
 <p>To learn more about how to work with blends metapackages, see <a href="https://blends.debian.org/blends/ch06.html#metapackages";>§6.1</a> of the <a href="https://blends.debian.org/blends/";>Debian Pure Blends Manual</a>.</p>
 
-<h2>Live DVD Source Code</h2>
-
-<ul>
-	<li><a href="https://salsa.debian.org/blends-team/blends-images";>Web-based git browser</a></li>
-	<li><a href="https://salsa.debian.org/blends-team/blends-images.git";>Anonymouse git clone</a></li>
-</ul>
-
-<pre>git clone https://salsa.debian.org/blends-team/blends-images.git
-cd blends-images/images/hamradio-amd64
-lb config
-sudo lb build</pre>
-
-<p><i>Note: you will need <a
- href="https://packages.debian.org/unstable/git-buildpackage";>git-buildpackage</a>
-	and <a href="https://packages.debian.org/unstable/live-build";>live build</a>
-	installed to build the source.</i></p>
-
-<p>To learn more about how to work with live-build sources, see the <a
- href="http://live.debian.net/manual/unstable/html/live-manual/toc.en.html";>Live
- Systems Manual</a>.</p>
-
diff --git a/english/blends/hamradio/get/metapackages.wml b/english/blends/hamradio/get.wml
similarity index 82%
rename from english/blends/hamradio/get/metapackages.wml
rename to english/blends/hamradio/get.wml
index 618101b11b8..f1624d09696 100644
--- a/english/blends/hamradio/get/metapackages.wml
+++ b/english/blends/hamradio/get.wml
@@ -1,10 +1,16 @@
-#use wml::debian::blend title="Using the metapackages"
-#use "../navbar.inc"
+#use wml::debian::blend title="Getting the blend"
+#use "navbar.inc"
 # $Id$
 
-<p>Metapackages are used by the blend as a convinient way of collecting
-together related software packages. Each metapackage when installed will cause
-the package management system to install the packages related to the task.</p>
+<p>The Debian Hamradio Pure Blend is distributed <a href="../../../intro/free">freely</a> 
+over the Internet.</p>
+
+<p>The blend uses 'metapackages' as a convinient way of collecting together
+related software packages. Each metapackage when installed will cause the
+package management system to install the packages related to the task.</p>
+
+<p>Metapackages can be installed on both Debian Stretch (Stable) and Debian
+Bullseye (Testing).</p>
 
 <p>The following metapackages are currently maintained by the blend:</p>
 
@@ -92,17 +98,13 @@ the package management system to install the packages related to the task.</p>
 	</tr>
 </table>
 
-<p><i>Note: The metapackages have only recently been introduced to the
-archives. These will only be available in Debian stretch (testing), and are not
-available in Debian jessie (stable).</i></p>
-                                                                                 
 <p>To install any of the task metapackages, use your favourite package
 management tool as you would with any other Debian package. For
-<code>apt-get</code>:</p>
+<code>apt</code>:</p>
                                                                                  
-<pre>apt-get install hamradio-&lt;task&gt;</pre>                                 
+<pre>apt install hamradio-&lt;task&gt;</pre>                                 
                                                                                  
 <p>If you want to install the entire blend:</p>                                  
                                                                                  
-<pre>apt-get install hamradio-antenna hamradio-datamodes hamradio-digitalvoice hamradio-logging hamradio-morse hamradio-nonamateur hamradio-packetmodes hamradio-rigcontrol hamradio-satellite hamradio-sdr hamradio-tasks hamradio-tools hamradio-training</pre>
+<pre>apt install hamradio-antenna hamradio-datamodes hamradio-digitalvoice hamradio-logging hamradio-morse hamradio-nonamateur hamradio-packetmodes hamradio-rigcontrol hamradio-satellite hamradio-sdr hamradio-tasks hamradio-tools hamradio-training</pre>
 
diff --git a/english/blends/hamradio/get/Makefile b/english/blends/hamradio/get/Makefile
deleted file mode 100644
index a73193ec84e..00000000000
--- a/english/blends/hamradio/get/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# If this makefile is not generic enough to support a translation,
-# please contact debian-www.
-
-WMLBASE=../../..
-CUR_DIR=blends/hamradio/get
-SUBS=
-
-include $(WMLBASE)/Make.lang
-
-index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml ../navbar.inc
-
-metapackages.$(LANGUAGE).html: metapackages.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml ../navbar.inc
-
-live.$(LANGUAGE).html: live.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml ../navbar.inc
diff --git a/english/blends/hamradio/get/index.wml b/english/blends/hamradio/get/index.wml
deleted file mode 100644
index e5cb7027fb9..00000000000
--- a/english/blends/hamradio/get/index.wml
+++ /dev/null
@@ -1,57 +0,0 @@
-#use wml::debian::blend title="Getting the blend"
-#use wml::debian::blends::hamradio
-#use "../navbar.inc"
-# $Id$
-# This page is nowhere near done
-
-<p>The Debian Hamradio Pure Blend is distributed <a href="../../../intro/free">freely</a>
-over Internet.</p>
-<p>If you want to use the Blend, these are your options:</p>
-<div class="line">
-  <div class="item col50">
-    <h2><a href="./metapackages">Use the metapackages</a></h2>
-    <p>Depending on your needs, you can install one or more of the following metapackages on an existing Debian installation:</p>
-    <ul class="quicklist downlist">
-      <li><a title="See information for hamradio-antenna"
-	         href="https://packages.debian.org/unstable/hamradio-antenna";>hamradio-antenna</a></li>
-      <li><a title="See information for hamradio-datamodes"
-	         href="https://packages.debian.org/unstable/hamradio-datamodes";>hamradio-datamodes</a></li>
-      <li><a title="See information for hamradio-digitalvoice"
-	         href="https://packages.debian.org/unstable/hamradio-digitalvoice";>hamradio-digitalvoice</a></li>
-      <li><a title="See information for hamradio-logging"
-	         href="https://packages.debian.org/unstable/hamradio-logging";>hamradio-logging</a></li>
-      <li><a title="See information for hamradio-morse"
-	         href="https://packages.debian.org/unstable/hamradio-morse";>hamradio-morse</a></li>
-      <li><a title="See information for hamradio-nonamateur"
-	         href="https://packages.debian.org/unstable/hamradio-nonamateur";>hamradio-nonamateur</a></li>
-      <li><a title="See information for hamradio-packetmodes"
-	         href="https://packages.debian.org/unstable/hamradio-packetmodes";>hamradio-packetmodes</a></li>
-      <li><a title="See information for hamradio-rigcontrol"
-	         href="https://packages.debian.org/unstable/hamradio-rigcontrol";>hamradio-rigcontrol</a></li>
-      <li><a title="See information for hamradio-satellite"
-	         href="https://packages.debian.org/unstable/hamradio-satellite";>hamradio-satellite</a></li>
-      <li><a title="See information for hamradio-sdr"
-	         href="https://packages.debian.org/unstable/hamradio-sdr";>hamradio-sdr</a></li>
-      <li><a title="See information for hamradio-tools"
-	         href="https://packages.debian.org/unstable/hamradio-tools";>hamradio-tools</a></li>
-      <li><a title="See information for hamradio-training"
-	         href="https://packages.debian.org/unstable/hamradio-training";>hamradio-training</a></li>
-    </ul>
-  </div>
-  <div class="item col50 lastcol">
-    <h2><a href="./live">Download a live image</a></h2>
-    <p>
-      You can try the Blend by booting a live system from a DVD or USB key
-      without installing any files to the computer. When you are ready, you can
-      run the included installer.
-    </p>
-    <ul class="quicklist downlist">
-      <li><a title="Download live image for 64-bit Intel and AMD PC"
-	     href="<stable-amd64-url/>">64-bit PC live</a></li>
-      <li><a title="Download live image 32-bit Intel and AMD PC"
-	     href="<stable-i386-url/>">32-bit PC live</a></li>
-    </ul>
-  </div>
-</div>
-<div class="clr"></div>
-
diff --git a/english/blends/hamradio/get/live.wml b/english/blends/hamradio/get/live.wml
deleted file mode 100644
index af27b6ded80..00000000000
--- a/english/blends/hamradio/get/live.wml
+++ /dev/null
@@ -1,57 +0,0 @@
-#use wml::debian::blend title="Download Live Images"
-#use wml::debian::blends::hamradio
-#use "../navbar.inc"
-# $Id$
-
-<p>The Debian Hamradio Pure Blend produces <b>Live DVD images</b> that can
-be used to try out the Debian Hamradio Pure Blend on a computer without
-having to install it first. The images also contain an installer which can
-be used to install Debian along with the packages from the blend.</p>
-
-<h2>Debian Hamradio Blend Jessie Preview</h2>
-
-<p>A preview release of the Debian Hamradio Blend Live DVD is available
-for download. This is an unofficial release as the blend metapackages are
-not included in Debian Jessie.</p>
-
-<p>The latest stable release is: <strong><stable-version/></strong>.</p>
-
-<ul>
-        <li><a href="<stable-amd64-url/>">amd64 Live DVD image (ISO)</a> 
-        <li><a href="<stable-i386-url/>">i386 Live DVD image (ISO)</a> 
-        <li><a href="<stable-source-url/>">Live DVD image Source Archive (tar)</a> 
-</ul>
-
-<p>For webboot images, checksums and GPG signatures, see the <a
-href="https://cdimage.debian.org/cdimage/blends-live/";>full file
-listing</a>.</p>
-
-<h2>Debian Hamradio Blend Stretch</h2>
-
-<p>In the near future, live DVDs will be built for stretch (the current
-Debian testing distribution) although these are not currently
-available.</p>
-
-<h2>Getting Started</h2>
-
-<h3>Using a DVD</h3>
-
-<p>Most modern operating systems will have provisions for burning ISO images
-to DVD media. The Debian CD FAQ provides instructions for burning ISO images
-using <a href="https://www.debian.org/CD/faq/index#record-unix";>Linux</a>, <a
-href="https://www.debian.org/CD/faq/index#record-windows";>Windows</a> and <a
-href="https://www.debian.org/CD/faq/index#record-mac";>Mac OS</a>. If you are
-having difficulty, using a web search engine should provide the answers you
-need.</p>
-
-<h3>Using a USB stick</h3>
-
-<p>The ISO images are built as hybrid images, so you can copy them directly to
-a USB stick without using any special software like unetbootin. On a Linux
-system, you can do this like so:</p>
-
-<pre>sudo dd if=/path/to/debian-hamradio-live-image.iso of=/dev/sd<b>X</b></pre>
-
-<p>The output of the dmesg command should let you know the device name of the
-USB stick where you will need to change the <b>X</b> to the letter given.</p>
-
diff --git a/english/blends/hamradio/index.wml b/english/blends/hamradio/index.wml
index a3cd40946bc..f4ac4d9be89 100644
--- a/english/blends/hamradio/index.wml
+++ b/english/blends/hamradio/index.wml
@@ -3,9 +3,6 @@
 #use wml::debian::blends::hamradio
 # $Id$
 
-<span class="download"><a href="<stable-amd64-url/>">
-Download Debian Hamradio <stable-version/><br/><em>(64-bit LiveDVD)</em></a>
-</span>
 <div id="splash">
 	<h1 id="hamradio">Debian Hamradio Pure Blend</h1>
 </div>
@@ -26,18 +23,14 @@ blend aims to support the needs of radio amateurs.</p>
   <li><a href="./contact">Contact us</a></li>
 </ul>
 <ul id="hometoc-colb">
-  <li><a href="./get/">Getting the blend</a>
-  <ul>
-    <li><a href="./get/live">Download live images</a></li>
-    <li><a href="./get/metapackages">Using the metapackages</a></li>
-  </ul></li>
+  <li><a href="./get">Getting the blend</a></li>
+  <li><a href="./support">Support</a></li>
 </ul>
 <ul id="hometoc-colc">
   <li><a href="./docs">Documentation</a>
   <ul>
     <li><a href="<hamradio-handbook-html/>">Debian Hamradio Handbook</a></li>
   </ul></li>
-  <li><a href="./support">Support</a></li>
 </ul>
 <ul id="hometoc-cold">
   <li><a href="./dev">Development</a>
@@ -56,8 +49,7 @@ blend aims to support the needs of radio amateurs.</p>
 <h2>Getting Started</h2>
 
 <ul>
-<li>If you've already got Debian installed, check out the <a href="./get/metapackages">list of metapackages</a> to discover amateur radio software you can install.</li>
-<li>If you're new to Debian, you can try out a <a href="./get/live">live image</a> which will allow you to experience the Debian Hamradio blend without making changes to your system. It also includes an installer so you can install it to your system if you like what you find.</li>
+<li>If you've already got Debian installed, check out the <a href="./get">list of metapackages</a> to discover amateur radio software you can install.</li>
 <li>To get help in using amateur radio software in Debian, you can use one of our <a href="./support">support channels</a>.</li>
 </ul>
 
@@ -66,4 +58,3 @@ blend aims to support the needs of radio amateurs.</p>
 <p><:= get_recent_list('News/$(CUR_YEAR)', '6',
 '$(ENGLISHDIR)/blends/hamradio', '', '\d+\w*' ) :>
 </p>
-
diff --git a/english/blends/hamradio/navbar.inc b/english/blends/hamradio/navbar.inc
index 25283af3721..666c29273d6 100644
--- a/english/blends/hamradio/navbar.inc
+++ b/english/blends/hamradio/navbar.inc
@@ -7,11 +7,7 @@
       <li><a href="$(HOME)/blends/hamradio/about">About</a></li>
       <li><a href="$(HOME)/blends/hamradio/News/">News&nbsp;Archives</a></li>
       <li><a href="$(HOME)/blends/hamradio/contact">Contact</a></li>
-      <li><a href="$(HOME)/blends/hamradio/get/">Getting&nbsp;the&nbsp;Blend</a>
-         <ul>
-         <li><a href="$(HOME)/blends/hamradio/get/live">Download&nbsp;live&nbsp;images</a></li>
-         <li><a href="$(HOME)/blends/hamradio/get/metapackages">Using&nbsp;the&nbsp;metapackages</a></li>
-	 </ul>
+      <li><a href="$(HOME)/blends/hamradio/get">Getting&nbsp;the&nbsp;Blend</a>
       </li>
       <li><a href="$(HOME)/blends/hamradio/docs/">Documentation</a>
         <ul>
@@ -22,7 +18,7 @@
       <li><a href="$(HOME)/blends/hamradio/dev">Development</a>
         <ul>
         <li><a href="https://wiki.debian.org/DebianHams";>Hamradio Maintainers Team</a></li>
-        <li><a href="<hamradio-maintguide-html/>">Hamradio Maintainers Guide</a></li>
+        <li><a href="../../doc/manuals/hamradio-maintguide/">Hamradio Maintainers Guide</a></li>
         </ul>
       </li>
       <li><a href="$(HOME)/blends/hamradio/fun">Fun</a></li>
diff --git a/english/blends/released.data b/english/blends/released.data
index 680e261e44d..5615edf9bb1 100644
--- a/english/blends/released.data
+++ b/english/blends/released.data
@@ -91,3 +91,11 @@
 <downloads "https://wiki.debian.org/FreedomBox/Download";>
 </links>
 </tr>
+
+<tr>
+<blend "hamradio/">Debian Hamradio</blend>
+<description><gettext domain="blends">The goal of Debian Hamradio is to support the needs of radio amateurs in Debian by providing logging, data mode and packet mode applications and more.</gettext></description>
+<links>
+<metapackages "https://blends.debian.org/hamradio/tasks";>
+</links>
+</tr>
diff --git a/english/blends/unreleased.data b/english/blends/unreleased.data
index bfe7d45b6ce..6dbb2fedbf3 100644
--- a/english/blends/unreleased.data
+++ b/english/blends/unreleased.data
@@ -33,15 +33,6 @@
 </links>
 </tr>
 
-<tr>
-<blend "hamradio/">Hamradio</blend>
-<description><gettext domain="blends">The goal of Debian Hamradio is to support the needs of radio amateurs in Debian by providing logging, data mode and packet mode applications and more.</gettext></description>
-<links>
-<metapackages "hamradio/get/metapackages">
-<downloads "hamradio/get/live">
-</links>
-</tr>
-
 <tr>
 <blend "https://wiki.debian.org/DebianParl";>DebianParl</blend>
 <description><gettext domain="blends">The goal of DebianParl is to provide applications to support the needs of parliamentarians, politicians and their staffers all around the world.</gettext></description>
Reply to: