[DRE-commits] [SCM] rbenv.git branch, master, updated. debian/0.3.0-1-11-g95f9706

[Laurent Arnoud]

The following commit has been merged in the master branch:
commit 1d408faec012c708fa812eed03c0463b803e61c2
Author: Laurent Arnoud <laurent at spkdev.net>
Date:   Sun Jul 21 22:33:51 2013 +0200

    Remove merged patch from upstream

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
deleted file mode 100644
index ac29c55..0000000
--- a/debian/patches/Add-usr_lib_rbenv_hooks-to-hooks-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 942eced..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Add-usr_lib_rbenv_hooks-to-hooks-path.patch

-- 
rbenv.git