[arch-commits] Commit in taskjuggler3/repos/community-any (6 files)

Maxime Gauduin alucryd at archlinux.org
Wed Nov 5 12:00:18 UTC 2014


    Date: Wednesday, November 5, 2014 @ 13:00:18
  Author: alucryd
Revision: 121949

archrelease: copy trunk to community-any

Added:
  taskjuggler3/repos/community-any/PKGBUILD
    (from rev 121948, taskjuggler3/trunk/PKGBUILD)
  taskjuggler3/repos/community-any/tj-ruby2.1.patch
    (from rev 121948, taskjuggler3/trunk/tj-ruby2.1.patch)
  taskjuggler3/repos/community-any/tj-system-dirs.patch
    (from rev 121948, taskjuggler3/trunk/tj-system-dirs.patch)
Deleted:
  taskjuggler3/repos/community-any/PKGBUILD
  taskjuggler3/repos/community-any/tj-ruby2.1.patch
  taskjuggler3/repos/community-any/tj-system-dirs.patch

----------------------+
 PKGBUILD             |  109 +++++++++--------
 tj-ruby2.1.patch     |  300 ++++++++++++++++++++++++-------------------------
 tj-system-dirs.patch |   86 +++++++-------
 3 files changed, 249 insertions(+), 246 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-05 12:00:05 UTC (rev 121948)
+++ PKGBUILD	2014-11-05 12:00:18 UTC (rev 121949)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
-
-pkgname=taskjuggler3
-pkgver=3.5.0
-pkgrel=7
-pkgdesc='Project Management Software'
-arch=('any')
-url='http://www.taskjuggler.org'
-license=('GPL')
-depends=('ruby-mail' 'ruby-term-ansicolor')
-source=("http://rubygems.org/downloads/${pkgname%3}-${pkgver}.gem"
-        'tj-ruby2.1.patch'
-        'tj-system-dirs.patch')
-noextract=("${pkgname%3}-${pkgver}.gem")
-sha256sums=('42f2e81470be9b2486fc074ba6ff04180258f462fed5c46cba871b7518cd0465'
-            'e59b510acd1d176ef384101b7eba541713775c8da06c503b48020e8726f8629c'
-            '8174f62598b4230df033feb213e5ec25bc6d3105c71455a88514eaff3db0410a')
-
-prepare() {
-  gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname%3}-${pkgver}.gem
-
-  cd gems/${pkgname%3}-${pkgver}
-  patch -Np1 -i ../../tj-ruby2.1.patch
-  patch -Np1 -i ../../tj-system-dirs.patch
-}
-
-package() {
-  cd gems/${pkgname%3}-${pkgver}
-
-  local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')"
-
-  install -dm 755 "${pkgdir}"/usr/{lib/ruby/{gems/${_rubyver},vendor_ruby},share/{doc,vim/vimfiles/{ftdetect,syntax}}}
-  mv bin "${pkgdir}"/usr/
-  mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}
-
-# Gem compatibility
-  mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/
-
-# Vim syntax
-  mv data/tjp.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/
-  echo 'au! BufNewFile,BufRead *.tjp,*.tji set ft=tjp' > "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/tjp.vim
-
-# Data
-  mv data "${pkgdir}"/usr/share/${pkgname%3}
-  mv examples "${pkgdir}"/usr/share/${pkgname%3}/
-
-# Documentation
-  mv manual "${pkgdir}"/usr/share/doc/${pkgname%3}
-}
-
-# vim: ts=2 sw=2 et:

