[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20180131-9-g58511d1

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

commit 58511d13883d29a4f1b54cf7ff12f2aa35589837
Author: Jon Turney <[email protected]>
Date:   Wed Feb 28 16:33:20 2018 +0000

    Update packages.inc for stylesheet changes


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

diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index 754ba5d..6320c83 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -213,11 +213,7 @@ def update_package_listings(args, packages, arch):
             os.fchmod(index.fileno(), 0o755)
             print(textwrap.dedent('''\
                                      <div id="%s">
-                                     <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>
+                                     <h2 class="cartouche">Available Packages for %s</h2>
                                      <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 2d85324..81bd0ec 100755
--- a/test/testdata/htdocs.expected/x86/packages.inc
+++ b/test/testdata/htdocs.expected/x86/packages.inc
@@ -1,9 +1,5 @@
 <div id="x86">
-<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>
+<h2 class="cartouche">Available Packages for x86</h2>
 <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>