[DRE-commits] [SCM] ruby-mail.git branch, master, updated. debian/2.4.1-2-5-gb0eb802

[Carl Worth]

The following commit has been merged in the master branch:
commit a42c7881c9238d530378619ca0b0867f53dd556a
Merge: d9c5e58c2cdb30d7c9086ecdb1e5addce0fbf868 4891a6470d99503f5698c67ad2092c465b1e12b6
Author: Carl Worth <cworth at debian.org>
Date:   Tue Mar 6 18:24:40 2012 -0800

    Merge version patch into master
    
    Now that we've patched the VERSION file out of the upstream source, we
    no longer need to delete it while packaging.

diff --combined debian/.git-dpm
index c0a0d28,0000000..2fbd0ae
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 5b667630e10154dc30ed6a8649f3a6acebb1a608
- 5b667630e10154dc30ed6a8649f3a6acebb1a608
++4891a6470d99503f5698c67ad2092c465b1e12b6
++4891a6470d99503f5698c67ad2092c465b1e12b6
 +5b667630e10154dc30ed6a8649f3a6acebb1a608
 +5b667630e10154dc30ed6a8649f3a6acebb1a608
 +ruby-mail_2.4.1.orig.tar.gz
 +bdcba3f8b9a97e03ac72b02354368438a77aad35
 +675353
diff --combined debian/changelog
index 96181a6,0000000..c7ea3d2
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,0 +1,22 @@@
++ruby-mail (2.4.1-3) UNRELEASED; urgency=low
++
++  * Fix bug in Mail::Version introduced by packaging.
++
++ -- Carl Worth <cworth at debian.org>  Tue, 06 Mar 2012 18:26:07 -0800
++
 +ruby-mail (2.4.1-2) unstable; urgency=low
 +
 +  * control: Add Build-Depends on ruby-mime-types and ruby-treetop.
 +  * control: Drop dependency on ruby-i18n
 +  * debian: Force UTF-8 encoding when running tests.
 +
 + -- Carl Worth <cworth at debian.org>  Mon, 05 Mar 2012 17:17:01 -0800
 +
 +ruby-mail (2.4.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #582594)
 +  * debian: Package the README file.
 +  * debian: Prevent installation of unwanted files.
 +  * watch: Update to point to tar file from github
 +
 + -- Carl Worth <cworth at debian.org>  Fri, 02 Mar 2012 15:21:31 -0800
diff --combined debian/patches/0001-Track-library-version-within-lib.patch
index 0000000,0000000..27cb335
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Track-library-version-within-lib.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 4891a6470d99503f5698c67ad2092c465b1e12b6 Mon Sep 17 00:00:00 2001
++From: Carl Worth <cworth at debian.org>
++Date: Tue, 6 Mar 2012 18:00:54 -0800
++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
++string within lib/mail/version.rb.
++---
++ lib/VERSION         |    4 ----
++ lib/mail/version.rb |   10 +++++-----
++ 2 files changed, 5 insertions(+), 9 deletions(-)
++ delete mode 100644 lib/VERSION
++
++diff --git a/lib/VERSION b/lib/VERSION
++deleted file mode 100644
++index d849df3..0000000
++--- a/lib/VERSION
+++++ /dev/null
++@@ -1,4 +0,0 @@
++-major:2
++-minor:4
++-patch:1
++-build:
++diff --git a/lib/mail/version.rb b/lib/mail/version.rb
++index 2b70bd1..4aaca0a 100644
++--- 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|
++-      type, value = line.chomp.split(":")
++-      next if type =~ /^\s+$/  || value =~ /^\s+$/
++-      version[type] = value
++-    end
+++
+++    version['major'] = "2"
+++    version['minor'] = "4"
+++    version['patch'] = "1"
+++    version['build'] = nil
++     
++     MAJOR = version['major']
++     MINOR = version['minor']
diff --combined debian/patches/series
index 0000000,0000000..8f35f4c
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Track-library-version-within-lib.patch
diff --combined debian/rules
index 9f93cfb,0000000..88bef6d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,23 -1,0 +1,22 @@@
 +#!/usr/bin/make -f
 +#export DH_VERBOSE=1
 +#
 +# Uncomment to ignore all test failures (but the tests will run anyway)
 +#export DH_RUBY_IGNORE_TESTS=all
 +#
 +# Uncomment to ignore some test failures (but the tests will run anyway).
 +# Valid values:
 +#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
 +#
 +# If you need to specify the .gemspec (eg there is more than one)
 +#export DH_RUBY_GEMSPEC=gem.gemspec
 +
 +%:
 +	dh $@ --buildsystem=ruby --with ruby
 +
 +# After installing, delete a few files that we really don't want installed.
 +override_dh_auto_install:
 +	dh_auto_install
- 	rm debian/ruby-mail/usr/lib/ruby/vendor_ruby/VERSION
 +	rm debian/ruby-mail/usr/lib/ruby/vendor_ruby/tasks/treetop.rake
 +	rm debian/ruby-mail/usr/lib/ruby/vendor_ruby/tasks/corpus.rake
 +	rmdir debian/ruby-mail/usr/lib/ruby/vendor_ruby/tasks

-- 
ruby-mail.git