uncommitted - ruby-pygments.rb

Ready changes

Summary

Import uploads missing from VCS:

Diff

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cf6f400
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/.idea/
+/Gemfile.lock
+/pkg/
+/tmp
+*.pyc
diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 7560f16..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-.gitattributes export-ignore
-gbp.conf export-ignore
-salsa-ci.yml export-ignore
diff --git a/debian/changelog b/debian/changelog
index 34cf687..91e3e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ruby-pygments.rb (2.3.0+ds-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch for pygments 2.24 (Closes: #1028620)
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 20 Jan 2023 09:51:53 +0100
+
+ruby-pygments.rb (2.3.0+ds-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * test: update for latest pygments (Closes: #1006047)
+
+ -- Paul Gevers <elbrus@debian.org>  Sun, 13 Mar 2022 12:31:00 +0100
+
 ruby-pygments.rb (2.3.0+ds-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0016-Adopt-to-pygments-2.24.patch b/debian/patches/0016-Adopt-to-pygments-2.24.patch
new file mode 100644
index 0000000..ed8ff62
--- /dev/null
+++ b/debian/patches/0016-Adopt-to-pygments-2.24.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <jspricke@debian.org>
+Date: Fri, 20 Jan 2023 09:04:03 +0100
+Subject: Adopt to pygments 2.24
+
+---
+ test/test_pygments.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_pygments.rb b/test/test_pygments.rb
+index b8c0292..25bd75f 100644
+--- a/test/test_pygments.rb
++++ b/test/test_pygments.rb
+@@ -29,7 +29,7 @@ class PygmentsHighlightTest < Test::Unit::TestCase
+     code = P.highlight(RUBY_CODE)
+     assert_match '<span class="ch">#!/usr/bin/ruby</span>', code
+     assert_equal %(<div class="highlight"><pre><span></span><span class="ch">#!/usr/bin/ruby</span>
+-<span class="nb">puts</span> <span class="s1">&#39;foo&#39;</span>
++<span class="nb">puts</span><span class=\"w\"> </span><span class="s1">&#39;foo&#39;</span>
+ </pre></div>), code
+   end
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ea926c8..e70033a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 0010-Disable-the-test-expecting-a-timeout.patch
 0013-test-drop-test-that-depends-on-Python-internals.patch
 0014-no-relative-path-to-mentos-py.patch
+test-update-for-latest-pygments.patch
+0016-Adopt-to-pygments-2.24.patch
diff --git a/debian/patches/test-update-for-latest-pygments.patch b/debian/patches/test-update-for-latest-pygments.patch
new file mode 100644
index 0000000..51dd7a4
--- /dev/null
+++ b/debian/patches/test-update-for-latest-pygments.patch
@@ -0,0 +1,38 @@
+From: Paul Gevers <elbrus@debian.org>
+Date: Sun, 13 Mar 2022 12:29:11 +0100
+X-Dgit-Generated: 2.3.0+ds-2.1 5528a716afc2e62e4fc6377770c623c238e02259
+Subject: test: update for latest pygments
+
+Closes: #1006047
+
+---
+
+--- ruby-pygments.rb-2.3.0+ds.orig/test/test_pygments.rb
++++ ruby-pygments.rb-2.3.0+ds/test/test_pygments.rb
+@@ -71,7 +71,7 @@ class PygmentsHighlightTest < Test::Unit
+ 
+   def test_highlight_formatter_bbcode
+     code = P.highlight(RUBY_CODE, formatter: 'bbcode')
+-    assert_match 'color=#408080][i]#!/usr/bin/ruby[/i]', code
++    assert_match 'color=#3D7B7B][i]#!/usr/bin/ruby[/i]', code
+   end
+ 
+   def test_highlight_formatter_terminal
+@@ -181,7 +181,7 @@ class PygmentsLexerClassTest < Test::Uni
+     assert_equal P::Lexer['PHP'], P::Lexer.find_by_extname('.php4')
+     assert_equal P::Lexer['PHP'], P::Lexer.find_by_extname('.php5')
+     assert_equal P::Lexer['Groff'], P::Lexer.find_by_extname('.1')
+-    assert_equal P::Lexer['Groff'], P::Lexer.find_by_extname('.3')
++#    assert_equal P::Lexer['Groff'], P::Lexer.find_by_extname('.3')
+     assert_equal P::Lexer['C'], P::Lexer.find_by_extname('.c')
+     assert_equal P::Lexer['Python'], P::Lexer.find_by_extname('.py')
+     assert_equal P::Lexer['Java'], P::Lexer.find_by_extname('.java')
+@@ -213,7 +213,7 @@ class PygmentsCssTest < Test::Unit::Test
+   end
+ 
+   def test_css_default
+-    assert_match '.c { color: #408080; font-style: italic }', P.css
++    assert_match '.c { color: #3D7B7B; font-style: italic }', P.css
+   end
+ 
+   def test_css_colorful

Run locally

More details

Full run details