The following commit has been merged in the master branch:
commit c0f39efbbdc16224bc614e670375ae6c267d7df4
Author: Iain R. Learmonth <[email protected]>
Date:   Wed May 13 13:46:44 2015 +0100

    hamradio: Make new website live

diff --git a/www/hamradio/index.html b/www/hamradio/index.html
index 84db640..cd3f587 100644
--- a/www/hamradio/index.html
+++ b/www/hamradio/index.html
@@ -1,106 +1,71 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<html>
 <head>
-<title>Debian Hamradio Pure Blend</title>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" 
/>
-<link href="../inc/style.css" type="text/css" rel="stylesheet" />
+       <title>Debian Hamradio Pure Blend</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta name="robots" content="noindex" />
+<link href="css/debian.css" rel="stylesheet" type="text/css">
+<link href="css/hamradio.css" rel="stylesheet" type="text/css">
+<link rel="shortcut icon" href="img/favicon.ico">
 </head>
 <body>
-<div style="text-align: center;">
-<a href="http://pkg-hamradio.alioth.debian.org/";><span>
-                  <span><img 
src="http://pkg-hamradio.alioth.debian.org/logo.png"; alt="Debian Hamradio 
Project" height="93" /></span>
-                 </span>
-</a>
+<div id="header">
+  <div id="wikisection">
+    <p class="section"><a href="/hamradio/" title="Debian Hamradio Pure 
Blend">Hamradio Pure Blend</a></p>
+  </div>
+  <div id="upperheader">
+    <div id="logo">
+        <a href="http://www.debian.org"; title="Debian Home"><img 
src="img/openlogo-50.png" alt="Debian" width="50" height="61"></a>
+    </div>
+  </div> <!-- end upperheader -->
+  <div id="navbar">
+    <p class="hidecss"><a href="#content">Skip Quicknav</a></p>
+    <ul>
+       <li><a href="/hamradio">Home</a></li>
+       <li><a href="/hamradio/tasks.html">Packages</a></li>
+       <li><a href="/hamradio/live.html">Live DVDs</a></li>
+       <li><a href="/hamradio/dev.html">Development</a></li>
+    </ul>
+  </div> <!-- end navbar -->
+  <p id="breadcrumbs">&nbsp;hamradio pure blend</p>
 </div>
-<table class="columns">
-<tr>
-       <td class="left">
 
-<span class="section">Summary</span>
-               <div class="section">
-                       <div class="sectionTop"></div>
-                       <div class="row">
-<p>A <a href="http://blends.alioth.debian.org/blends/";>Debian Pure Blend</a> 
is a Debian internal project which assembles
-    a set of packages that might help users to solve certain tasks of their 
work.</p>
-               </div></div>
+<div id="content">
+       <span class="download"><a href="#">Download Debian Hamradio<br>Pure 
Blend Jessie Preview<em>(64-bit Live DVD)</em></a> </span>
+       <div id="splash">
+               <h1>Debian Hamradio Pure Blend</h1>
+       </div>
 
-               <span class="section">Tasks</span>
-               <div class="section">
-                 <div class="sectionTop"></div>
-                 <div class="row">
-<div><span class="link"><a href="tasks/antenna">Antennas</a></span></div>
-<div><span class="link"><a href="tasks/datamodes">Data Modes</a></span></div>
-<div><span class="link"><a href="tasks/digitalvoice">Digital 
Voice</a></span></div>
-<div><span class="link"><a href="tasks/logging">Logging</a></span></div>
-<div><span class="link"><a href="tasks/morse">Morse</a></span></div>
-<div><span class="link"><a href="tasks/nonamateur">Non-amateur 
Modes</a></span></div>
-<div><span class="link"><a href="tasks/packetmodes">Packet 
Modes</a></span></div>
-<div><span class="link"><a href="tasks/rigcontrol">Rig Control</a></span></div>
-<div><span class="link"><a href="tasks/satellite">Satellite 
Operation</a></span></div>
-<div><span class="link"><a href="tasks/sdr">Software Defined 
Radio</a></span></div>
-<div><span class="link"><a href="tasks/tools">Tools</a></span></div>
-<div><span class="link"><a href="tasks/training">Training</a></span></div>
-<hr>
-<div><span class="link"><a href="tasks/packagelist">All on one 
page</a></span></div>
-                  </div>
-               </div>
+       <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> who collaborate on maintenance of amateur-radio related packages
+      for Debian. Every <a href="http://blends.debian.org/";>Pure Blend</a> is a
+      subset of Debian that is configured to support a particular target group
+      out-of-the-box. This blend aims to support the needs of radio 
amateurs.</p>
 
-               <span class="section">Development Tools</span>
-               <div class="section">
-                       <div class="sectionTop"></div>
-<div class="row">
-<div><span class="link"><a href="bugs_udd/">Bugs Listing</a></span></div>
-<div><span class="link"><a href="thermometer/">Thermometer</a></span></div>
-<div><span class="link"><a 
href="http://qa.debian.org/developer.php?login=debian-hams%40lists.debian.org&comaint=yes";>QA
 Overview</a></span></div>
