[DRE-commits] [SCM] rbenv.git branch, master, updated. debian/0.1.2+git20100922-1-20-gaee7063

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit a4feafa112fcf29fd5c61bc8469185835ba6fc9e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 31 21:01:16 2012 -0200

    Add /usr/lib/rbenv/hooks to the hook path

diff --git a/debian/patches/Add-usr_lib_rbenv_hooks-to-hooks-path.patch b/debian/patches/Add-usr_lib_rbenv_hooks-to-hooks-path.patch
new file mode 100644
index 0000000..ac29c55
--- /dev/null
+++ b/debian/patches/Add-usr_lib_rbenv_hooks-to-hooks-path.patch
@@ -0,0 +1,21 @@
+Description: Adds /usr/lib/rbenv/hooks to the hook path
+ This patch adds a new directory to the hook path that is suitable for rbenv
+ plugins packaged in Debian.
+ .
+ This patch was already applied upstream, so it will be dropped in the next
+ upstream release.
+Author: Antonio Terceiro <terceiro at debian.org>
+Origin: vendor
+Bug: https://github.com/sstephenson/rbenv/pull/183
+
+--- rbenv-0.3.0.orig/libexec/rbenv
++++ rbenv-0.3.0/libexec/rbenv
+@@ -48,7 +48,7 @@ for plugin_bin in "${RBENV_ROOT}/plugins
+ done
+ export PATH="${bin_path}:${PATH}"
+ 
+-hook_path="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d"
++hook_path="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
+ for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
+   hook_path="${hook_path}:${plugin_hook}"
+ done
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..942eced
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Add-usr_lib_rbenv_hooks-to-hooks-path.patch

-- 
rbenv.git