[DRE-commits] [chef] 06/06: Drop debian/patches/remove_rubygems.diff, now obsolete

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository chef.

commit 1ce2f3d47ce1f186945d67299620074f5116240c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 15:46:57 2015 -0300

    Drop debian/patches/remove_rubygems.diff, now obsolete
---
 debian/changelog                    |  1 +
 debian/patches/remove_rubygems.diff | 45 -------------------------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index befd9ca..eab75b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ chef (12.3.0-1) UNRELEASED; urgency=medium
   * Update packaging:
     - Drop: Provides/Replaces used for upgrades in old releases
     - Dropped debian/require-rubygems.overrides, now obsolete
+    - Drop debian/patches/remove_rubygems.diff, now obsolete
 
  -- Antonio Terceiro <terceiro at debian.org>  Sun, 17 May 2015 08:41:22 -0300
 
diff --git a/debian/patches/remove_rubygems.diff b/debian/patches/remove_rubygems.diff
deleted file mode 100644
index ca3156f..0000000
--- a/debian/patches/remove_rubygems.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- chef/bin/chef-client
-+++ chef/bin/chef-client
-@@ -18,7 +18,6 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--require 'rubygems'
- $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
- require 'chef'
- require 'chef/application/client'
---- chef/bin/chef-solo
-+++ chef/bin/chef-solo
-@@ -18,7 +18,6 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--require 'rubygems'
- $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
- require 'chef/application/solo'
- 
---- chef/bin/knife
-+++ chef/bin/knife
-@@ -18,7 +18,6 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--require 'rubygems'
- $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
- require 'chef/application/knife'
- 
---- chef/bin/shef
-+++ chef/bin/shef
-@@ -18,11 +18,6 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--begin
--  require "rubygems"
--rescue LoadError
--end
--
- require "irb"
- require "irb/completion"
- require 'irb/ext/save-history'
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0a49035..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-remove_rubygems.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git