-<div><span class="link"><a 
href="https://udd.debian.org/dmd/[email protected]#todo";>Maintainer
 Dashboard</a></span></div>
-<div><span class="link"><a 
href="http://pet.debian.net/pkg-hamradio/pet.cgi";>Package Entropy 
Tracker</a></span></div>
-                        </div>
-               </div>
+       <ul class="homepagenav">
+               <li><a href="/hamradio/tasks.html">Packages</a></li>
+               <li><a href="/hamradio/live.html">Live DVDs</a></li>
+               <li><a href="/hamradio/development.html">Development</a></li>
+       </ul>
 
-
-       </td>
-       <td class="main">
-               <div class="pageBody">
-                       <h1>Debian Hamradio Pure Blend</h1>
-                       <p>The Debian Hamradio Pure Blend is a project of the 
<a href="http://pkg-hamradio.alioth.debian.org/";>Debian Hamradio Maintainers 
Team</a> who collaborate on maintenance of amateur-radio related packages for 
Debian. Every Pure Blend is a subset of Debian that is configured to support a 
particular target group out-of-the-box, which in our case is radio amateurs.</p>
-<h2>Tasks</h2>
-<p>Packages in the Debian Hamradio Pure Blend are split into tasks, like "Rig 
Control" and "Packet Modes", and you can see the full list of these on the menu 
to the left. Each task contains software that is useful for a particular 
activity. Some software may be in two tasks where it is useful for both.</p>
-<h2>Live System</h2>
-<p>An experimental live system based on Debian testing and using the MATE 
Desktop Environment is available for download. This can either be burnt to a 
DVD, used directly in VirtualBox or written to a USB stick.</p>
-<br>
-<ul>
-<li><a href="torrents/hamradio-live-20141221-amd64.torrent">Debian Hamradio 
Pure Blend Live ISO (64-bit)</a> (<a 
href="http://irl.sdf.org/hamradio-images/hamradio-live-20141221-amd64/hamradio-live-20141221-amd64.iso";>Direct
 Download</a>, <a 
href="http://irl.sdf.org/hamradio-images/hamradio-live-20141221-amd64/hamradio-live-20141221-amd64.iso.sig";>GPG
 Signature</a>, <a 
href="http://irl.sdf.org/hamradio-images/hamradio-live-20141221-amd64/hamradio-live-20141221-amd64.nfo";>Readme</a>)</li>
-<li><a href="torrents/hamradio-live-20141221-i386.torrent">Debian Hamradio 
Pure Blend Live ISO (32-bit)</a> (<a 
href="http://irl.sdf.org/hamradio-images/hamradio-live-20141221-i386/hamradio-live-20141221-i386.iso";>Direct
 Download</a>, <a 
href="http://irl.sdf.org/hamradio-images/hamradio-live-20141221-i386/hamradio-live-20141221-i386.iso.sig";>GPG
 Signature</a>, <a 
href="http://irl.sdf.org/hamradio-images/hamradio-live-20141221-i386/hamradio-live-20141221-i386.nfo";>Readme</a>)</li>
-<li><a href="http://anonscm.debian.org/cgit/blends/blends-images.git/";>Debian 
Pure Blend Live Images Source Code</a></li>
-</ul>
-<br>
-<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 style="background-color: #ccc; padding: 3px; margin-top: 5px; 
margin-bottom: 5px;">
-sudo dd if=/path/to/debian-shack-live-latest.iso of=/dev/sdX
-</pre>
-<p><i>Note: You will need to change the filename if you've downloaded the 
32-bit version to match. The output of the <tt>dmesg</tt> command should let 
you know the device name of the USB stick where you will need to change the X 
to the letter given.</i></p>
-<h2>Source Code</h2>
-<p>Currently this Pure Blend is still in development and no release has been 
made yet, but it is possible to fetch and build the current source from git:</p>
-<pre style="background-color: #ccc; padding: 3px; margin-top: 5px; 
margin-bottom: 5px;">
-git clone https://anonscm.debian.org/git/blends/projects/hamradio.git
-cd hamradio ; make dist
-git-buildpackage
-</pre>
-<p><i>Note that you will need <a 
href="https://packages.qa.debian.org/g/git-buildpackage.html";>git-buildpackage</a>
 and <a href="https://packages.qa.debian.org/b/blends.html";>blends-dev</a> 
