[DRE-commits] [ruby-foreman] 12/15: install data files

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-foreman.

commit 331b50a7a0511de6c8757171b694480fae7293e2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Feb 4 13:37:14 2015 -0200

    install data files
---
 debian/patches/0001-Look-for-data-in-usr-share-foreman.patch | 10 ++++------
 debian/ruby-foreman.install                                  |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch b/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch
index 2a154e0..2afb4b9 100644
--- a/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch
+++ b/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch
@@ -6,11 +6,9 @@ Subject: Look for data in /usr/share/foreman
  lib/foreman/export/base.rb | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/lib/foreman/export/base.rb b/lib/foreman/export/base.rb
-index f8b8a6f..76939d8 100644
 --- a/lib/foreman/export/base.rb
 +++ b/lib/foreman/export/base.rb
-@@ -111,7 +111,7 @@ private ######################################################################
+@@ -111,7 +111,7 @@ private ################################
      elsif File.exist?(file_path = File.expand_path(File.join("~/.foreman/templates", file)))
        File.read(file_path)
      else
@@ -19,7 +17,7 @@ index f8b8a6f..76939d8 100644
      end
    end
  
-@@ -123,7 +123,7 @@ private ######################################################################
+@@ -123,7 +123,7 @@ private ################################
        matchers = []
        matchers << File.join(options[:template], name_without_first) if options[:template]
        matchers << File.expand_path("~/.foreman/templates/#{name}")
@@ -28,7 +26,7 @@ index f8b8a6f..76939d8 100644
        File.read(matchers.detect { |m| File.exists?(m) })
      end
    end
-@@ -153,4 +153,13 @@ private ######################################################################
+@@ -153,4 +153,13 @@ private ################################
      end
    end
  
@@ -37,7 +35,7 @@ index f8b8a6f..76939d8 100644
 +  def data_file(path)
 +    [
 +      File.expand_path("../../../../data/#{path}", __FILE__),
-+      "/usr/share/foreman/data/#{path}"
++      "/usr/share/ruby-foreman/data/#{path}"
 +    ].find { |f| File.exist?(f) }
 +  end
 +
diff --git a/debian/ruby-foreman.install b/debian/ruby-foreman.install
new file mode 100644
index 0000000..6772dc0
--- /dev/null
+++ b/debian/ruby-foreman.install
@@ -0,0 +1 @@
+data/ /usr/share/ruby-foreman

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-foreman.git