Copied: taskjuggler3/repos/community-any/PKGBUILD (from rev 121948, taskjuggler3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-05 12:00:18 UTC (rev 121949)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
+# Contributor: John Henderson <jw.hendy at gmail.com>
+
+pkgname=taskjuggler3
+pkgver=3.5.0
+pkgrel=8
+pkgdesc='Project Management Software'
+arch=('any')
+url='http://www.taskjuggler.org'
+license=('GPL')
+depends=('ruby-mail' 'ruby-term-ansicolor')
+source=("http://rubygems.org/downloads/taskjuggler-${pkgver}.gem"
+        'tj-ruby2.1.patch'
+        'tj-system-dirs.patch')
+noextract=("taskjuggler-${pkgver}.gem")
+sha256sums=('42f2e81470be9b2486fc074ba6ff04180258f462fed5c46cba871b7518cd0465'
+            'e59b510acd1d176ef384101b7eba541713775c8da06c503b48020e8726f8629c'
+            '973f9b2d538e5caf7f05bccfe8c16cafba2222703315ab7ee7569738063eea6c')
+
+prepare() {
+  gem install -N -i . taskjuggler-${pkgver}.gem \
+    --ignore-dependencies \
+    --no-user-install
+
+  cd gems/taskjuggler-${pkgver}
+  patch -Np1 -i ../../tj-ruby2.1.patch
+  patch -Np1 -i ../../tj-system-dirs.patch
+}
+
+package() {
+  cd gems/taskjuggler-${pkgver}
+
+  local _rubyver='2.1.0'
+
+  install -dm 755 "${pkgdir}"/usr/{lib/ruby/{gems/${_rubyver},vendor_ruby},share/{doc,taskjuggler,vim/vimfiles/{ftdetect,syntax}}}
+  mv bin "${pkgdir}"/usr/
+  mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}
+
+# Gem compatibility
+  mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/
+
+# Vim syntax
+  mv data/tjp.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/
+  echo 'au! BufNewFile,BufRead *.tjp,*.tji set ft=tjp' > "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/tjp.vim
+
+# Data
+  mv data "${pkgdir}"/usr/share/taskjuggler/
+  mv examples "${pkgdir}"/usr/share/taskjuggler/
+
+# Documentation
+  mv manual "${pkgdir}"/usr/share/doc/taskjuggler
+}
+
+# vim: ts=2 sw=2 et:

