[DRE-commits] [ruby-spring] 09/09: don't assume Rubygems

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-spring.

commit e5563b21cf20c060067ed0f5323418f11fcce4ca
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jul 27 16:56:12 2014 -0300

    don't assume Rubygems
---
 debian/changelog                          |  2 +-
 debian/patches/dont-assume-rubygems.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d0adb83..a6d3184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-spring (1.1.3-1) UNRELEASED; urgency=medium
+ruby-spring (1.1.3-1+1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #nnnn)
 
diff --git a/debian/patches/dont-assume-rubygems.patch b/debian/patches/dont-assume-rubygems.patch
new file mode 100644
index 0000000..b6a4c44
--- /dev/null
+++ b/debian/patches/dont-assume-rubygems.patch
@@ -0,0 +1,26 @@
+Description: fix paths wrt Debian package
+ The original source assumes the package was installed with rubygems, which is
+ not the case with Debian packages.
+ .
+ This patch is probably, but not certainly, Debian-specific
+Author: Antonio Terceiro <terceiro at debian.org>
+
+--- ruby-spring-1.1.3.orig/lib/spring/application_manager.rb
++++ ruby-spring-1.1.3/lib/spring/application_manager.rb
+@@ -101,7 +101,6 @@ module Spring
+             "SPRING_PRELOAD"      => preload ? "1" : "0"
+           },
+           "ruby",
+-          "-I", File.expand_path("../..", __FILE__),
+           "-e", "require 'spring/application/boot'",
+           3 => child_socket
+         )
+--- ruby-spring-1.1.3.orig/lib/spring/binstub.rb
++++ ruby-spring-1.1.3/lib/spring/binstub.rb
+@@ -1,5 +1,5 @@
+ command  = File.basename($0)
+-bin_path = File.expand_path("../../../bin/spring", __FILE__)
++bin_path = '/usr/bin/spring'
+ 
+ if command == "spring"
+   load bin_path
diff --git a/debian/patches/series b/debian/patches/series
index 2e8b69b..566e2c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 dont-test-against-listen.patch
 gemspec.patch
+dont-assume-rubygems.patch

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