[DRE-commits] r2032 - in packages/libcommandline-ruby/trunk/debian: . patches

zoso at alioth.debian.org zoso at alioth.debian.org
Sun Nov 4 23:02:20 UTC 2007


Author: zoso
Date: 2007-11-04 23:02:20 +0000 (Sun, 04 Nov 2007)
New Revision: 2032

Modified:
   packages/libcommandline-ruby/trunk/debian/changelog
   packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch
Log:
* Actually fix the patch
* Updated changelog to reflect final package version


Modified: packages/libcommandline-ruby/trunk/debian/changelog
===================================================================
--- packages/libcommandline-ruby/trunk/debian/changelog	2007-11-04 22:04:47 UTC (rev 2031)
+++ packages/libcommandline-ruby/trunk/debian/changelog	2007-11-04 23:02:20 UTC (rev 2032)
@@ -1,4 +1,4 @@
-libcommandline-ruby (0.7.10-9) UNRELEASED; urgency=low
+libcommandline-ruby (0.7.10-9) unstable; urgency=low
 
   * Fix patch for the COLUMNS environment variable fix.
 

Modified: packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch
===================================================================
--- packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch	2007-11-04 22:04:47 UTC (rev 2031)
+++ packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch	2007-11-04 23:02:20 UTC (rev 2032)
@@ -1,6 +1,19 @@
-173d172
-<     f = Text::Format.new
-338c337
-<     console_width = ENV["COLUMNS"]
----
->     console_width = ENV["COLUMNS"].nil? ? nil : (Integer(ENV["COLUMNS"]) rescue ArgumentError nil)
+--- lib/commandline/application.rb.orig	2007-11-04 23:01:34.000000000 +0100
++++ lib/commandline/application.rb	2007-11-04 23:01:36.000000000 +0100
+@@ -170,7 +170,6 @@
+   def man
+     require 'text/format'
+     f = Text::Format.new
+-    f = Text::Format.new
+     f.columns = @columns
+     f.first_indent  = 4
+     f.body_indent   = @body_indent
+@@ -335,7 +334,7 @@
+     #
+     # Formatting defaults
+     #
+-    console_width = ENV["COLUMNS"]
++    console_width = ENV["COLUMNS"].nil? ? nil : (Integer(ENV["COLUMNS"]) rescue ArgumentError nil)
+     @columns = 
+       if console_width.nil?
+         DEFAULT_CONSOLE_WIDTH




More information about the Pkg-ruby-extras-commits mailing list