This is the mail archive of the cygwin-apps-cvs mailing list for the cygwin-apps project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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




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

commit 3a51d190397c1bd52edbc23daf793f4efcec4657
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Jan 9 19:14:08 2017 +0000

    Fix keep: implementation
    
    Actually permit the key in override.hint
    Warn if we specify a non-existent version to keep

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

commit ef6598cec3c9e98eaa0030a0d33c8ec3ef68d6f0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jan 8 20:01:15 2017 +0000

    Write valid HTML for package listing files

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

commit 5ab60535d1a6b52dc1f9c778e78697eb1c314b8f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jan 10 17:47:34 2017 +0000

    Drop 'installed binaries and support files' from package listing title
    
    It's often wrong (e.g. in case of debuginfo package) and packages often have
    a more useful subpackage indication (e.g. 'bindings', 'common data',
    'development', 'documentation', 'runtime', 'samples', 'tools', 'utilities'
    etc.), which we shouldn't be involved in guessing about.


Diff:
---
 calm/hint.py                                       |    3 ++-
 calm/package.py                                    |    5 ++++-
 calm/pkg2html.py                                   |   18 +++++++++++-------
 test/testdata/hints/x86/release/invalid/expected   |    2 +-
 .../testdata/htdocs.expected/x86/arc/arc-4.32.7-10 |   12 +++++++++---
 .../htdocs.expected/x86/arc/arc-4.32.7-10-src      |   10 ++++++++--
 .../x86/base-cygwin/base-cygwin-3.6-1              |   12 +++++++++---
 .../x86/base-cygwin/base-cygwin-3.8-1              |   12 +++++++++---
 .../htdocs.expected/x86/corrupt/corrupt-2.0.0-1    |   12 +++++++++---
 .../x86/corrupt/corrupt-2.0.0-1-src                |   10 ++++++++--
 .../x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1  |   12 +++++++++---
 .../x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1  |   12 +++++++++---
 .../cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3    |   12 +++++++++---
 .../x86/cygwin-devel/cygwin-devel-2.2.0-1          |   12 +++++++++---
 .../x86/cygwin-devel/cygwin-devel-2.2.1-1          |   12 +++++++++---
 .../x86/cygwin-devel/cygwin-devel-2.3.0-0.3        |   12 +++++++++---
 .../htdocs.expected/x86/cygwin/cygwin-2.2.0-1      |   12 +++++++++---
 .../htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src  |   10 ++++++++--
 .../htdocs.expected/x86/cygwin/cygwin-2.2.1-1      |   12 +++++++++---
 .../htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src  |   10 ++++++++--
 .../htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3    |   12 +++++++++---
 .../x86/cygwin/cygwin-2.3.0-0.3-src                |   10 ++++++++--
 .../htdocs.expected/x86/keychain/keychain-2.6.8-1  |   12 +++++++++---
 .../x86/keychain/keychain-2.6.8-1-src              |   10 ++++++++--
 .../htdocs.expected/x86/keychain/keychain-2.7.1-1  |   12 +++++++++---
 .../x86/keychain/keychain-2.7.1-1-src              |   10 ++++++++--
 .../x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1 |   12 +++++++++---
 .../x86/libdns_sd1/libdns_sd1-379.32.1-1           |   12 +++++++++---
 .../x86/mDNSResponder/mDNSResponder-379.32.1-1     |   12 +++++++++---
 .../x86/mDNSResponder/mDNSResponder-379.32.1-1-src |   10 ++++++++--
 .../htdocs.expected/x86/openssh/openssh-7.2p2-1    |   12 +++++++++---
 .../x86/openssh/openssh-7.2p2-1-src                |   10 ++++++++--
 .../per-version-replacement-hint-only-1.0-1        |   12 +++++++++---
 .../per-version-replacement-hint-only-1.0-1-src    |   10 ++++++++--
 .../x86/per-version/per-version-4.0-1              |   12 +++++++++---
 .../x86/per-version/per-version-4.0-1-src          |   10 ++++++++--
 .../x86/per-version/per-version-4.8-1              |   12 +++++++++---
 .../x86/per-version/per-version-4.8-1-src          |   10 ++++++++--
 .../x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1 |   12 +++++++++---
 .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src |   10 ++++++++--
 .../htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2      |   12 +++++++++---
 .../htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src  |   10 ++++++++--
 .../htdocs.expected/x86/rpm-doc/rpm-doc-999-1      |   12 +++++++++---
 .../x86/staleversion/staleversion-240-1            |   12 +++++++++---
 .../x86/staleversion/staleversion-240-1-src        |   10 ++++++++--
 .../x86/staleversion/staleversion-242-0            |   12 +++++++++---
 .../x86/staleversion/staleversion-242-0-src        |   10 ++++++++--
 .../x86/staleversion/staleversion-243-0            |   12 +++++++++---
 .../x86/staleversion/staleversion-243-0-src        |   10 ++++++++--
 .../x86/staleversion/staleversion-250-0            |   12 +++++++++---
 .../x86/staleversion/staleversion-250-0-src        |   10 ++++++++--
 .../x86/staleversion/staleversion-251-0            |   12 +++++++++---
 .../x86/staleversion/staleversion-251-0-src        |   10 ++++++++--
 .../x86/staleversion/staleversion-260-0            |   12 +++++++++---
 .../x86/staleversion/staleversion-260-0-src        |   10 ++++++++--
 .../x86/testpackage/testpackage-0.1-1              |   12 +++++++++---
 56 files changed, 466 insertions(+), 146 deletions(-)

