Package: tj3 Version: 3.6.0-2 Followup-For: Bug #836052 Dear Vincent,
Hopefully the attached is what you meant? Thanks for your help. Christopher
>From 368be815aac6d09839cf347a526a09b0beec5de9 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin <christopher.hos...@gmail.com> Date: Wed, 31 Aug 2016 13:48:58 +0100 Subject: [PATCH] Add manual-path.patch to use Debian path for manual --- debian/changelog | 8 ++++++++ debian/patches/manual-path.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 30 insertions(+) create mode 100644 debian/patches/manual-path.patch diff --git a/debian/changelog b/debian/changelog index 14ba371..797fe57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tj3 (3.6.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix "tj3man unable to open manual index page" Added manual-path.patch to ++ change path used to locate manual index page. (Closes: #836052) + + -- Christopher Hoskin <christopher.hos...@gmail.com> Wed, 31 Aug 2016 18:33:39 +0100 + tj3 (3.6.0-2) unstable; urgency=medium * d/copyright: change GFDL short name to GFDL-NIV. Thanks to Christopher diff --git a/debian/patches/manual-path.patch b/debian/patches/manual-path.patch new file mode 100644 index 0000000..68a5624 --- /dev/null +++ b/debian/patches/manual-path.patch @@ -0,0 +1,21 @@ +Description: Use Debian path for manual + Changes the path used by tj3man to find the user manual index.html file from + one relative to the binary to the absolute path /usr/share/doc/tj3/html/ used + by Debian +Bug-Debian: 836052 +Forwarded: not-needed +Author: Christopher Hoskin <christopher.hos...@gmail.com> +Last-Update: 2016-08-31 + +--- a/lib/taskjuggler/apps/Tj3Man.rb ++++ b/lib/taskjuggler/apps/Tj3Man.rb +@@ -106,8 +106,7 @@ + # specified keyword. + def startBrowser(keyword = nil) + # Find the manual relative to this file. +- manualDir = File.join(File.dirname(__FILE__), '..', '..', '..', +- 'manual', 'html') ++ manualDir = '/usr/share/doc/tj3/html/' + file = "#{manualDir}/#{keyword || 'index'}.html" + # Make sure the file exists. + unless File.exist?(file) diff --git a/debian/patches/series b/debian/patches/series index f43594f..f714ea8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ dont-require-git.patch data-search-dirs-debian.patch reproducible-build.patch +manual-path.patch \ No newline at end of file -- 2.9.3