[DRE-commits] [ruby-rjb] 03/08: Add patch to remove support for obsolete rake/gempackagetask

Jérémy Bobbio lunar at moszumanska.debian.org
Tue Dec 20 22:06:27 UTC 2016


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

lunar pushed a commit to branch master
in repository ruby-rjb.

commit f7137a14571184b2391926c29143f1869a214dbe
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Nov 30 23:16:53 2016 +0100

    Add patch to remove support for obsolete rake/gempackagetask
---
 ...-support-for-obsolete-rake-gempackagetask.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0005-Remove-support-for-obsolete-rake-gempackagetask.patch b/debian/patches/0005-Remove-support-for-obsolete-rake-gempackagetask.patch
new file mode 100644
index 0000000..c02124c
--- /dev/null
+++ b/debian/patches/0005-Remove-support-for-obsolete-rake-gempackagetask.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Wed, 30 Nov 2016 23:16:43 +0100
+Subject: Remove support for obsolete rake/gempackagetask
+
+---
+ rjb.rake | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/rjb.rake b/rjb.rake
+index de3440d..aa46f5a 100644
+--- a/rjb.rake
++++ b/rjb.rake
+@@ -1,11 +1,6 @@
+ require 'rubygems'
+-begin
+-  require 'rake/gempackagetask'
+-  $package_task = Rake::GemPackageTask
+-rescue LoadError
+-  require 'rubygems/package_task'
+-  $package_task = Gem::PackageTask
+-end
++require 'rubygems/package_task'
++$package_task = Gem::PackageTask
+ require 'fileutils'
+ 
+ def read_version
diff --git a/debian/patches/series b/debian/patches/series
index f0775f8..bb0bf98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-paths-to-jars-in-test-suite.patch
 0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
 0005-Always-JVM_TYPE-to-server.patch
+0005-Remove-support-for-obsolete-rake-gempackagetask.patch

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



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