Deleted: tj-ruby2.1.patch
===================================================================
--- tj-ruby2.1.patch	2014-11-05 12:00:05 UTC (rev 121948)
+++ tj-ruby2.1.patch	2014-11-05 12:00:18 UTC (rev 121949)
@@ -1,150 +0,0 @@
-From 6202972e46c95b6e2db6a8deab6e18eb3b3fa3cc Mon Sep 17 00:00:00 2001
-From: Chris Schlaeger <chris at linux.com>
-Date: Tue, 31 Dec 2013 13:37:44 +0100
-Subject: [PATCH] New: Ruby 2.1 compatibility fixes
-
----
- lib/taskjuggler/AppConfig.rb           | 2 +-
- lib/taskjuggler/SheetHandlerBase.rb    | 2 +-
- lib/taskjuggler/StatusSheetSender.rb   | 4 ++--
- lib/taskjuggler/TaskJuggler.rb         | 2 +-
- lib/taskjuggler/TimeSheetSummary.rb    | 2 +-
- lib/taskjuggler/apps/Tj3Man.rb         | 2 +-
- lib/taskjuggler/reports/Report.rb      | 6 +++---
- lib/taskjuggler/reports/TraceReport.rb | 2 +-
- 8 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/lib/taskjuggler/AppConfig.rb b/lib/taskjuggler/AppConfig.rb
-index 11a214b..eb49ca3 100644
---- a/lib/taskjuggler/AppConfig.rb
-+++ b/lib/taskjuggler/AppConfig.rb
-@@ -109,7 +109,7 @@ class AppConfig
-     dirs = dataSearchDirs(baseDir)
-     # Remove non-existing directories from the list again
-     dirs.delete_if do |dir|
--      !File.exists?(dir.untaint)
-+      !File.exist?(dir.untaint)
-     end
-     dirs
-   end
-diff --git a/lib/taskjuggler/SheetHandlerBase.rb b/lib/taskjuggler/SheetHandlerBase.rb
-index 723c4a1..ed08564 100644
---- a/lib/taskjuggler/SheetHandlerBase.rb
-+++ b/lib/taskjuggler/SheetHandlerBase.rb
-@@ -246,7 +246,7 @@ class TaskJuggler
-       auxSrcDir = AppConfig.dataDirs('data/css')[0]
-       cssFileName = (auxSrcDir ? auxSrcDir + '/tjreport.css' : '')
-       # Raise an error if we haven't found the data directory
--      if auxSrcDir.nil? || !File.exists?(cssFileName)
-+      if auxSrcDir.nil? || !File.exist?(cssFileName)
-         dataDirError(cssFileName)
-       end
-       cssFile = IO.read(cssFileName)
-diff --git a/lib/taskjuggler/StatusSheetSender.rb b/lib/taskjuggler/StatusSheetSender.rb
-index 3219521..68a443a 100644
---- a/lib/taskjuggler/StatusSheetSender.rb
-+++ b/lib/taskjuggler/StatusSheetSender.rb
-@@ -94,7 +94,7 @@ EOT
- 
-       missingFile = "#{tsDir}/missing-reports"
-       # Check if it's got a missing-reports file.
--      return [] if !File.exists?(missingFile)
-+      return [] if !File.exist?(missingFile)
- 
-       # The sheet could have been submitted after tj3ts_summary was run. We
-       # ignore the entry if a time sheet file now exists. There is a race
-@@ -106,7 +106,7 @@ EOT
-       list = File.readlines(missingFile)
-       list.delete_if do |resource|
-         tsDate = tsDir[-10..-1]
--        File.exists?("#{tsDir}/#{resource.chomp}_#{tsDate}.tji")
-+        File.exist?("#{tsDir}/#{resource.chomp}_#{tsDate}.tji")
-       end
- 
-       # Return the content of the file.
-diff --git a/lib/taskjuggler/TaskJuggler.rb b/lib/taskjuggler/TaskJuggler.rb
-index 1a635c0..80dfca4 100644
---- a/lib/taskjuggler/TaskJuggler.rb
-+++ b/lib/taskjuggler/TaskJuggler.rb
-@@ -232,7 +232,7 @@ class TaskJuggler
-       bookingsFileBase = masterFileBase + '-bookings'
-       bookingsFile = bookingsFileBase + '.tji'
- 
--      if !File.exists?(bookingsFile) || !File.exists?(headerFile)
-+      if !File.exist?(bookingsFile) || !File.exist?(headerFile)
-         info('incl_freeze_files',
-              "Please make sure you include #{headerFile} at " +
-              "the end of the project header and " +
-diff --git a/lib/taskjuggler/TimeSheetSummary.rb b/lib/taskjuggler/TimeSheetSummary.rb
-index b3f5758..8105df9 100644
---- a/lib/taskjuggler/TimeSheetSummary.rb
-+++ b/lib/taskjuggler/TimeSheetSummary.rb
-@@ -78,7 +78,7 @@ EOT
-         templateFile = "#{@templateDir}/#{@date}/#{resourceId}_#{@date}.tji"
-         sheetFile = "#{@sheetDir}/#{@date}/#{resourceId}_#{@date}.tji"
-         if File.exist?(templateFile)
--          if File.exists?(sheetFile)
-+          if File.exist?(sheetFile)
-             # If there are no recipients specified, we don't need to compile
-             # the summary.
-             unless @digestRecipients.empty? && @sheetRecipients.empty?
-diff --git a/lib/taskjuggler/apps/Tj3Man.rb b/lib/taskjuggler/apps/Tj3Man.rb
-index 6337dcd..6ab9312 100644
---- a/lib/taskjuggler/apps/Tj3Man.rb
-+++ b/lib/taskjuggler/apps/Tj3Man.rb
-@@ -110,7 +110,7 @@ EOT
-                             'manual', 'html')
-       file = "#{manualDir}/#{keyword || 'index'}.html"
-       # Make sure the file exists.
--      unless File.exists?(file)
-+      unless File.exist?(file)
-         $stderr.puts "Cannot open manual file #{file}"
-         exit 1
-       end
-diff --git a/lib/taskjuggler/reports/Report.rb b/lib/taskjuggler/reports/Report.rb
-index 5e18065..5105fa8 100644
---- a/lib/taskjuggler/reports/Report.rb
-+++ b/lib/taskjuggler/reports/Report.rb
-@@ -187,7 +187,7 @@ class TaskJuggler
-         auxSrcDir = AppConfig.dataDirs('data/css')[0]
-         cssFileName = (auxSrcDir ? auxSrcDir + '/tjreport.css' : '')
-         # Raise an error if we haven't found the data directory
--        if auxSrcDir.nil? || !File.exists?(cssFileName)
-+        if auxSrcDir.nil? || !File.exist?(cssFileName)
-           dataDirError(cssFileName, AppConfig.dataSearchDirs('data/css'))
-         end
-         cssFile = IO.read(cssFileName)
-@@ -403,7 +403,7 @@ EOT
-       # Find the data directory that came with the TaskJuggler installation.
-       auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0].untaint
-       # Raise an error if we haven't found the data directory
--      if auxSrcDir.nil? || !File.exists?(auxSrcDir)
-+      if auxSrcDir.nil? || !File.exist?(auxSrcDir)
-         dataDirError(dirName, AppConfig.dataSearchDirs("data/#{dirName}"))
-       end
-       # Don't copy directory if all files are up-to-date.
-@@ -419,7 +419,7 @@ EOT
-     end
- 
-     def directoryUpToDate?(auxSrcDir, auxDstDir)
--      return false unless File.exists?(auxDstDir.untaint)
-+      return false unless File.exist?(auxDstDir.untaint)
- 
-       Dir.entries(auxSrcDir).each do |file|
-         next if file == '.' || file == '..'
-diff --git a/lib/taskjuggler/reports/TraceReport.rb b/lib/taskjuggler/reports/TraceReport.rb
-index 26a74d9..ce7c425 100644
---- a/lib/taskjuggler/reports/TraceReport.rb
-+++ b/lib/taskjuggler/reports/TraceReport.rb
-@@ -86,7 +86,7 @@ class TaskJuggler
-                 generatePropertyListHeader(taskList, query)
- 
-       discontinuedColumns = 0
--      if File.exists?(@fileName)
-+      if File.exist?(@fileName)
-         begin
-           @table = CSVFile.new(nil, nil).read(@fileName)
-         rescue
--- 
-1.8.5.2
-

