Control: tags -1 + patch Hello,
tj3 is currently one of the packages blocking the ruby-defaults transition. The attached patch can help the package get built. That said, the fix is really extremely trivial and if you prefer to just do that from your side, that is just as fine. -- Best, Ananthu
From deae77db71af6c8b0ba8b588328f87fa82806db0 Mon Sep 17 00:00:00 2001
From: Ananthu C V <weepingcl...@debian.org>
Date: Mon, 27 Jan 2025 15:58:51 +0530
Subject: [PATCH] tj3 version 3.8.1 patch
Signed-off-by: Ananthu C V <weepingcl...@debian.org>
---
debian/patches/dont-require-git.patch | 23 +++++++----------------
debian/patches/manual-path.patch | 6 +-----
debian/patches/rakefile.patch | 6 +-----
debian/tasks/help2man.rake | 2 +-
4 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/debian/patches/dont-require-git.patch b/debian/patches/dont-require-git.patch
index 02b9b56..6044b73 100644
--- a/debian/patches/dont-require-git.patch
+++ b/debian/patches/dont-require-git.patch
@@ -1,21 +1,15 @@
Description: do not require git to find files
---- tj3.git.orig/tasks/rdoc.rake 2020-06-19 14:45:45.390630150 +0200
-+++ tj3.git/tasks/rdoc.rake 2020-06-19 14:45:45.390630150 +0200
-@@ -7,7 +7,7 @@
- # RDOC TASK
- Rake::RDocTask.new(:rdoc) do |t|
+--- a/tasks/rdoc.rake
++++ b/tasks/rdoc.rake
+@@ -9,3 +9,3 @@
t.rdoc_files = %w( README.rdoc COPYING CHANGELOG ) +
- `git ls-files -- lib`.split("\n")
+ `find lib -type f`.split("\n")
t.title = "TaskJuggler API documentation"
- t.main = 'README.rdoc'
- t.rdoc_dir = 'doc'
---- tj3.git.orig/taskjuggler.gemspec 2020-06-19 14:45:45.390630150 +0200
-+++ tj3.git/taskjuggler.gemspec 2020-06-19 14:45:45.390630150 +0200
-@@ -46,19 +46,19 @@
- EOT
- s.license = 'GPL-2.0'
+--- a/taskjuggler.gemspec
++++ b/taskjuggler.gemspec
+@@ -47,7 +47,7 @@
s.require_path = 'lib'
- s.files = (`git ls-files -- lib`).split("\n") +
- (`git ls-files -- data`).split("\n") +
@@ -28,8 +22,7 @@ Description: do not require git to find files
+ (`find examples -type f`).split("\n") +
+ (`find tasks -type f`).split("\n") +
%w( .gemtest taskjuggler.gemspec Rakefile ) +
- # Generated files, not contained in Git repository.
- %w( data/tjp.vim ) + Dir.glob('manual/html/**/*') + Dir.glob('man/*.1')
+@@ -56,6 +56,6 @@
s.bindir = 'bin'
- s.executables = (`git ls-files -- bin`).split("\n").
+ s.executables = (`find bin -type f`).split("\n").
@@ -39,5 +32,3 @@ Description: do not require git to find files
+ s.test_files = (`find test -type f`).split("\n") +
+ (`find spec -type f`).split("\n")
- s.has_rdoc = true
- s.extra_rdoc_files = %w( README.rdoc COPYING CHANGELOG )
diff --git a/debian/patches/manual-path.patch b/debian/patches/manual-path.patch
index 68a5624..b235db8 100644
--- a/debian/patches/manual-path.patch
+++ b/debian/patches/manual-path.patch
@@ -9,13 +9,9 @@ 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)
+@@ -110,4 +110,3 @@
# 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/rakefile.patch b/debian/patches/rakefile.patch
index 4e919b0..805e282 100644
--- a/debian/patches/rakefile.patch
+++ b/debian/patches/rakefile.patch
@@ -6,12 +6,8 @@ Author: Christopher Hoskin <christopher.hos...@gmail.com>
Last-Update: 2016-09-06
--- a/Rakefile
+++ b/Rakefile
-@@ -14,6 +14,8 @@
- end
- end
+@@ -19,2 +19,4 @@
+Rake.add_rakelib 'debian/tasks'
+
task :default => [ :test ]
-
- desc 'Run all unit and spec tests'
diff --git a/debian/tasks/help2man.rake b/debian/tasks/help2man.rake
index 91ddb39..ad68284 100644
--- a/debian/tasks/help2man.rake
+++ b/debian/tasks/help2man.rake
@@ -10,7 +10,7 @@ task :help2man => 'man' do
help2man.chomp!
Dir.foreach('bin') do |prog|
next if prog == '.' or prog == '..'
- system help2man,"--output=man/#{prog}.1","--no-info","--manual=TaskJuggler",*("--include=debian/h2m/#{prog}.h2m" unless !File.exists?("debian/h2m/#{prog}.h2m")),"bin/#{prog}"
+ system help2man,"--output=man/#{prog}.1","--no-info","--manual=TaskJuggler",*("--include=debian/h2m/#{prog}.h2m" unless !File.exist?("debian/h2m/#{prog}.h2m")),"bin/#{prog}"
end
end
--
2.47.2
signature.asc
Description: PGP signature
