[DRE-commits] [ruby-mail] 03/09: refreshed 0001-Track-library-version-within-lib.patch

[Caitlin Matos]

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

cm-guest pushed a commit to branch master
in repository ruby-mail.

commit b737360b5518570c9503471e3707714023476f04
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Wed Jul 23 21:19:42 2014 -0400

    refreshed 0001-Track-library-version-within-lib.patch
---
 .../0001-Track-library-version-within-lib.patch    | 30 ++++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-Track-library-version-within-lib.patch b/debian/patches/0001-Track-library-version-within-lib.patch
index e0e1c15..04f2c39 100644
--- a/debian/patches/0001-Track-library-version-within-lib.patch
+++ b/debian/patches/0001-Track-library-version-within-lib.patch
@@ -5,40 +5,36 @@ Subject: Track library version within lib/
 
 It's not safe to expect a relative directory up outside of lib/mail to
 actually contain files we might want to expect to live there. So
-instead of maintaining a lib/VERSION file, simply maintain the version
+instead of maintaining a VERSION file, simply maintain the version
 string within lib/mail/version.rb.
 ---
- lib/VERSION         |    4 ----
+ VERSION	     |    4 ----
  lib/mail/version.rb |   10 +++++-----
  2 files changed, 5 insertions(+), 9 deletions(-)
- delete mode 100644 lib/VERSION
+ delete mode 100644 VERSION
 
-Index: ruby-mail/lib/VERSION
-===================================================================
---- ruby-mail.orig/lib/VERSION	2013-06-03 18:03:17.788964590 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+--- a/VERSION
++++ /dev/null
 @@ -1,4 +0,0 @@
 -major:2
--minor:5
--patch:4
+-minor:6
+-patch:1
 -build:
-Index: ruby-mail/lib/mail/version.rb
-===================================================================
---- ruby-mail.orig/lib/mail/version.rb	2013-06-03 18:03:17.788964590 +0200
-+++ ruby-mail/lib/mail/version.rb	2013-06-03 18:03:17.784964635 +0200
-@@ -3,11 +3,11 @@
+--- a/lib/mail/version.rb
++++ b/lib/mail/version.rb
+@@ -3,11 +3,11 @@ module Mail
    module VERSION
      
      version = {}
--    File.read(File.join(File.dirname(__FILE__), '../', 'VERSION')).each_line do |line|
+-    File.read(File.join(File.dirname(__FILE__), '../', '../', 'VERSION')).each_line do |line|
 -      type, value = line.chomp.split(":")
 -      next if type =~ /^\s+$/  || value =~ /^\s+$/
 -      version[type] = value
 -    end
 +
 +    version['major'] = "2"
-+    version['minor'] = "5"
-+    version['patch'] = "4"
++    version['minor'] = "6"
++    version['patch'] = "1"
 +    version['build'] = nil
      
      MAJOR = version['major']

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