Copied: taskjuggler3/repos/community-any/tj-ruby2.1.patch (from rev 121948, taskjuggler3/trunk/tj-ruby2.1.patch)
===================================================================
--- tj-ruby2.1.patch	                        (rev 0)
+++ tj-ruby2.1.patch	2014-11-05 12:00:18 UTC (rev 121949)
@@ -0,0 +1,150 @@
+From 6202972e46c95b6e2db6a8deab6e18eb3b3fa3cc Mon Sep 17 00:00:00 2001
+From: Chris Schlaeger <chris at linux.com>
+Date: Tue, 31 Dec 2013 13:37:44 +0100
+Subject: [PATCH] New: Ruby 2.1 compatibility fixes
+
+---
+ lib/taskjuggler/AppConfig.rb           | 2 +-
+ lib/taskjuggler/SheetHandlerBase.rb    | 2 +-
+ lib/taskjuggler/StatusSheetSender.rb   | 4 ++--
+ lib/taskjuggler/TaskJuggler.rb         | 2 +-
+ lib/taskjuggler/TimeSheetSummary.rb    | 2 +-
+ lib/taskjuggler/apps/Tj3Man.rb         | 2 +-
+ lib/taskjuggler/reports/Report.rb      | 6 +++---
+ lib/taskjuggler/reports/TraceReport.rb | 2 +-
+ 8 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lib/taskjuggler/AppConfig.rb b/lib/taskjuggler/AppConfig.rb
+index 11a214b..eb49ca3 100644
+--- a/lib/taskjuggler/AppConfig.rb
++++ b/lib/taskjuggler/AppConfig.rb
+@@ -109,7 +109,7 @@ class AppConfig
+     dirs = dataSearchDirs(baseDir)
+     # Remove non-existing directories from the list again
+     dirs.delete_if do |dir|
+-      !File.exists?(dir.untaint)
++      !File.exist?(dir.untaint)
+     end
+     dirs
+   end
+diff --git a/lib/taskjuggler/SheetHandlerBase.rb b/lib/taskjuggler/SheetHandlerBase.rb
+index 723c4a1..ed08564 100644
+--- a/lib/taskjuggler/SheetHandlerBase.rb
++++ b/lib/taskjuggler/SheetHandlerBase.rb
+@@ -246,7 +246,7 @@ class TaskJuggler
+       auxSrcDir = AppConfig.dataDirs('data/css')[0]
+       cssFileName = (auxSrcDir ? auxSrcDir + '/tjreport.css' : '')
+       # Raise an error if we haven't found the data directory
+-      if auxSrcDir.nil? || !File.exists?(cssFileName)
++      if auxSrcDir.nil? || !File.exist?(cssFileName)
+         dataDirError(cssFileName)
+       end
+       cssFile = IO.read(cssFileName)
+diff --git a/lib/taskjuggler/StatusSheetSender.rb b/lib/taskjuggler/StatusSheetSender.rb
+index 3219521..68a443a 100644
+--- a/lib/taskjuggler/StatusSheetSender.rb
++++ b/lib/taskjuggler/StatusSheetSender.rb
+@@ -94,7 +94,7 @@ EOT
+ 
+       missingFile = "#{tsDir}/missing-reports"
+       # Check if it's got a missing-reports file.
+-      return [] if !File.exists?(missingFile)
++      return [] if !File.exist?(missingFile)
+ 
+       # The sheet could have been submitted after tj3ts_summary was run. We
+       # ignore the entry if a time sheet file now exists. There is a race
+@@ -106,7 +106,7 @@ EOT
+       list = File.readlines(missingFile)
+       list.delete_if do |resource|
+         tsDate = tsDir[-10..-1]
+-        File.exists?("#{tsDir}/#{resource.chomp}_#{tsDate}.tji")
++        File.exist?("#{tsDir}/#{resource.chomp}_#{tsDate}.tji")
+       end
+ 
+       # Return the content of the file.
+diff --git a/lib/taskjuggler/TaskJuggler.rb b/lib/taskjuggler/TaskJuggler.rb
+index 1a635c0..80dfca4 100644
+--- a/lib/taskjuggler/TaskJuggler.rb
++++ b/lib/taskjuggler/TaskJuggler.rb
+@@ -232,7 +232,7 @@ class TaskJuggler
+       bookingsFileBase = masterFileBase + '-bookings'
+       bookingsFile = bookingsFileBase + '.tji'
+ 
+-      if !File.exists?(bookingsFile) || !File.exists?(headerFile)
++      if !File.exist?(bookingsFile) || !File.exist?(headerFile)
+         info('incl_freeze_files',
+              "Please make sure you include #{headerFile} at " +
+              "the end of the project header and " +
+diff --git a/lib/taskjuggler/TimeSheetSummary.rb b/lib/taskjuggler/TimeSheetSummary.rb
+index b3f5758..8105df9 100644
+--- a/lib/taskjuggler/TimeSheetSummary.rb
++++ b/lib/taskjuggler/TimeSheetSummary.rb
+@@ -78,7 +78,7 @@ EOT
+         templateFile = "#{@templateDir}/#{@date}/#{resourceId}_#{@date}.tji"
+         sheetFile = "#{@sheetDir}/#{@date}/#{resourceId}_#{@date}.tji"
+         if File.exist?(templateFile)
+-          if File.exists?(sheetFile)
++          if File.exist?(sheetFile)
+             # If there are no recipients specified, we don't need to compile
+             # the summary.
+             unless @digestRecipients.empty? && @sheetRecipients.empty?
+diff --git a/lib/taskjuggler/apps/Tj3Man.rb b/lib/taskjuggler/apps/Tj3Man.rb
+index 6337dcd..6ab9312 100644
+--- a/lib/taskjuggler/apps/Tj3Man.rb
++++ b/lib/taskjuggler/apps/Tj3Man.rb
+@@ -110,7 +110,7 @@ EOT
+                             'manual', 'html')
+       file = "#{manualDir}/#{keyword || 'index'}.html"
+       # Make sure the file exists.
+-      unless File.exists?(file)
++      unless File.exist?(file)
+         $stderr.puts "Cannot open manual file #{file}"
+         exit 1
+       end
+diff --git a/lib/taskjuggler/reports/Report.rb b/lib/taskjuggler/reports/Report.rb
+index 5e18065..5105fa8 100644
+--- a/lib/taskjuggler/reports/Report.rb
++++ b/lib/taskjuggler/reports/Report.rb
+@@ -187,7 +187,7 @@ class TaskJuggler
+         auxSrcDir = AppConfig.dataDirs('data/css')[0]
+         cssFileName = (auxSrcDir ? auxSrcDir + '/tjreport.css' : '')
+         # Raise an error if we haven't found the data directory
+-        if auxSrcDir.nil? || !File.exists?(cssFileName)
++        if auxSrcDir.nil? || !File.exist?(cssFileName)
+           dataDirError(cssFileName, AppConfig.dataSearchDirs('data/css'))
+         end
+         cssFile = IO.read(cssFileName)
+@@ -403,7 +403,7 @@ EOT
+       # Find the data directory that came with the TaskJuggler installation.
+       auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0].untaint
+       # Raise an error if we haven't found the data directory
+-      if auxSrcDir.nil? || !File.exists?(auxSrcDir)
++      if auxSrcDir.nil? || !File.exist?(auxSrcDir)
+         dataDirError(dirName, AppConfig.dataSearchDirs("data/#{dirName}"))
+       end
+       # Don't copy directory if all files are up-to-date.
+@@ -419,7 +419,7 @@ EOT
+     end
+ 
+     def directoryUpToDate?(auxSrcDir, auxDstDir)
+-      return false unless File.exists?(auxDstDir.untaint)
++      return false unless File.exist?(auxDstDir.untaint)
+ 
+       Dir.entries(auxSrcDir).each do |file|
+         next if file == '.' || file == '..'
+diff --git a/lib/taskjuggler/reports/TraceReport.rb b/lib/taskjuggler/reports/TraceReport.rb
+index 26a74d9..ce7c425 100644
+--- a/lib/taskjuggler/reports/TraceReport.rb
++++ b/lib/taskjuggler/reports/TraceReport.rb
+@@ -86,7 +86,7 @@ class TaskJuggler
+                 generatePropertyListHeader(taskList, query)
+ 
+       discontinuedColumns = 0
+-      if File.exists?(@fileName)
++      if File.exist?(@fileName)
+         begin
+           @table = CSVFile.new(nil, nil).read(@fileName)
+         rescue
+-- 
+1.8.5.2
+

