[DRE-commits] [ruby-liquid] 03/04: Remove already applied patch on new upstream version

[Lucas Moura]

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

lucasmoura-guest pushed a commit to branch master
in repository ruby-liquid.

commit 6de83ec5645fe265c435d253dafd9dc380512568
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Sun Apr 3 23:46:34 2016 -0300

    Remove already applied patch on new upstream version
---
 debian/changelog                           |  1 +
 debian/patches/series                      |  1 -
 debian/patches/timezone_test_failure.patch | 42 ------------------------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index edf5014..59b0bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-liquid (3.0.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release 
+  * Remove already applied patch on new upstream version
 
  -- Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>  Sun, 03 Apr 2016 23:41:50 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 7d3345a..3766f60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 no_relative_path_in_require.patch
-timezone_test_failure.patch
diff --git a/debian/patches/timezone_test_failure.patch b/debian/patches/timezone_test_failure.patch
deleted file mode 100644
index 1f0b124..0000000
--- a/debian/patches/timezone_test_failure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Fix a timezone test failure.
-Author: Dylan Thacker-Smith <Dylan.Smith at shopify.com>
-Origin: upstream,https://github.com/Shopify/liquid/commit/cd0c5e954cef2ae3f03cfab88726c16e2b6741db.patch
-Reviewed-By: Cédric Boutillier <boutil at debian.org>
-Bug: https://github.com/Shopify/liquid/issues/630
-Bug-Debian: https://bugs.debian.org/788694
-Last-Update: 2015-07-23
-
----
- test/integration/standard_filter_test.rb | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
---- a/test/integration/standard_filter_test.rb
-+++ b/test/integration/standard_filter_test.rb
-@@ -252,8 +252,10 @@
- 
-     assert_equal nil, @filters.date(nil, "%B")
- 
--    assert_equal "07/05/2006", @filters.date(1152098955, "%m/%d/%Y")
--    assert_equal "07/05/2006", @filters.date("1152098955", "%m/%d/%Y")
-+    with_timezone("UTC") do
-+      assert_equal "07/05/2006", @filters.date(1152098955, "%m/%d/%Y")
-+      assert_equal "07/05/2006", @filters.date("1152098955", "%m/%d/%Y")
-+    end
-   end
- 
-   def test_first_last
-@@ -376,4 +378,14 @@
-   def test_cannot_access_private_methods
-     assert_template_result('a',"{{ 'a' | to_number }}")
-   end
-+
-+  private
-+
-+  def with_timezone(tz)
-+    old_tz = ENV['TZ']
-+    ENV['TZ'] = tz
-+    yield
-+  ensure
-+    ENV['TZ'] = old_tz
-+  end
- end # StandardFiltersTest

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