[DRE-commits] [ruby-ramaze] 04/04: Avoid the ramaze binary's hard-coded relative paths

[Gunnar Wolf]

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

gwolf pushed a commit to branch master
in repository ruby-ramaze.

commit 96a9895054e0fea20cfa693ec56aaecc4bc58c69
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Thu Aug 29 12:32:59 2013 -0500

    Avoid the ramaze binary's hard-coded relative paths
---
 debian/changelog                            |    1 +
 debian/patches/dont_hardcode_relative_paths |   14 ++++++++++++++
 debian/patches/dont_require_rubygems        |   15 +++++++++++++--
 debian/patches/series                       |    1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c082b77..6c306a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ruby-ramaze (2012.12.08-1) UNRELEASED; urgency=low
   * Incorporate previous packaging information from the old packaging
   * Don't require rubygems from within Debian packages
   * Minor fixes, including some lintian warnings
+  * Avoid the ramaze binary's hard-coded relative paths
 
  -- Gunnar Wolf <gwolf at debian.org>  Thu, 29 Aug 2013 10:10:15 -0500
 
diff --git a/debian/patches/dont_hardcode_relative_paths b/debian/patches/dont_hardcode_relative_paths
new file mode 100644
index 0000000..8f1a5db
--- /dev/null
+++ b/debian/patches/dont_hardcode_relative_paths
@@ -0,0 +1,14 @@
+Index: ruby-ramaze/bin/ramaze
+===================================================================
+--- ruby-ramaze.orig/bin/ramaze	2012-07-25 17:37:40.000000000 -0500
++++ ruby-ramaze/bin/ramaze	2013-08-29 12:31:05.000000000 -0500
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env ruby
+ begin; require 'rubygems'; rescue LoadError; end
+ 
+-require File.expand_path('../../lib/ramaze'           , __FILE__)
+-require File.expand_path('../../lib/ramaze/bin/runner', __FILE__)
++require 'ramaze'
++require 'ramaze/bin/runner'
+ 
+ Ramaze::Bin::Runner.run
diff --git a/debian/patches/dont_require_rubygems b/debian/patches/dont_require_rubygems
index 1c9dc14..47ebc82 100644
--- a/debian/patches/dont_require_rubygems
+++ b/debian/patches/dont_require_rubygems
@@ -1,7 +1,7 @@
 Index: ruby-ramaze/lib/proto/app.rb
 ===================================================================
---- ruby-ramaze.orig/lib/proto/app.rb	2013-08-29 10:08:17.000000000 -0500
-+++ ruby-ramaze/lib/proto/app.rb	2013-08-29 10:54:58.000000000 -0500
+--- ruby-ramaze.orig/lib/proto/app.rb	2013-08-29 12:31:16.000000000 -0500
++++ ruby-ramaze/lib/proto/app.rb	2013-08-29 12:31:16.000000000 -0500
 @@ -1,6 +1,5 @@
  # This file contains your application, it requires dependencies and necessary
  # parts of the application.
@@ -9,3 +9,14 @@ Index: ruby-ramaze/lib/proto/app.rb
  require 'ramaze'
  
  # Make sure that Ramaze knows where you are
+Index: ruby-ramaze/bin/ramaze
+===================================================================
+--- ruby-ramaze.orig/bin/ramaze	2013-08-29 12:31:05.000000000 -0500
++++ ruby-ramaze/bin/ramaze	2013-08-29 12:31:29.000000000 -0500
+@@ -1,6 +1,4 @@
+ #!/usr/bin/env ruby
+-begin; require 'rubygems'; rescue LoadError; end
+-
+ require 'ramaze'
+ require 'ramaze/bin/runner'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f728cce..10bfe17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+dont_hardcode_relative_paths
 dont_require_rubygems

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