[DRE-commits] [SCM] ruby-passenger.git branch, master, updated. upstream/3.0.11debian-8-g3e2a919

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 3e2a9190de119898a35e11144ca511cb05120d82
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Mar 23 11:15:16 2012 +0100

    Install common files in non-versioned path

diff --git a/debian/patches/fix_install_path.patch b/debian/patches/fix_install_path.patch
new file mode 100644
index 0000000..5e11767
--- /dev/null
+++ b/debian/patches/fix_install_path.patch
@@ -0,0 +1,17 @@
+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
+
+--- 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
+ 	# on the packaging machine might be in /usr/local.
+-	fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+-	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"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7a4b3dc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_install_path.patch
diff --git a/debian/ruby-passenger.install b/debian/ruby-passenger.install
index 4642596..ea34b94 100644
--- a/debian/ruby-passenger.install
+++ b/debian/ruby-passenger.install
@@ -2,5 +2,5 @@ usr/lib/phusion-passenger/
 usr/share/phusion-passenger/union_station_gateway.crt
 usr/share/phusion-passenger/mime.types
 usr/share/phusion-passenger/helper-scripts/
-usr/lib/ruby/* usr/lib/ruby/vendor_ruby/
+usr/lib/ruby/vendor_ruby/
 usr/sbin/

-- 
ruby-passenger.git