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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 63ec5c0d3e4161331cbda46b4b1a8c3b23895dad
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 10 16:14:30 2012 -0200

    Remove system plugin patch, it was not accepted upstream
    
    https://github.com/sstephenson/rbenv/pull/176

diff --git a/debian/patches/0001-Add-system-plugins-dir.patch b/debian/patches/0001-Add-system-plugins-dir.patch
deleted file mode 100644
index 893204a..0000000
--- a/debian/patches/0001-Add-system-plugins-dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4138f988358ae756d565886ed80128b62ecc4c9f Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Tue, 10 Jan 2012 13:46:42 -0200
-Subject: [PATCH] Add system plugins dir
-
----
- libexec/rbenv |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libexec/rbenv b/libexec/rbenv
-index 5fe8433..838b856 100755
---- a/libexec/rbenv
-+++ b/libexec/rbenv
-@@ -42,14 +42,16 @@ export RBENV_DIR
- 
- shopt -s nullglob
- 
-+system_plugins_dir=/usr/lib/rbenv/plugins
-+
- bin_path="$(abs_dirname "$0")"
--for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do
-+for plugin_bin in "${system_plugins_dir}/"*/bin "${RBENV_ROOT}/plugins/"*/bin; do
-   bin_path="${bin_path}:${plugin_bin}"
- done
- export PATH="${bin_path}:${PATH}"
- 
- hook_path="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d"
--for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
-+for plugin_hook in "${system_plugins_dir}/"*/etc/rbenv.d "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
-   hook_path="${hook_path}:${plugin_hook}"
- done
- export RBENV_HOOK_PATH="$hook_path"
--- 
-1.7.8.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bf36a7f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-system-plugins-dir.patch

-- 
rbenv.git