[DRE-commits] [ruby-passenger] 06/11: refresh fix_install_path.patch and no_jsoncpp.patch

[Cédric Boutillier]

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

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

commit 22b29824e34f33fb3b390589865bc40d1eadcbc4
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 16 14:37:33 2014 +0100

    refresh fix_install_path.patch and no_jsoncpp.patch
---
 debian/changelog                      |  1 +
 debian/patches/fix_install_path.patch | 24 ++++++++++++++----------
 debian/patches/no_jsoncpp.patch       |  7 ++++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15c8676..a1e2baa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ruby-passenger (4.0.35-1) unstable; urgency=low
   * Bump Standards-Version to 3.9.5 (no changes needed)
   * debian/patches:
     - drop fix_ftbfs_fortify_source.patch, applied upstream
+    - refresh fix_install_path.patch and no_jsoncpp.patch
 
  -- Cédric Boutillier <boutil at debian.org>  Thu, 16 Jan 2014 12:53:56 +0100
 
diff --git a/debian/patches/fix_install_path.patch b/debian/patches/fix_install_path.patch
index abde3a8..7f5ec4b 100644
--- a/debian/patches/fix_install_path.patch
+++ b/debian/patches/fix_install_path.patch
@@ -1,15 +1,19 @@
 Description: Install in vendor_ruby directory and install common files in non-versioned path
 Author: Laurent Bigonville <bigon at debian.org>
-Date: Thu, 22 Mar 2012 13:55:53 +0100
+Last-Update: 2014-01-16
 
 --- a/build/packaging.rb
 +++ b/build/packaging.rb
-@@ -320,7 +320,7 @@
- 	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
- 	fake_nodelibdir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
- 	fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
--	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-+	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/vendor_ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
- 	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/#{GLOBAL_NAMESPACE_DIRNAME}"
+@@ -406,10 +406,10 @@
+ 	# We don't use CONFIG['archdir'] and the like because we want
+ 	# the files to be installed to /usr, and the Ruby interpreter
+ 	# on the packaging machine might be in /usr/local.
+-	psg_rubylibdir = ENV['RUBYLIBDIR'] || "#{fs_libdir}/ruby/vendor_ruby"
++	psg_rubylibdir = ENV['RUBYLIBDIR'] || CONFIG['vendordir'].sub(/^\/usr/,fs_prefix)
+ 	psg_nodelibdir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/node"
+ 	psg_libdir     = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
+-	psg_native_support_dir = ENV["RUBYARCHDIR"] || "#{fs_libdir}/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
++	psg_native_support_dir = ENV["RUBYARCHDIR"] || CONFIG['vendorarchdir'].sub(/^\/usr/,fs_prefix)
+ 	psg_agents_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+ 	psg_helper_scripts_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+ 	psg_resources_dir      = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}"
diff --git a/debian/patches/no_jsoncpp.patch b/debian/patches/no_jsoncpp.patch
index 952be12..71254f5 100644
--- a/debian/patches/no_jsoncpp.patch
+++ b/debian/patches/no_jsoncpp.patch
@@ -1,9 +1,10 @@
 Description: Remove embedded jsoncpp, only used in tests that aren't built.
 Author: Felix Geyer <fgeyer at debian.org>
+Last-Update: 2014-01-16
 
---- ruby-passenger-4.0.10.orig/lib/phusion_passenger/common_library.rb
-+++ ruby-passenger-4.0.10/lib/phusion_passenger/common_library.rb
-@@ -431,13 +431,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.ne
+--- a/lib/phusion_passenger/common_library.rb
++++ b/lib/phusion_passenger/common_library.rb
+@@ -437,13 +437,6 @@
  			Utils/fib.h
  			Utils/fibpriv.h
  		)

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