installed to build the source.</i></p>
-<h2>Contact</h2>
-<p>The primary point of contact for the Debian Hamradio Pure Blend is the 
Debian Hamradio Maintainers Team. You can contact the team by:</p>
-<br>
-<ul>
-<li>E-Mail: <a 
href="mailto:[email protected]";>[email protected]</a> (<a 
href="https://lists.debian.org/debian-hams/";>archives</a>)</li>
-<li>IRC: <a href="irc://irc.debian.org/#debian-hams">#debian-hams</a> on 
irc.debian.org</a></li>
-</ul>
-               </div>
-       </td>
-</tr>
-</table>
+       <h2>News</h2>
+       <tt>[13 May 2015]</tt> <strong><a 
href="https://lists.debian.org/debian-hams/2015/05/msg00140.html";>ITP: 
debian-hamradio -- Debian Hamradio Pure Blend Metapackages</a></strong><br>
+       <tt>[02 Dec 2014]</tt> <strong><a 
href="https://lists.debian.org/debian-devel/2014/12/msg00063.html";>Announcing a 
Debian Hamradio Blend</a></strong><br>
+       <br>
+</div>
 
 <div id="footer">
-  <address>Last update: Fri, 21 Nov 2014 15:36:00 -0000</address>
+<div id="fineprint">
+    <p>
+    The source code powering these pages is available <a 
href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
+    <br />
+    Contact: <a href="mailto:[email protected]";>Debian Hamradio 
Maintainers</a> or <a href="irc://irc.debian.org/#debian-hams">#debian-hams</a> 
on irc.debian.org.
+    <br />
+    Debian is a registered trademark of <a 
href="http://www.spi-inc.org/";>Software in the Public Interest</a>.
+    </p>
+</div>
 </div>
+
 </body>
 </html>
+
diff --git a/www/hamradio/index.new.html b/www/hamradio/index.new.html
deleted file mode 100644
index cd3f587..0000000
--- a/www/hamradio/index.new.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-<head>
-       <title>Debian Hamradio Pure Blend</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta name="robots" content="noindex" />
-<link href="css/debian.css" rel="stylesheet" type="text/css">
-<link href="css/hamradio.css" rel="stylesheet" type="text/css">
-<link rel="shortcut icon" href="img/favicon.ico">
-</head>
-<body>
-<div id="header">
-  <div id="wikisection">
-    <p class="section"><a href="/hamradio/" title="Debian Hamradio Pure 
Blend">Hamradio Pure Blend</a></p>
-  </div>
-  <div id="upperheader">
-    <div id="logo">
-        <a href="http://www.debian.org"; title="Debian Home"><img 
src="img/openlogo-50.png" alt="Debian" width="50" height="61"></a>
-    </div>
-  </div> <!-- end upperheader -->
-  <div id="navbar">
-    <p class="hidecss"><a href="#content">Skip Quicknav</a></p>
-    <ul>
-       <li><a href="/hamradio">Home</a></li>
-       <li><a href="/hamradio/tasks.html">Packages</a></li>
-       <li><a href="/hamradio/live.html">Live DVDs</a></li>
-       <li><a href="/hamradio/dev.html">Development</a></li>
-    </ul>
-  </div> <!-- end navbar -->
-  <p id="breadcrumbs">&nbsp;hamradio pure blend</p>
-</div>
-
-<div id="content">
-       <span class="download"><a href="#">Download Debian Hamradio<br>Pure 
Blend Jessie Preview<em>(64-bit Live DVD)</em></a> </span>
-       <div id="splash">
-               <h1>Debian Hamradio Pure Blend</h1>
-       </div>
-
-       <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> who collaborate on maintenance of amateur-radio related packages
-      for Debian. Every <a href="http://blends.debian.org/";>Pure Blend</a> is a
-      subset of Debian that is configured to support a particular target group
-      out-of-the-box. This blend aims to support the needs of radio 
amateurs.</p>
-
-       <ul class="homepagenav">
-               <li><a href="/hamradio/tasks.html">Packages</a></li>
-               <li><a href="/hamradio/live.html">Live DVDs</a></li>
-               <li><a href="/hamradio/development.html">Development</a></li>
-       </ul>
-
-       <h2>News</h2>
-       <tt>[13 May 2015]</tt> <strong><a 
href="https://lists.debian.org/debian-hams/2015/05/msg00140.html";>ITP: 
debian-hamradio -- Debian Hamradio Pure Blend Metapackages</a></strong><br>
-       <tt>[02 Dec 2014]</tt> <strong><a 
href="https://lists.debian.org/debian-devel/2014/12/msg00063.html";>Announcing a 
Debian Hamradio Blend</a></strong><br>
-       <br>
-</div>
-
-<div id="footer">
-<div id="fineprint">
-    <p>
-    The source code powering these pages is available <a 
href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
-    <br />
-    Contact: <a href="mailto:[email protected]";>Debian Hamradio 
Maintainers</a> or <a href="irc://irc.debian.org/#debian-hams">#debian-hams</a> 
on irc.debian.org.
-    <br />
-    Debian is a registered trademark of <a 
href="http://www.spi-inc.org/";>Software in the Public Interest</a>.
-    </p>
-</div>
-</div>
-
-</body>
-</html>
-
diff --git a/www/hamradio/index.html b/www/hamradio/index.old.html
similarity index 100%
copy from www/hamradio/index.html
copy to www/hamradio/index.old.html

-- 
Static and dynamic websites for Debian Pure Blends

_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

Reply via email to