[DRE-commits] [ruby-pygments.rb] 04/06: Imported Debian patch 0.5.4~ds1-1.1

[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 35010ac7ae47af4d85f561f862c29d5bc34a6e32
Author: Tomasz Buchert <tomasz.buchert at inria.fr>
Date:   Sat Nov 22 15:18:14 2014 +0100

    Imported Debian patch 0.5.4~ds1-1.1
---
 debian/changelog                             |  7 +++++++
 debian/control                               |  7 ++++---
 debian/patches/0007-Update-test-result.patch | 26 ++++++++++++++++++--------
 debian/source/local-options                  |  1 -
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f53c7de..4fb2823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-pygments.rb (0.5.4~ds1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update the testsuite (Closes: #768615)
+
+ -- Tomasz Buchert <tomasz.buchert at inria.fr>  Sat, 22 Nov 2014 15:18:14 +0100
+
 ruby-pygments.rb (0.5.4~ds1-1) unstable; urgency=low
 
   * Initial release (Closes: #703188)
diff --git a/debian/control b/debian/control
index bf80b2b..f0e024d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: ruby-pygments.rb
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Per Andersson <avtobiff at gmail.com>
+Uploaders: Per Andersson <avtobiff at gmail.com>,
+           Dominique Dumont <dod at debian.org>
 Section: ruby
 Priority: optional
 Build-Depends: debhelper (>= 9),
@@ -11,8 +12,8 @@ Build-Depends: debhelper (>= 9),
                ruby-posix-spawn,
                ruby-yajl
 Standards-Version: 3.9.5
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-pygments.rb.git
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-pygments.rb.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/packages/ruby-pygments.rb.git
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/packages/ruby-pygments.rb.git
 Homepage: http://github.com/tmm1/pygments.rb
 XS-Ruby-Versions: all
 
diff --git a/debian/patches/0007-Update-test-result.patch b/debian/patches/0007-Update-test-result.patch
index 89b7619..314df5a 100644
--- a/debian/patches/0007-Update-test-result.patch
+++ b/debian/patches/0007-Update-test-result.patch
@@ -1,18 +1,28 @@
 Description: Update test result
 Subject: Update test result
- Using old test result.
+ The upstream testsuite is using an embedded pygments version, which
+ at the moment of writing this is 2.0pre. The version in Debian is
+ 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.
 
  Already reported upstream https://github.com/tmm1/pygments.rb/issues/118
 Author: Per Andersson <avtobiff at gmail.com>
 ---
 --- a/test/test_pygments.rb
 +++ b/test/test_pygments.rb
-@@ -32,7 +32,7 @@
-   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_equal 454107, code.bytesize.to_i
+@@ -88,7 +88,7 @@
    end
  
-   def test_returns_nil_on_timeout
+   def test_highlight_works_with_single_character_input
+-    code = P.highlight("a")
++    code = P.highlight("a", :lexer => 'ruby')
+     assert_match 'a</span>', code
+   end
+ 
+@@ -283,5 +283,3 @@
+     assert list['Html'][:aliases].include?('html')
+   end
+ end
+-
+-
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

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