On Fri, Feb 06, 2015 at 10:59:43PM +0100, Niels Thykier wrote: > Control: tags -1 moreinfo > > On 2015-02-05 14:42, Antonio Terceiro wrote: > > Package: release.debian.org > > Severity: normal > > User: [email protected] > > Usertags: unblock > > > > Please unblock package ruby-pygments.rb > > > > This release fixes RC bug #775631 and prevents both this package and > > reverse dependencies from being removed from jessie. > > > > the diff against the package in testing is attached. > > > > unblock ruby-pygments.rb/0.5.4~ds1-2 > > > > [...] > > The upload of ruby-pygements.rb/0.5.4~ds1-2 contains other changes than > the ones listed in your debdiff. In particular: > > * It drop of NMU version 0.5.4~ds1-1.1. > * It causes #768615 to be reopened (due to the above). Even if the > changes from 0.5.4~ds1-2 *also* fixes #768615, the BTS thinks the > upload is a regression, since 0.5.4~ds1-2 removes the "Closes" for > the #768615 bug[1]. > * It contains to d/control not mentioned in the changelog and not > listed in the debdiff in this bug. > > Please resolve these issues, so that we can accept the changes that > fixes #775631. Argh, sorry for the mess. I have just uploaded -3 fixing this, with the attached debdiff. -- Antonio Terceiro <[email protected]>
diff -Nru ruby-pygments.rb-0.5.4~ds1/debian/changelog ruby-pygments.rb-0.5.4~ds1/debian/changelog
--- ruby-pygments.rb-0.5.4~ds1/debian/changelog 2014-11-22 14:17:34.000000000 -0200
+++ ruby-pygments.rb-0.5.4~ds1/debian/changelog 2015-02-07 13:28:09.000000000 -0200
@@ -1,3 +1,26 @@
+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 <[email protected]> Sat, 07 Feb 2015 13:17:48 -0200
+
+ruby-pygments.rb (0.5.4~ds1-2) unstable; urgency=medium
+
+ * Team upload
+ * fix tests (Closes: #775631):
+ - test_highlight_works_with_larger_files: instead of testing for an exact
+ amount of bytes, pass with there are more than 400,000 of them.
+ (debian/patches/0007-Update-test-result.patch)
+ - test_highlight_works_with_single_character_input: removed, since the
+ underlying Python code does not support that use case.
+ (debian/patches/0008-Drop-unfeasible-test.patch)
+
+ -- Antonio Terceiro <[email protected]> Wed, 04 Feb 2015 19:43:57 -0200
+
ruby-pygments.rb (0.5.4~ds1-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru ruby-pygments.rb-0.5.4~ds1/debian/patches/0007-Update-test-result.patch ruby-pygments.rb-0.5.4~ds1/debian/patches/0007-Update-test-result.patch
--- ruby-pygments.rb-0.5.4~ds1/debian/patches/0007-Update-test-result.patch 2014-11-22 14:17:34.000000000 -0200
+++ ruby-pygments.rb-0.5.4~ds1/debian/patches/0007-Update-test-result.patch 2015-02-07 13:28:09.000000000 -0200
@@ -5,13 +5,24 @@
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 <[email protected]>
+Reviewed-by: Antonio Terceiro <[email protected]>
---
--- 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 @@
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
Attachment:
signature.asc
Description: Digital signature