[DRE-commits] [berkshelf] 01/01: Fix patches 3 & 9

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository berkshelf.

commit 27a530efd37faa1ddc7e3b9df4faa3825a0d6a6a
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Wed Oct 19 00:01:03 2016 +0300

    Fix patches 3 & 9
---
 .../0003-Use-usr-share-berkshelf-as-data-root.patch    |  4 ++--
 .../0009-Use-better-temporary-path-in-tests.patch      | 18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch b/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch
index 3110c48..0fbdb3d 100644
--- a/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch
+++ b/debian/patches/0003-Use-usr-share-berkshelf-as-data-root.patch
@@ -9,7 +9,7 @@ Subject: Use /usr/share/berkshelf as data root
  3 files changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/lib/berkshelf.rb b/lib/berkshelf.rb
-index f0f4cfc..6ce1740 100644
+index f0f4cfc..456248d 100644
 --- a/lib/berkshelf.rb
 +++ b/lib/berkshelf.rb
 @@ -51,7 +51,11 @@ module Berkshelf
@@ -20,7 +20,7 @@ index f0f4cfc..6ce1740 100644
 +      @root ||= Pathname.new(
 +        Dir[
 +          '/usr/share/berkshelf',
-+          File.expand_path('../', File.dirname(__FILE__)))
++          File.expand_path('../', File.dirname(__FILE__))
 +        ].first)
      end
  
diff --git a/debian/patches/0009-Use-better-temporary-path-in-tests.patch b/debian/patches/0009-Use-better-temporary-path-in-tests.patch
index 1e06e8c..7af4896 100644
--- a/debian/patches/0009-Use-better-temporary-path-in-tests.patch
+++ b/debian/patches/0009-Use-better-temporary-path-in-tests.patch
@@ -1,26 +1,12 @@
 From: Hleb Valoshka <375gnu at gmail.com>
-Date: Tue, 18 Oct 2016 23:40:48 +0300
+Date: Tue, 18 Oct 2016 23:59:47 +0300
 Subject: Use better temporary path in tests
 
 This should fix 'gem2deb-test-runner --autopkgtest' run
 ---
- lib/berkshelf.rb             | 2 +-
  spec/support/path_helpers.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/lib/berkshelf.rb b/lib/berkshelf.rb
-index 6ce1740..456248d 100644
---- a/lib/berkshelf.rb
-+++ b/lib/berkshelf.rb
-@@ -54,7 +54,7 @@ module Berkshelf
-       @root ||= Pathname.new(
-         Dir[
-           '/usr/share/berkshelf',
--          File.expand_path('../', File.dirname(__FILE__)))
-+          File.expand_path('../', File.dirname(__FILE__))
-         ].first)
-     end
- 
 diff --git a/spec/support/path_helpers.rb b/spec/support/path_helpers.rb
 index 3d21e22..a07d20b 100644
 --- a/spec/support/path_helpers.rb

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