This is an automated email from the git hooks/post-receive script. nthykier pushed a commit to branch master in repository lintian.
commit 4ace39ab9599724c5f79f76c1901ee2705558a11 Author: Niels Thykier <[email protected]> Date: Sun Apr 24 16:08:50 2016 +0000 r/html_reports: Remove COPY_DOCS config Signed-off-by: Niels Thykier <[email protected]> --- debian/changelog | 4 ++++ reporting/config | 7 ------- reporting/html_reports | 11 +++-------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3b34e9..b64abd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ lintian (2.5.45) UNRELEASED; urgency=medium + [JW] Put Lintian version in all manpage footers. + [JW] Simplify manpage generation. + * reporting/{config,html_reports}: + + [NT] Remove "$COPY_DOCS" configuration option. The + html_reports now always copies the documentation. + -- Niels Thykier <[email protected]> Sun, 24 Apr 2016 07:16:45 +0000 lintian (2.5.44) unstable; urgency=medium diff --git a/reporting/config b/reporting/config index d67a208..c81b502 100644 --- a/reporting/config +++ b/reporting/config @@ -22,13 +22,6 @@ $LINTIAN_DIST = "sid,experimental"; $LINTIAN_AREA = "main,contrib,non-free"; $LINTIAN_ARCH = "i386,amd64"; -# If true, copy the docs (e.g. the manual) into $HTML_DIR -# instead of just symlinking to them. If you build the -# reports on one server and then push to another server -# for serving the website, you will generally need to -# copy the documents. -$COPY_DOCS = 1; - # Path to a source checkout of lintian $LINTIAN_ROOT = "$HOME/lintian"; diff --git a/reporting/html_reports b/reporting/html_reports index 8bbccc6..1bf5f16 100755 --- a/reporting/html_reports +++ b/reporting/html_reports @@ -42,7 +42,7 @@ our ( $LINTIAN_ARCH, $HTML_TMP_DIR,$LINTIAN_AREA, $HISTORY,$HISTORY_DIR,$LINTIAN_SOURCE, $GRAPHS_RANGE_DAYS,$GRAPHS,$LINTIAN_MIRROR_NAME, - $HARNESS_STATE_DIR,$COPY_DOCS, + $HARNESS_STATE_DIR, ); # Read the configuration. @@ -120,13 +120,8 @@ mkdir("$HTML_TMP_DIR/full", 0777); mkdir("$HTML_TMP_DIR/maintainer", 0777); mkdir("$HTML_TMP_DIR/tags", 0777); symlink('.', "$HTML_TMP_DIR/reports"); -if ($COPY_DOCS) { - copy_dir("$LINTIAN_ROOT/doc/lintian.html", "$HTML_TMP_DIR/manual"); - copy_dir("$LINTIAN_ROOT/doc/api.html", "$HTML_TMP_DIR/library-api"); -} else { - symlink("$LINTIAN_ROOT/doc/lintian.html", "$HTML_TMP_DIR/manual"); - symlink("$LINTIAN_ROOT/doc/api.html", "$HTML_TMP_DIR/library-api"); -} +copy_dir("$LINTIAN_ROOT/doc/lintian.html", "$HTML_TMP_DIR/manual"); +copy_dir("$LINTIAN_ROOT/doc/api.html", "$HTML_TMP_DIR/library-api"); if ($ARGV[0]) { my %opts = ( -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
