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

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 0ea74887ef120b075002cefb5a893273c5e435cd
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Tue Aug 14 11:09:48 2012 -0500

    Revert the 1.1.4-5 changes and add a recommendation on less, as not every sensible-pager supports the "-R" switch (Now really closes: #684798)

diff --git a/debian/changelog b/debian/changelog
index 982c2ef..832863c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bundler (1.1.4-6) unstable; urgency=low
+
+  * Team upload
+  * Revert the 1.1.4-5 changes and add a recommendation on less, as not
+    every sensible-pager supports the "-R" switch (Now really closes:
+    #684798)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 14 Aug 2012 11:07:39 -0500
+
 bundler (1.1.4-5) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 068e1d8..8d0f109 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: bundler
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Recommends: sudo, ruby-dev, build-essential, rubygems-integration
+Recommends: sudo, ruby-dev, build-essential, rubygems-integration, less
 Description: Manage Ruby application dependencies
  Bundler manages a Ruby application's dependencies through its entire
  life, across many machines, systematically and repeatably.
diff --git a/debian/patches/series b/debian/patches/series
index 9e6b014..cde7751 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-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
deleted file mode 100644
index 97ccb47..0000000
--- a/debian/patches/use-sensible-pager-not-less
+++ /dev/null
@@ -1,13 +0,0 @@
-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