diff --git a/calm/hint.py b/calm/hint.py
index 7eb41bd..5a36901 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -63,6 +63,7 @@ versionkeys = {
 }
 
 overridekeys = {
+    'keep': 'val',
     'keep-count': 'val',
     'keep-days': 'val',
 }
@@ -221,7 +222,7 @@ def hint_file_parse(fn, kind):
                     value = match.group(2)
 
                     if key not in hintkeys[kind]:
-                        errors.append('unknown setup key %s at line %d' % (key, i))
+                        errors.append('unknown key %s at line %d' % (key, i))
                         continue
                     type = hintkeys[kind][key]
 
diff --git a/calm/package.py b/calm/package.py
index cf3c22e..a40105d 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -924,7 +924,10 @@ def stale_packages(packages):
 
         # mark any versions explicitly listed in the keep: override hint
         for v in po.override_hints.get('keep', '').split():
-            mark_package_fresh(packages, pn, v)
+            if v in po.vermap:
+                mark_package_fresh(packages, pn, v)
+            else:
+                logging.error("package '%s' has non-existent keep: version '%s'" % (pn, v))
 
         # mark as fresh the highest n versions, where n is given by the
         # keep-count: override hint, (defaulting to DEFAULT_KEEP_COUNT)
diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index cbd653b..f6b260c 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -137,18 +137,21 @@ def update_package_listings(args, packages, arch):
                     with open(listing, 'w') as f:
                         bv = packages[p].best_version
                         header = p + ": " + packages[p].version_hints[bv]['sdesc'].replace('"', '')
+
                         if fver.endswith('-src'):
                             header = header + " (source code)"
-                        else:
-                            header = header + " (installed binaries and support files)"
-                        # XXX: also recognize '-devel', '-doc', '-debuginfo' ?
-                        # XXX: '(utilities)', '(runtime)'
-                        # XXX: and work out if it's runtime library?
+
+                        header = html.escape(header, quote=False)
 
                         print(textwrap.dedent('''\
+                                                 <!DOCTYPE html>
                                                  <html>
+                                                 <head>
+                                                 <title>%s</title>
+                                                 </head>
+                                                 <body>
                                                  <h1>%s</h1>
-                                                 <tt><pre>''' % (html.escape(header, quote=False))), file=f)
+                                                 <pre>''' % (header, header)), file=f)
 
                         tf = os.path.join(args.rel_area, packages[p].path, t)
                         if not os.path.exists(tf):
@@ -174,7 +177,8 @@ def update_package_listings(args, packages, arch):
                                 logging.debug('', exc_info=True)
 
                         print(textwrap.dedent('''\
