[DRE-commits] [ruby-pygments.rb] 06/06: update patch to fix FTBFS

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-pygments.rb.

commit 64431ae8479df8887150e1581b3aaa1eb2dbc3a9
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Feb 7 13:19:46 2015 -0200

    update patch to fix FTBFS
---
 debian/changelog                             | 10 ++++++++++
 debian/patches/0007-Update-test-result.patch | 15 +++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de58245..eb847f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-pygments.rb (0.5.4~ds1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Reverted the previous upload completely, and acknowledged the NMU in
+    0.5.4~ds1-1.1 by Tomasz Buchert (Closes: #768615).
+  * Update debian/patches/0007-Update-test-result.patch to fix current FTBFS
+    (and properly Closes: #775631).
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 07 Feb 2015 13:17:48 -0200
+
 ruby-pygments.rb (0.5.4~ds1-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/0007-Update-test-result.patch b/debian/patches/0007-Update-test-result.patch
index 314df5a..d36d9c1 100644
--- a/debian/patches/0007-Update-test-result.patch
+++ b/debian/patches/0007-Update-test-result.patch
@@ -5,13 +5,24 @@ Subject: Update test result
  slightly different (2.0rc1) and there are some minor mismatches. Most
  importantly, the Debian version is unable to find a good lexer for
  ambigous code "a". It is fixed by forcing it to use Ruby lexer.
+ Also the number of bytes produced cannot be guaranteed.
 
  Already reported upstream https://github.com/tmm1/pygments.rb/issues/118
 Author: Per Andersson <avtobiff at gmail.com>
+Reviewed-by: Antonio Terceiro <terceiro at debian.org>
 ---
 --- a/test/test_pygments.rb
 +++ b/test/test_pygments.rb
-@@ -88,7 +88,7 @@
+@@ -32,7 +32,7 @@ class PygmentsHighlightTest < Test::Unit
+   def test_highlight_works_with_larger_files
+     code = P.highlight(REDIS_CODE)
+     assert_match 'used_memory_peak_human', code
+-    assert_equal 455203, code.bytesize.to_i
++    assert code.bytesize.to_i > 450_000
+   end
+ 
+   def test_returns_nil_on_timeout
+@@ -88,7 +88,7 @@ class PygmentsHighlightTest < Test::Unit
    end
  
    def test_highlight_works_with_single_character_input
@@ -20,7 +31,7 @@ Author: Per Andersson <avtobiff at gmail.com>
      assert_match 'a</span>', code
    end
  
-@@ -283,5 +283,3 @@
+@@ -283,5 +283,3 @@ class PygmentsConfigTest < Test::Unit::T
      assert list['Html'][:aliases].include?('html')
    end
  end

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