Deleted: tj-system-dirs.patch
===================================================================
--- tj-system-dirs.patch	2014-11-05 12:00:05 UTC (rev 121948)
+++ tj-system-dirs.patch	2014-11-05 12:00:18 UTC (rev 121949)
@@ -1,43 +0,0 @@
-From af46d6b1a731a3e2c3dc7aedcaf8dfe8291a4ab7 Mon Sep 17 00:00:00 2001
-From: Maxime Gauduin <alucryd at gmail.com>
-Date: Wed, 25 Sep 2013 10:42:57 +0200
-Subject: [PATCH] Look for data and manual in system dirs
-
-Signed-off-by: Maxime Gauduin <alucryd at gmail.com>
----
- lib/taskjuggler/AppConfig.rb   | 2 ++
- lib/taskjuggler/apps/Tj3Man.rb | 5 ++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/lib/taskjuggler/AppConfig.rb b/lib/taskjuggler/AppConfig.rb
-index 11a214b..2051a17 100644
---- a/lib/taskjuggler/AppConfig.rb
-+++ b/lib/taskjuggler/AppConfig.rb
-@@ -137,6 +137,8 @@ class AppConfig
-     # This one is for Debian based distros
-     dirs << rubyLibDir + '/gems/' \
-         + @@packageName + '-' + @@version + "/#{baseDir}/"
-+    # Also look in system share directory
-+    dirs << '/usr/share/' + @@packageName
- 
-     dirs
-   end
-diff --git a/lib/taskjuggler/apps/Tj3Man.rb b/lib/taskjuggler/apps/Tj3Man.rb
-index 6337dcd..a51f7eb 100644
---- a/lib/taskjuggler/apps/Tj3Man.rb
-+++ b/lib/taskjuggler/apps/Tj3Man.rb
-@@ -105,9 +105,8 @@ EOT
-     # Start the web browser with either the entry page or the page for the
-     # specified keyword.
-     def startBrowser(keyword = nil)
--      # Find the manual relative to this file.
--      manualDir = File.join(File.dirname(__FILE__), '..', '..', '..',
--                            'manual', 'html')
-+      # Find the manual in system doc directory.
-+      manualDir = '/usr/share/doc/taskjuggler/html'
-       file = "#{manualDir}/#{keyword || 'index'}.html"
-       # Make sure the file exists.
-       unless File.exists?(file)
--- 
-1.8.4
-

