[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-27-g374804a

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-27-g374804a

[jturney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=374804a7084f5ca1cab3f24f79d195055bff2243

commit 374804a7084f5ca1cab3f24f79d195055bff2243
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Oct 22 15:33:50 2016 +0100

    Update for CSS change of 'background' from id to class
    
    Also remove a <br/> used to compensate for negative h2 margin
    Also update relevant tests


Diff:
---
 calm/pkg2html.py                               |    3 +--
 test/testdata/htdocs.expected/x86/packages.inc |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index f2e2cc6..57cc0ab 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -193,12 +193,11 @@ def update_package_listings(args, packages, arch):
             os.fchmod(index.fileno(), 0o755)
             print(textwrap.dedent('''\
                                      <div id="%s">
-                                     <div id="background">
+                                     <div class="background">
                                      <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b>
                                      <h2>Available Packages for %s</h2>
                                      <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b>
                                      </div>
-                                     <br>
                                      <table class="pkglist">''') % (arch, arch), file=index)
 
             for p in sorted(packages.keys(), key=package.sort_key):
diff --git a/test/testdata/htdocs.expected/x86/packages.inc b/test/testdata/htdocs.expected/x86/packages.inc
index 6fecc3d..54fc736 100755
--- a/test/testdata/htdocs.expected/x86/packages.inc
+++ b/test/testdata/htdocs.expected/x86/packages.inc
@@ -1,10 +1,9 @@
 <div id="x86">
-<div id="background">
+<div class="background">
 <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b>
 <h2>Available Packages for x86</h2>
 <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b>
 </div>
-<br>
 <table class="pkglist">
 <tr><td><a href="x86/arc">arc</a></td><td>The ARC archive utility</td></tr>
 <tr><td><a href="x86/base-cygwin">base-cygwin</a></td><td>Initial base installation helper script</td></tr>