~ubuntu-branches/ubuntu/trusty/ruby1.9/trusty

« back to all changes in this revision

Viewing changes to debian/patches/910_gem_prelude.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-01-24 11:42:29 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20080124114229-jw2f87rdxlq6gp11
Tags: 1.9.0.0-2ubuntu1
* Merge from debian unstable, remaining changes:
  - Robustify check for target_os, fixing build failure on lpia.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 910_gem_prelude.dpatch by Daigo Moriwaki <daigo@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Change the default gem home directory.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad ruby-1.9.0-0~/gem_prelude.rb ruby-1.9.0-0/gem_prelude.rb
 
9
--- ruby-1.9.0-0~/gem_prelude.rb        2007-12-24 10:38:43.000000000 +0900
 
10
+++ ruby-1.9.0-0/gem_prelude.rb 2008-01-02 18:06:00.000000000 +0900
 
11
@@ -30,11 +30,7 @@
 
12
   class << self
 
13
 
 
14
     def default_dir
 
15
-      if defined? RUBY_FRAMEWORK_VERSION
 
16
-        return File.join(File.dirname(ConfigMap[:sitedir]), "Gems")
 
17
-      else
 
18
-        File.join(ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version])
 
19
-      end
 
20
+      File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version])
 
21
     end
 
22
 
 
23
     def dir