[DRE-commits] [ruby-passenger] 07/17: Refresh fix_install_path.patch.

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit 73e54591d0fcbb332cf549558f026d6685ac1fd4
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Aug 5 20:37:33 2013 +0200

    Refresh fix_install_path.patch.
---
 debian/changelog                      |    1 +
 debian/patches/fix_install_path.patch |   14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b7e193..1cf7222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-passenger (4.0.10-1) UNRELEASED; urgency=low
   * New upstream release. (Closes: #711906)
   * Stop repacking the upstream tarball as it doesn't contain any minified
     javascript files anymore.
+  * Refresh fix_install_path.patch.
   * Add myself as Uploader.
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 05 Aug 2013 20:31:08 +0200
diff --git a/debian/patches/fix_install_path.patch b/debian/patches/fix_install_path.patch
index 5e11767..cb9b05a 100644
--- a/debian/patches/fix_install_path.patch
+++ b/debian/patches/fix_install_path.patch
@@ -4,14 +4,12 @@ Date: Thu, 22 Mar 2012 13:55:53 +0100
 
 --- a/build/packaging.rb
 +++ b/build/packaging.rb
-@@ -103,8 +103,8 @@
- 	# We don't use CONFIG['archdir'] and the like because we want
- 	# the files to be installed to /usr, and the Ruby interpreter
+@@ -191,7 +191,7 @@
  	# on the packaging machine might be in /usr/local.
--	fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+ 	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
+ 	fake_libdir = "#{fakeroot}/usr/lib/passenger"
 -	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-+	fake_libdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
 +	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/vendor_ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
- 	fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}"
- 	fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
- 	fake_resources_dir = "#{fakeroot}/usr/share/phusion-passenger"
+ 	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+ 	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+ 	fake_resources_dir = "#{fakeroot}/usr/share/passenger"

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