-                                                 </pre></tt>
+                                                 </pre>
+                                                 </body>
                                                  </html>'''), file=f)
             else:
                 logging.log(5, 'not writing %s, already exists' % listing)
diff --git a/test/testdata/hints/x86/release/invalid/expected b/test/testdata/hints/x86/release/invalid/expected
index 95681a8..ebcffb4 100644
--- a/test/testdata/hints/x86/release/invalid/expected
+++ b/test/testdata/hints/x86/release/invalid/expected
@@ -1,4 +1,4 @@
-{'parse-errors': ['unknown setup key unknown-key at line 0',
+{'parse-errors': ['unknown key unknown-key at line 0',
                   "unknown setup construct 'invalid-construct' at line 1",
                   "required key 'category' missing",
                   "required key 'sdesc' missing"]}
diff --git a/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10 b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
index caaa863..d0f8d25 100644
--- a/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
+++ b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
@@ -1,5 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>arc: The ARC archive utility (installed binaries and support files)</h1>
-<tt><pre>
-</pre></tt>
+<head>
+<title>arc: The ARC archive utility</title>
+</head>
+<body>
+<h1>arc: The ARC archive utility</h1>
+<pre>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
index d5ad98a..f2e9727 100644
--- a/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
+++ b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
@@ -1,5 +1,11 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>arc: The ARC archive utility (source code)</title>
+</head>
+<body>
 <h1>arc: The ARC archive utility (source code)</h1>
-<tt><pre>
-</pre></tt>
+<pre>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1 b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
index a6c9d6c..68cfc5e 100644
--- a/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>base-cygwin: Initial base installation helper script (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>base-cygwin: Initial base installation helper script</title>
+</head>
+<body>
+<h1>base-cygwin: Initial base installation helper script</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1 b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
index a6c9d6c..68cfc5e 100644
--- a/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>base-cygwin: Initial base installation helper script (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>base-cygwin: Initial base installation helper script</title>
+</head>
+<body>
+<h1>base-cygwin: Initial base installation helper script</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1 b/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1
index a4e4ace..396aa97 100644
--- a/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1
+++ b/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1
@@ -1,6 +1,12 @@
+<!DOCTYPE html>
 <html>
-<h1>corrupt: A corrupt package (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>corrupt: A corrupt package</title>
+</head>
+<body>
+<h1>corrupt: A corrupt package</h1>
+<pre>
 package is corrupted
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1-src b/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1-src
index 1d53e47..ebbb2e4 100644
--- a/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1-src
+++ b/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1-src
@@ -1,8 +1,14 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>corrupt: A corrupt package (source code)</title>
+</head>
+<body>
 <h1>corrupt: A corrupt package (source code)</h1>
-<tt><pre>
+<pre>
     2016-06-11 10:34           0 perl-Business-ISBN-2.011-1.src/
     2016-06-11 10:34      364175 perl-Business-ISBN-2.011-1.src/Business-ISBN-2.011.tar.gz
 package is corrupted
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1 b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
index df6375b..419b839 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin-debuginfo: Debug info for cygwin (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin-debuginfo: Debug info for cygwin</title>
+</head>
+<body>
+<h1>cygwin-debuginfo: Debug info for cygwin</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1 b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
index df6375b..419b839 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin-debuginfo: Debug info for cygwin (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin-debuginfo: Debug info for cygwin</title>
+</head>
+<body>
+<h1>cygwin-debuginfo: Debug info for cygwin</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3 b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
index df6375b..419b839 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin-debuginfo: Debug info for cygwin (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin-debuginfo: Debug info for cygwin</title>
+</head>
+<body>
+<h1>cygwin-debuginfo: Debug info for cygwin</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1 b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
index fe87025..77de194 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin-devel: Core development files (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin-devel: Core development files</title>
+</head>
+<body>
+<h1>cygwin-devel: Core development files</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1 b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
index fe87025..77de194 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin-devel: Core development files (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin-devel: Core development files</title>
+</head>
+<body>
+<h1>cygwin-devel: Core development files</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3 b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
index fe87025..77de194 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin-devel: Core development files (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin-devel: Core development files</title>
+</head>
+<body>
+<h1>cygwin-devel: Core development files</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1 b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
index 11bb5f6..1cd75d5 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin: The UNIX emulation engine (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin: The UNIX emulation engine</title>
+</head>
+<body>
+<h1>cygwin: The UNIX emulation engine</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
index ab98562..0f33e5c 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>cygwin: The UNIX emulation engine (source code)</title>
+</head>
+<body>
 <h1>cygwin: The UNIX emulation engine (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1 b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
index 11bb5f6..1cd75d5 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin: The UNIX emulation engine (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin: The UNIX emulation engine</title>
+</head>
+<body>
+<h1>cygwin: The UNIX emulation engine</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
index ab98562..0f33e5c 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>cygwin: The UNIX emulation engine (source code)</title>
+</head>
+<body>
 <h1>cygwin: The UNIX emulation engine (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3 b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
index 11bb5f6..1cd75d5 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>cygwin: The UNIX emulation engine (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>cygwin: The UNIX emulation engine</title>
+</head>
+<body>
+<h1>cygwin: The UNIX emulation engine</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
index ab98562..0f33e5c 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>cygwin: The UNIX emulation engine (source code)</title>
+</head>
+<body>
 <h1>cygwin: The UNIX emulation engine (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1 b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
index 543226a..77c8827 100644
--- a/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
@@ -1,6 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>keychain: Key manager for OpenSSH (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>keychain: Key manager for OpenSSH</title>
+</head>
+<body>
+<h1>keychain: Key manager for OpenSSH</h1>
+<pre>
     2006-11-09 04:58           0 usr/
     2006-11-09 04:58           0 usr/bin/
     2006-11-09 04:58       53740 usr/bin/keychain
@@ -15,5 +20,6 @@
     2006-11-09 04:58           0 usr/share/man/
     2006-11-09 04:58           0 usr/share/man/man1/
     2006-11-09 04:58       13240 usr/share/man/man1/keychain.1
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
index 0b4f281..00b76f8 100644
--- a/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
@@ -1,8 +1,14 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>keychain: Key manager for OpenSSH (source code)</title>
+</head>
+<body>
 <h1>keychain: Key manager for OpenSSH (source code)</h1>
-<tt><pre>
+<pre>
     2006-11-09 04:59        3051 keychain-2.6.8-1.patch
     2006-11-09 04:59        5621 keychain-2.6.8-1.sh
     2006-11-09 04:59       31531 keychain-2.6.8.tar.bz2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1 b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
index c6bfe4f..29bcdf2 100644
--- a/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
@@ -1,6 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>keychain: Key manager for OpenSSH (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>keychain: Key manager for OpenSSH</title>
+</head>
+<body>
+<h1>keychain: Key manager for OpenSSH</h1>
+<pre>
     2012-10-10 05:40           0 usr/
     2012-10-10 05:40           0 usr/bin/
     2012-10-10 05:40       50490 usr/bin/keychain
@@ -15,5 +20,6 @@
     2012-10-10 05:40           0 usr/share/man/
     2012-10-10 05:40           0 usr/share/man/man1/
     2012-10-10 05:40        5326 usr/share/man/man1/keychain.1.gz
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
index ce348ee..808380d 100644
--- a/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
@@ -1,10 +1,16 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>keychain: Key manager for OpenSSH (source code)</title>
+</head>
+<body>
 <h1>keychain: Key manager for OpenSSH (source code)</h1>
-<tt><pre>
+<pre>
     2012-10-10 05:40       24455 keychain-2.7.1-1-cygwin.patch
     2012-10-10 05:40         270 keychain-2.7.1-1-cygwin.patch.sig
     2012-10-10 05:40      320093 keychain-2.7.1-1.sh
     2012-10-10 05:40         260 keychain-2.7.1-1.sh.sig
     2012-10-10 05:40       65211 keychain_2.7.1.orig.tar.gz
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1 b/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
index 487ca66..c3d4606 100644
--- a/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
+++ b/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>libdns_sd-devel: Bonjour Zeroconf implementation (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>libdns_sd-devel: Bonjour Zeroconf implementation</title>
+</head>
+<body>
+<h1>libdns_sd-devel: Bonjour Zeroconf implementation</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1 b/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
index ef59595..9a35eec 100644
--- a/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
+++ b/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>libdns_sd1: Bonjour Zeroconf implementation (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>libdns_sd1: Bonjour Zeroconf implementation</title>
+</head>
+<body>
+<h1>libdns_sd1: Bonjour Zeroconf implementation</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1 b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
index 67c4449..8302d56 100644
--- a/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>mDNSResponder: Bonjour Zeroconf implementation (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>mDNSResponder: Bonjour Zeroconf implementation</title>
+</head>
+<body>
+<h1>mDNSResponder: Bonjour Zeroconf implementation</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
index 9a7db69..a0781ca 100644
--- a/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>mDNSResponder: Bonjour Zeroconf implementation (source code)</title>
+</head>
+<body>
 <h1>mDNSResponder: Bonjour Zeroconf implementation (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1 b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
index cb2b272..cdf9790 100644
--- a/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
+++ b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>openssh: The OpenSSH server and client programs (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>openssh: The OpenSSH server and client programs</title>
+</head>
+<body>
+<h1>openssh: The OpenSSH server and client programs</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
index e85cbee..e88e82c 100644
--- a/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
+++ b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>openssh: The OpenSSH server and client programs (source code)</title>
+</head>
+<body>
 <h1>openssh: The OpenSSH server and client programs (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1 b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
index 86c5135..11a687b 100644
--- a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
+++ b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>per-version-replacement-hint-only: Per-version hint test package (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>per-version-replacement-hint-only: Per-version hint test package</title>
+</head>
+<body>
+<h1>per-version-replacement-hint-only: Per-version hint test package</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
index 969236e..588d9af 100644
--- a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
+++ b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>per-version-replacement-hint-only: Per-version hint test package (source code)</title>
+</head>
+<body>
 <h1>per-version-replacement-hint-only: Per-version hint test package (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1 b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1
index 08c3fcf..d7dd06d 100644
--- a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1
+++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>per-version: Per-version hint test package (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>per-version: Per-version hint test package</title>
+</head>
+<body>
+<h1>per-version: Per-version hint test package</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src
index 9c9bf12..e123057 100644
--- a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src
+++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>per-version: Per-version hint test package (source code)</title>
+</head>
+<body>
 <h1>per-version: Per-version hint test package (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1 b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1
index 08c3fcf..d7dd06d 100644
--- a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1
+++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>per-version: Per-version hint test package (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>per-version: Per-version hint test package</title>
+</head>
+<body>
+<h1>per-version: Per-version hint test package</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src
index 9c9bf12..e123057 100644
--- a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src
+++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>per-version: Per-version hint test package (source code)</title>
+</head>
+<body>
 <h1>per-version: Per-version hint test package (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1 b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
index 0f6212c..9f3632d 100644
--- a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
+++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
@@ -1,6 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>perl-Net-SMTP-SSL: Perl distribution Net-SMTP-SSL (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>perl-Net-SMTP-SSL: Perl distribution Net-SMTP-SSL</title>
+</head>
+<body>
+<h1>perl-Net-SMTP-SSL: Perl distribution Net-SMTP-SSL</h1>
+<pre>
     2015-06-26 19:10           0 usr/
     2015-06-26 19:10           0 usr/lib/
     2015-06-26 19:10           0 usr/lib/perl5/
@@ -17,5 +22,6 @@
     2015-06-26 19:10           0 usr/share/man/
     2015-06-26 19:10           0 usr/share/man/man3/
     2015-06-26 19:10        1619 usr/share/man/man3/Net.SMTP.SSL.3pm.gz
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
index 76e9a50..7968fa7 100644
--- a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
+++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
@@ -1,8 +1,14 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>perl-Net-SMTP-SSL: Perl distribution Net-SMTP-SSL (source code)</title>
+</head>
+<body>
 <h1>perl-Net-SMTP-SSL: Perl distribution Net-SMTP-SSL (source code)</h1>
-<tt><pre>
+<pre>
     2015-06-26 19:10           0 perl-Net-SMTP-SSL-1.03-1.src/
     2015-06-26 19:10        2271 perl-Net-SMTP-SSL-1.03-1.src/Net-SMTP-SSL-1.03.tar.gz
     2015-06-26 19:10         296 perl-Net-SMTP-SSL-1.03-1.src/perl-Net-SMTP-SSL.cygport
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2 b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
index 8ffbe70..9cd2ff7 100644
--- a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
@@ -1,6 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>rpm-doc: Obsolete package for RPM package management system manual pages (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>rpm-doc: Obsolete package for RPM package management system manual pages</title>
+</head>
+<body>
+<h1>rpm-doc: Obsolete package for RPM package management system manual pages</h1>
+<pre>
     2003-05-02 11:46       25562 usr/man/fr/man8/rpm.8
     2003-05-02 11:46       39721 usr/man/ja/man8/rpm.8
     2003-05-02 11:46         962 usr/man/ja/man8/rpm2cpio.8
@@ -14,5 +19,6 @@
     2003-05-02 11:46       22681 usr/man/ru/man8/rpm.8
     2003-05-02 11:46         603 usr/man/ru/man8/rpm2cpio.8
     2003-05-02 11:46       23159 usr/man/sk/man8/rpm.8
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
index 3566e39..032a602 100644
--- a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
@@ -1,5 +1,11 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>rpm-doc: Obsolete package for RPM package management system manual pages (source code)</title>
+</head>
+<body>
 <h1>rpm-doc: Obsolete package for RPM package management system manual pages (source code)</h1>
-<tt><pre>
-</pre></tt>
+<pre>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1 b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
index b5b04ec..737ef80 100644
--- a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
@@ -1,5 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>rpm-doc: Obsolete package for RPM package management system manual pages (installed binaries and support files)</h1>
-<tt><pre>
-</pre></tt>
+<head>
+<title>rpm-doc: Obsolete package for RPM package management system manual pages</title>
+</head>
+<body>
+<h1>rpm-doc: Obsolete package for RPM package management system manual pages</h1>
+<pre>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1 b/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1
index 75c36c3..b788d09 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>staleversion: Test package for stale version removal (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>staleversion: Test package for stale version removal</title>
+</head>
+<body>
+<h1>staleversion: Test package for stale version removal</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1-src b/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1-src
index da129ec..1281b1c 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1-src
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>staleversion: Test package for stale version removal (source code)</title>
+</head>
+<body>
 <h1>staleversion: Test package for stale version removal (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0 b/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0
index 75c36c3..b788d09 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>staleversion: Test package for stale version removal (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>staleversion: Test package for stale version removal</title>
+</head>
+<body>
+<h1>staleversion: Test package for stale version removal</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0-src b/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0-src
index da129ec..1281b1c 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0-src
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>staleversion: Test package for stale version removal (source code)</title>
+</head>
+<body>
 <h1>staleversion: Test package for stale version removal (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0 b/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0
index 75c36c3..b788d09 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>staleversion: Test package for stale version removal (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>staleversion: Test package for stale version removal</title>
+</head>
+<body>
+<h1>staleversion: Test package for stale version removal</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0-src b/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0-src
index da129ec..1281b1c 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0-src
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>staleversion: Test package for stale version removal (source code)</title>
+</head>
+<body>
 <h1>staleversion: Test package for stale version removal (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0 b/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0
index 75c36c3..b788d09 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>staleversion: Test package for stale version removal (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>staleversion: Test package for stale version removal</title>
+</head>
+<body>
+<h1>staleversion: Test package for stale version removal</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0-src b/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0-src
index da129ec..1281b1c 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0-src
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>staleversion: Test package for stale version removal (source code)</title>
+</head>
+<body>
 <h1>staleversion: Test package for stale version removal (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0 b/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0
index 75c36c3..b788d09 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>staleversion: Test package for stale version removal (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>staleversion: Test package for stale version removal</title>
+</head>
+<body>
+<h1>staleversion: Test package for stale version removal</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0-src b/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0-src
index da129ec..1281b1c 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0-src
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>staleversion: Test package for stale version removal (source code)</title>
+</head>
+<body>
 <h1>staleversion: Test package for stale version removal (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0 b/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0
index 75c36c3..b788d09 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
-<h1>staleversion: Test package for stale version removal (installed binaries and support files)</h1>
-<tt><pre>
+<head>
+<title>staleversion: Test package for stale version removal</title>
+</head>
+<body>
+<h1>staleversion: Test package for stale version removal</h1>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0-src b/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0-src
index da129ec..1281b1c 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0-src
+++ b/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0-src
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html>
+<head>
+<title>staleversion: Test package for stale version removal (source code)</title>
+</head>
+<body>
 <h1>staleversion: Test package for stale version removal (source code)</h1>
-<tt><pre>
+<pre>
     2015-10-11 14:45          26 test/test.1
     2015-10-11 14:45          31 test/test.2
-</pre></tt>
+</pre>
+</body>
 </html>
diff --git a/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1 b/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
index d8ae218..eb5c029 100644
--- a/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
+++ b/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
@@ -1,5 +1,11 @@
+<!DOCTYPE html>
 <html>
-<h1>testpackage: A test package (stuff &amp; other stuff) (installed binaries and support files)</h1>
-<tt><pre>
-</pre></tt>
+<head>
+<title>testpackage: A test package (stuff &amp; other stuff)</title>
+</head>
+<body>
+<h1>testpackage: A test package (stuff &amp; other stuff)</h1>
+<pre>
+</pre>
+</body>
 </html>


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]