[DRE-commits] [SCM] taskjuggler.git branch, master, updated. upstream/3.1.0-16-gbf2932d

[Carl Worth]

The following commit has been merged in the master branch:
commit bf2932d14fc1e5dfc0d2772a99e4fc63e624fa93
Merge: 9b8013cd813b55e6f1154893e8334f5ec62d64d9 03d7b6f8d9d28fa70a01fe53c4bd2d9f7a44f2cb
Author: Carl Worth <cworth at debian.org>
Date:   Wed Mar 7 09:28:34 2012 -0800

    merge patched into master

diff --combined debian/.git-dpm
index 741ee01,0000000..ca678a7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- a1e2bf0ba86865b838f2b64e29ab14ecfa0ed0f6
- a1e2bf0ba86865b838f2b64e29ab14ecfa0ed0f6
++03d7b6f8d9d28fa70a01fe53c4bd2d9f7a44f2cb
++03d7b6f8d9d28fa70a01fe53c4bd2d9f7a44f2cb
 +4e49c17cf5a2986746450742e7d2a1f086414786
 +4e49c17cf5a2986746450742e7d2a1f086414786
 +taskjuggler_3.1.0.orig.tar.gz
 +7aa4e82b7bc1a1661980f3be34e25d3f577f1b97
 +762470
diff --combined debian/patches/0001-Remove-all-instances-of-require-rubygems.patch
index a5070cd,0000000..05ee86a
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-all-instances-of-require-rubygems.patch
+++ b/debian/patches/0001-Remove-all-instances-of-require-rubygems.patch
@@@ -1,134 -1,0 +1,144 @@@
- From a1e2bf0ba86865b838f2b64e29ab14ecfa0ed0f6 Mon Sep 17 00:00:00 2001
++From 03d7b6f8d9d28fa70a01fe53c4bd2d9f7a44f2cb Mon Sep 17 00:00:00 2001
 +From: Carl Worth <cworth at debian.org>
 +Date: Wed, 7 Mar 2012 07:58:39 -0800
 +Subject: Remove all instances of "require rubygems"
 +
 +Since taskjuggler cannot know how the user installed it, (whether via
 +rubygems or through some other mechanism such as a distribution
 +package), the implementation should not require rubygems
 +---
 + lib/taskjuggler/MessageHandler.rb |    4 ----
-  lib/taskjuggler/Tj3AppBase.rb     |    1 -
++ lib/taskjuggler/Tj3AppBase.rb     |    4 +---
 + spec/ICalendar_spec.rb            |    2 --
 + spec/IntervalList_spec.rb         |    2 --
 + spec/StatusSheets_spec.rb         |    1 -
 + spec/TernarySearchTree_spec.rb    |    2 --
 + spec/TimeSheets_spec.rb           |    1 -
 + spec/Tj3Daemon_spec.rb            |    1 -
 + spec/Tj3_spec.rb                  |    1 -
-  9 files changed, 0 insertions(+), 15 deletions(-)
++ 9 files changed, 1 insertions(+), 17 deletions(-)
 +
 +diff --git a/lib/taskjuggler/MessageHandler.rb b/lib/taskjuggler/MessageHandler.rb
 +index b17848f..7f5a3a1 100644
 +--- a/lib/taskjuggler/MessageHandler.rb
 ++++ b/lib/taskjuggler/MessageHandler.rb
 +@@ -11,10 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-if RUBY_VERSION < "1.9.0"
 +-  require 'rubygems'
 +-end
 +-
 + require 'term/ansicolor'
 + require 'taskjuggler/TextParser/SourceFileInfo'
 + 
 +diff --git a/lib/taskjuggler/Tj3AppBase.rb b/lib/taskjuggler/Tj3AppBase.rb
- index 781c1ee..52b204b 100644
++index 781c1ee..a409ac5 100644
 +--- a/lib/taskjuggler/Tj3AppBase.rb
 ++++ b/lib/taskjuggler/Tj3AppBase.rb
 +@@ -11,7 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 + require 'optparse'
 + require 'term/ansicolor'
 + require 'taskjuggler/Tj3Config'
++@@ -104,8 +103,7 @@ EOT
++     end
++ 
++     def main(argv = ARGV)
++-      if Gem::Version.new(RUBY_VERSION.dup) <
++-         Gem::Version.new(@mininumRubyVersion)
+++      if RUBY_VERSION < @mininumRubyVersion
++         error('This program requires at least Ruby version ' +
++               "#{@mininumRubyVersion}!")
++       end
 +diff --git a/spec/ICalendar_spec.rb b/spec/ICalendar_spec.rb
 +index 6d062b7..8ca897c 100644
 +--- a/spec/ICalendar_spec.rb
 ++++ b/spec/ICalendar_spec.rb
 +@@ -11,8 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 +-
 + require 'taskjuggler/ICalendar'
 + 
 + require 'support/spec_helper.rb'
 +diff --git a/spec/IntervalList_spec.rb b/spec/IntervalList_spec.rb
 +index 46203c6..cb26954 100644
 +--- a/spec/IntervalList_spec.rb
 ++++ b/spec/IntervalList_spec.rb
 +@@ -11,8 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 +-
 + require 'taskjuggler/IntervalList'
 + 
 + class TaskJuggler
 +diff --git a/spec/StatusSheets_spec.rb b/spec/StatusSheets_spec.rb
 +index 4149711..ea2b93f 100644
 +--- a/spec/StatusSheets_spec.rb
 ++++ b/spec/StatusSheets_spec.rb
 +@@ -11,7 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 + require 'support/DaemonControl'
 + require 'taskjuggler/apps/Tj3SsSender'
 + require 'taskjuggler/apps/Tj3SsReceiver'
 +diff --git a/spec/TernarySearchTree_spec.rb b/spec/TernarySearchTree_spec.rb
 +index adfb2a7..d4c9f7f 100644
 +--- a/spec/TernarySearchTree_spec.rb
 ++++ b/spec/TernarySearchTree_spec.rb
 +@@ -11,8 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 +-
 + require 'taskjuggler/TernarySearchTree'
 + 
 + class TaskJuggler
 +diff --git a/spec/TimeSheets_spec.rb b/spec/TimeSheets_spec.rb
 +index 09742f1..b95b1a5 100644
 +--- a/spec/TimeSheets_spec.rb
 ++++ b/spec/TimeSheets_spec.rb
 +@@ -11,7 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 + require 'support/DaemonControl'
 + require 'taskjuggler/apps/Tj3TsSender'
 + require 'taskjuggler/apps/Tj3TsReceiver'
 +diff --git a/spec/Tj3Daemon_spec.rb b/spec/Tj3Daemon_spec.rb
 +index 216fd13..40f2d67 100644
 +--- a/spec/Tj3Daemon_spec.rb
 ++++ b/spec/Tj3Daemon_spec.rb
 +@@ -11,7 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 + require 'support/DaemonControl'
 + 
 + class TaskJuggler
 +diff --git a/spec/Tj3_spec.rb b/spec/Tj3_spec.rb
 +index 05ef35d..da7cbe5 100644
 +--- a/spec/Tj3_spec.rb
 ++++ b/spec/Tj3_spec.rb
 +@@ -11,7 +11,6 @@
 + # published by the Free Software Foundation.
 + #
 + 
 +-require 'rubygems'
 + require 'taskjuggler/StdIoWrapper'
 + require 'taskjuggler/apps/Tj3'
 + 

-- 
taskjuggler.git