Copied: taskjuggler3/repos/community-any/tj-system-dirs.patch (from rev 121948, taskjuggler3/trunk/tj-system-dirs.patch)
===================================================================
--- tj-system-dirs.patch	                        (rev 0)
+++ tj-system-dirs.patch	2014-11-05 12:00:18 UTC (rev 121949)
@@ -0,0 +1,43 @@
+From af46d6b1a731a3e2c3dc7aedcaf8dfe8291a4ab7 Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at gmail.com>
+Date: Wed, 25 Sep 2013 10:42:57 +0200
+Subject: [PATCH] Look for data and manual in system dirs
+
+Signed-off-by: Maxime Gauduin <alucryd at gmail.com>
+---
+ lib/taskjuggler/AppConfig.rb   | 2 ++
+ lib/taskjuggler/apps/Tj3Man.rb | 5 ++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/taskjuggler/AppConfig.rb b/lib/taskjuggler/AppConfig.rb
+index 11a214b..2051a17 100644
+--- a/lib/taskjuggler/AppConfig.rb
++++ b/lib/taskjuggler/AppConfig.rb
+@@ -137,6 +137,8 @@ class AppConfig
+     # This one is for Debian based distros
+     dirs << rubyLibDir + '/gems/' \
+         + @@packageName + '-' + @@version + "/#{baseDir}/"
++    # Also look in system share directory
++    dirs << '/usr/share/' + @@packageName + "/#{baseDir}/"
+ 
+     dirs
+   end
+diff --git a/lib/taskjuggler/apps/Tj3Man.rb b/lib/taskjuggler/apps/Tj3Man.rb
+index 6337dcd..a51f7eb 100644
+--- a/lib/taskjuggler/apps/Tj3Man.rb
++++ b/lib/taskjuggler/apps/Tj3Man.rb
+@@ -105,9 +105,8 @@ EOT
+     # Start the web browser with either the entry page or the page for the
+     # specified keyword.
+     def startBrowser(keyword = nil)
+-      # Find the manual relative to this file.
+-      manualDir = File.join(File.dirname(__FILE__), '..', '..', '..',
+-                            'manual', 'html')
++      # Find the manual in system doc directory.
++      manualDir = '/usr/share/doc/taskjuggler/html'
+       file = "#{manualDir}/#{keyword || 'index'}.html"
+       # Make sure the file exists.
+       unless File.exists?(file)
+-- 
+1.8.4
+


More information about the arch-commits mailing list