[DRE-commits] [SCM] ruby-tmail.git branch, master, updated. debian/1.2.7.1-1-9-gd2ff16d

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit d1692d862fa4d1a55746e390dfc2daa27bbc6fe7
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 26 22:25:50 2012 +0200

    Ensure that the tests are actually run, but ignore ruby1.9.1 errors for now

diff --git a/debian/changelog b/debian/changelog
index a25c1bc..6d8c928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,9 @@ ruby-tmail (1.2.7.1-2) UNRELEASED; urgency=low
     - Added myself to uploaders.
     - Set the priority of the transitional packages lib*-ruby to "extra".
     - Replaced conflicts by breaks.
+    - Added a build-depend on ruby-rchardet to be able to run the tests.
   * debian/copyright: fixed to fit the Debian copyright format version 1.0. 
+  * debian/ruby-test-files.yaml: only list the actual test files.
 
  -- Paul van Tilburg <paulvt at debian.org>  Tue, 26 Jun 2012 21:53:25 +0200
 
diff --git a/debian/control b/debian/control
index f861354..1ab32fc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Ondřej Surý <ondrej at debian.org>, akira yamada <akira at debian.org>, Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-rchardet
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-tmail.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-tmail.git;a=summary
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
index f1b2bc6..083d430 100644
--- a/debian/ruby-test-files.yaml
+++ b/debian/ruby-test-files.yaml
@@ -1,54 +1,4 @@
 --- 
-- test/extctrl.rb
-- test/fixtures/apple_unquoted_content_type
-- test/fixtures/inline_attachment.txt
-- test/fixtures/iso_8859_1_email_without_encoding_and_message_id.txt
-- test/fixtures/mailbox
-- test/fixtures/mailbox.zip
-- test/fixtures/mailbox_without_any_from_or_sender
-- test/fixtures/mailbox_without_from
-- test/fixtures/mailbox_without_return_path
-- test/fixtures/marked_as_iso_8859_1_but_it_is_utf_8.txt
-- test/fixtures/marked_as_utf_8_but_it_is_iso_8859_1.txt
-- test/fixtures/raw_attack_email_with_zero_length_whitespace
-- test/fixtures/raw_base64_decoded_string
-- test/fixtures/raw_base64_email
-- test/fixtures/raw_base64_encoded_string
-- test/fixtures/raw_email
-- test/fixtures/raw_email10
-- test/fixtures/raw_email11
-- test/fixtures/raw_email12
-- test/fixtures/raw_email13
-- test/fixtures/raw_email2
-- test/fixtures/raw_email3
-- test/fixtures/raw_email4
-- test/fixtures/raw_email5
-- test/fixtures/raw_email6
-- test/fixtures/raw_email7
-- test/fixtures/raw_email8
-- test/fixtures/raw_email9
-- test/fixtures/raw_email_bad_time
-- test/fixtures/raw_email_double_at_in_header
-- test/fixtures/raw_email_multiple_from
-- test/fixtures/raw_email_only_attachment
-- test/fixtures/raw_email_quoted_with_0d0a
-- test/fixtures/raw_email_reply
-- test/fixtures/raw_email_simple
-- test/fixtures/raw_email_string_in_date_field
-- test/fixtures/raw_email_trailing_dot
-- test/fixtures/raw_email_with_bad_date
-- test/fixtures/raw_email_with_illegal_boundary
-- test/fixtures/raw_email_with_mimepart_without_content_type
-- test/fixtures/raw_email_with_multipart_mixed_quoted_boundary
-- test/fixtures/raw_email_with_nested_attachment
-- test/fixtures/raw_email_with_partially_quoted_subject
-- test/fixtures/raw_email_with_quoted_attachment_filename
-- test/fixtures/raw_email_with_quoted_illegal_boundary
-- test/fixtures/raw_email_with_wrong_splitted_multibyte_encoded_word_subject
-- test/fixtures/the_only_part_is_a_word_document.txt
-- test/fixtures/unquoted_filename_in_attachment
-- test/kcode.rb
-- test/temp_test_one.rb
 - test/test_address.rb
 - test/test_attachments.rb
 - test/test_base64.rb
diff --git a/debian/rules b/debian/rules
index 5c5e88d..98da1ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,12 @@
 #export DH_VERBOSE=1
 #
 # Uncomment to ignore all test failures (but the tests will run anyway)
-export DH_RUBY_IGNORE_TESTS=all
+#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
+export DH_RUBY_IGNORE_TESTS=ruby1.9.1
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

-- 
ruby-tmail.git