Bug#836052: tj3man unable to open manual index page

2016-08-31 Thread Vincent Bernat 
 ❦ 31 août 2016 19:44 CEST, Christopher Hoskin  :

> Hopefully the attached is what you meant?

Yes. Thanks! I have uploaded the result.
-- 
Format a program to help the reader understand it.
- The Elements of Programming Style (Kernighan & Plauger)


signature.asc
Description: PGP signature

Bug#836052: tj3man unable to open manual index page

2016-08-31 Thread Christopher Hoskin 
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 
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   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 000..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 
+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

Bug#836052: tj3man unable to open manual index page

2016-08-31 Thread Vincent Bernat 
 ❦ 31 août 2016 15:01 CEST, Christopher Hoskin  :

> Please find a git-formatted patch attached.

A git-formatted patch is a patch obtained with "git format-patch"
(you'll get 0001-something.patch). It contains metadata that enables me
to push it as is in git. You'll be author of the git commit. Also, keep
debian/changelog, it is not generated from git.

> Incidently, the Vcs-Git URL in debain/control
>
> https://alioth.debian.org/anonscm/git/collab-maint/tj3.git
>
> fails when I try to clone from it (fatal: repository
> 'https://alioth.debian.org/anonscm/git/collab-maint/tj3.git/' not
> found). Using
>
> https://anonscm.debian.org/git/collab-maint/tj3.git

Thanks, I have fixed that.
-- 
Use variable names that mean something.
- The Elements of Programming Style (Kernighan & Plauger)


signature.asc
Description: PGP signature

Bug#836052: tj3man unable to open manual index page

2016-08-31 Thread Christopher Hoskin 
Package: tj3
Version: 3.6.0-2
Followup-For: Bug #836052

Dear Vincent,

Please find a git-formatted patch attached.

Incidently, the Vcs-Git URL in debain/control

https://alioth.debian.org/anonscm/git/collab-maint/tj3.git

fails when I try to clone from it (fatal: repository 
'https://alioth.debian.org/anonscm/git/collab-maint/tj3.git/' not found). Using

https://anonscm.debian.org/git/collab-maint/tj3.git

instead seems to work.

Thanks.

Christopher Hoskin
diff --git a/debian/patches/manual-path.patch b/debian/patches/manual-path.patch
new file mode 100644
index 000..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 
+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

Bug#836052: tj3man unable to open manual index page

2016-08-30 Thread Christopher Hoskin 
Package: tj3
Version: 3.6.0-2
Severity: normal

Dear Maintainer,

When I run

tj3man --html

The error message:

"Cannot open manual file 
/usr/lib/ruby/vendor_ruby/taskjuggler/apps/../../../manual/html/index.html"

is displayed. I would expect a web browser to open the index.html page instead.

This appears to be because the path set in lib/taskjuggler/apps/Tj3Man.rb is 
relative to that file, whereas in Debian the path is the absolute path 
/usr/share/doc/tj3/html/index.html.

Thanks.

Christopher Hoskin



-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 4.6.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages tj3 depends on:
ii  ruby 1:2.3.0+4
ii  ruby-mail2.6.4+dfsg1-1
ii  ruby-term-ansicolor  1.3.0-1

tj3 recommends no packages.

tj3 suggests no packages.

-- no debconf information