[DRE-commits] [SCM] bundler.git branch, master, updated. debian/1.1.4-5

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit c82adf2084e2b11621d54a64ed3bbd007264c5c3
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Mon Aug 13 19:11:32 2012 -0500

    Use sensible-pager instead of less for displaying the help (Closes: #684798)

diff --git a/debian/changelog b/debian/changelog
index 54ab2e2..982c2ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bundler (1.1.4-5) unstable; urgency=low
+
+  * Team upload
+  * Use sensible-pager instead of less for displaying the help (Closes:
+    #684798)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 13 Aug 2012 19:05:47 -0500
+
 bundler (1.1.4-4) unstable; urgency=low
 
   * Bump gem2deb build-dependency so we ship the rubygems-integration files.
diff --git a/debian/patches/series b/debian/patches/series
index cde7751..9e6b014 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+use-sensible-pager-not-less
 fix-manpage-warning.patch
diff --git a/debian/patches/use-sensible-pager-not-less b/debian/patches/use-sensible-pager-not-less
new file mode 100644
index 0000000..97ccb47
--- /dev/null
+++ b/debian/patches/use-sensible-pager-not-less
@@ -0,0 +1,13 @@
+Index: bundler/lib/bundler/cli.rb
+===================================================================
+--- bundler.orig/lib/bundler/cli.rb	2012-07-25 17:34:22.000000000 -0500
++++ bundler/lib/bundler/cli.rb	2012-08-13 19:04:18.000000000 -0500
+@@ -41,7 +41,7 @@
+ 
+         if have_groff? && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
+           groff   = "groff -Wall -mtty-char -mandoc -Tascii"
+-          pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'less -R'
++          pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'sensible-pager -R'
+ 
+           Kernel.exec "#{groff} #{root}/#{command} | #{pager}"
+         else

-- 
bundler.git