[DRE-commits] [ruby-zip] 03/05: refresh patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-zip.

commit 8cea431dfd39854d714706040dc4e847cac31d1d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 09:56:11 2015 +0530

    refresh patch
---
 debian/changelog                         |  1 +
 debian/patches/fix-random-tests-failures | 52 +++++---------------------------
 2 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18c0d46..17945d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-zip (1.1.7-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Refresh patch, remove already applied hunks.
 
  -- Pirate Praveen <praveen at debian.org>  Sat, 29 Aug 2015 09:52:12 +0530
 
diff --git a/debian/patches/fix-random-tests-failures b/debian/patches/fix-random-tests-failures
index afc22d5..2bbadad 100644
--- a/debian/patches/fix-random-tests-failures
+++ b/debian/patches/fix-random-tests-failures
@@ -3,11 +3,13 @@ Description: Fix random tests failures
 Origin: upstream, https://github.com/rubyzip/rubyzip/commit/96f84aee4c575a0c886462abb809ef47e2866f94
 Last-Update: 2014-09-23
 
---- ruby-zip-1.1.6.orig/test/central_directory_test.rb
-+++ ruby-zip-1.1.6/test/central_directory_test.rb
-@@ -2,6 +2,10 @@ require 'test_helper'
- 
- class ZipCentralDirectoryTest < MiniTest::Unit::TestCase
+Index: ruby-zip/test/central_directory_test.rb
+===================================================================
+--- ruby-zip.orig/test/central_directory_test.rb
++++ ruby-zip/test/central_directory_test.rb
+@@ -6,6 +6,10 @@ class ZipCentralDirectoryTest < MiniTest
+     ::Zip.reset!
+   end
  
 +  def teardown
 +    ::Zip.reset!
@@ -16,43 +18,3 @@ Last-Update: 2014-09-23
    def test_read_from_stream
      ::File.open(TestZipFile::TEST_ZIP2.zip_name, "rb") {
          |zipFile|
---- ruby-zip-1.1.6.orig/test/entry_set_test.rb
-+++ ruby-zip-1.1.6/test/entry_set_test.rb
-@@ -14,6 +14,10 @@ class ZipEntrySetTest < MiniTest::Unit::
-     @zipEntrySet = ::Zip::EntrySet.new(ZIP_ENTRIES)
-   end
- 
-+  def teardown
-+    ::Zip.reset!
-+  end
-+
-   def test_include
-     assert(@zipEntrySet.include?(ZIP_ENTRIES.first))
-     assert(!@zipEntrySet.include?(::Zip::Entry.new("different.zip", "different", "aComment")))
---- ruby-zip-1.1.6.orig/test/settings_test.rb
-+++ ruby-zip-1.1.6/test/settings_test.rb
-@@ -12,6 +12,10 @@ class ZipSettingsTest < MiniTest::Unit::
-     File.delete(TEST_OUT_NAME) if File.exist? TEST_OUT_NAME
-   end
- 
-+  def teardown
-+    ::Zip.reset!
-+  end
-+
-   def open_zip(&aProc)
-     assert(aProc != nil)
-     ::Zip::File.open(TestZipFile::TEST_ZIP4.zip_name, &aProc)
---- ruby-zip-1.1.6.orig/test/zip64_full_test.rb
-+++ ruby-zip-1.1.6/test/zip64_full_test.rb
-@@ -8,6 +8,11 @@ if ENV['FULL_ZIP64_TEST']
- # this test does not, of course, run with the normal unit tests! ;)
- 
-   class Zip64FullTest < MiniTest::Unit::TestCase
-+
-+    def teardown
-+      ::Zip.reset!
-+    end
-+
-     def prepareTestFile(test_filename)
-       ::File.delete(test_filename) if ::File.exist?(test_filename)
-       return test_filename

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