[DRE-commits] [ruby-email-validator] 01/01: Various fixes

[Aurélien Joga]

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

ajoga-guest pushed a commit to branch master
in repository ruby-email-validator.

commit 0eea1c7af3298b6777a12e3c3cfec442bad88694
Author: Aurélien Joga <aurelienjoga at gmail.com>
Date:   Wed Apr 23 14:11:43 2014 +0000

    Various fixes
---
 debian/control                     | 16 ++++++++--------
 debian/copyright                   | 14 +++++++-------
 debian/patches/fix-spec-path.patch | 10 ----------
 debian/patches/series              |  1 -
 debian/ruby-tests.rb               |  4 ++--
 debian/rules                       |  2 +-
 6 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index 4b2151e..6ed2f18 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Aurélien Joga <aurelienjoga at gmail.com>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-rspec, ruby-activemodel-3.2
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-email-validator.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-email-validator.git;a=summary
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.7.5~), rake, ruby-rspec, ruby-activemodel
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-email-validator.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-email-validator.git;a=summary
 Homepage: https://github.com/balexand/email_validator
 XS-Ruby-Versions: all
 
 Package: ruby-email-validator
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-activemodel-3.2
-Description: An email validator for Rails 3+.
- An email validator for Rails 3+. See homepage for details: http://github.com/balexand/email_validator
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-activemodel
+# activemodel (>= 0), rake (>= 0, development), rspec (>= 0, development)
+Description: an email validator for Rails 3+
+ An email validator for ActiveModel.
diff --git a/debian/copyright b/debian/copyright
index e5e30e6..f641656 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,13 @@ Source: https://github.com/balexand/email_validator
 
 Files: *
 Copyright: 2010 - 2014 Brian Alexander <balexand at gmail.com>
-License: MIT
+License: Expat
+
+Files: debian/*
+Copyright: 2014 Aurélien Joga <aurelienjoga at gmail.com>
+License: Expat
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -23,9 +29,3 @@ License: MIT
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2014 Aurélien Joga <aurelienjoga at gmail.com>
-License: GPL-3
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/patches/fix-spec-path.patch b/debian/patches/fix-spec-path.patch
deleted file mode 100644
index bc2b581..0000000
--- a/debian/patches/fix-spec-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: ruby-email-validator-1.4.0/spec/email_validator_spec.rb
-===================================================================
---- ruby-email-validator-1.4.0.orig/spec/email_validator_spec.rb	2014-03-31 21:41:25.176983069 +0000
-+++ ruby-email-validator-1.4.0/spec/email_validator_spec.rb	2014-03-31 21:43:31.533227771 +0000
-@@ -1,4 +1,4 @@
--require 'spec_helper'
-+require './spec/spec_helper.rb'
- 
- class TestUser < TestModel
-   validates :email, :email => true
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 43f5601..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-spec-path.patch
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 95e266a..9fe349b 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,3 +1,3 @@
-$: << 'lib' << '.'
+$: << 'spec'
 require 'spec/email_validator_spec.rb'
-
+require 'rspec/autorun'
diff --git a/debian/rules b/debian/rules
index a5e7dc8..06981cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #
 # 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
+#export DH_RUBY_IGNORE_TESTS=ruby2.0 ruby2.1 require-rubygems
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

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