[DRE-commits] [SCM] ruby-pygments.rb.git branch, master, updated. upstream/0.4.2_git.20130316.f82642a-12-gf9a3a30

[Per Andersson]

The following commit has been merged in the master branch:
commit f9a3a303e9281f38fb14f09908091423cec49c1d
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Jun 6 00:03:20 2013 +0200

    Update patch series
    
    Include previously failing test case.

diff --git a/debian/patches/0001-Remove-failing-test-case.patch b/debian/patches/0001-Remove-failing-test-case.patch
deleted file mode 100644
index 75a6157..0000000
--- a/debian/patches/0001-Remove-failing-test-case.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sat, 16 Mar 2013 12:17:40 +0100
-Subject: Remove failing test case
-
----
- test/test_pygments.rb |   11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/test/test_pygments.rb b/test/test_pygments.rb
-index 4904a49..32d35e9 100644
---- a/test/test_pygments.rb
-+++ b/test/test_pygments.rb
-@@ -265,11 +265,12 @@ class PygmentsConfigTest < Test::Unit::TestCase
-     assert list['Ruby'][:aliases].include?('duby')
-   end
- 
--  def test_formatters
--    list = P.formatters
--    assert list.has_key?('Html')
--    assert list['Html'][:aliases].include?('html')
--  end
-+# Fails for some weird reason.
-+#  def test_formatters
-+#    list = P.formatters
-+#    assert list.has_key?('Html')
-+#    assert list['Html'][:aliases].include?('html')
-+#  end
- end
- 
- 
diff --git a/debian/patches/0002-Remove-gemspec-git-ls-files.patch b/debian/patches/0001-Remove-gemspec-git-ls-files.patch
similarity index 100%
rename from debian/patches/0002-Remove-gemspec-git-ls-files.patch
rename to debian/patches/0001-Remove-gemspec-git-ls-files.patch
diff --git a/debian/patches/0003-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch b/debian/patches/0002-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
similarity index 98%
rename from debian/patches/0003-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
rename to debian/patches/0002-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
index f282c68..8251fa8 100644
--- a/debian/patches/0003-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
+++ b/debian/patches/0002-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
@@ -36,7 +36,7 @@ index c0d6e88..7ee74a9 100755
  import pygments
  from pygments import lexers, formatters, styles, filters
 diff --git a/lib/pygments/popen.rb b/lib/pygments/popen.rb
-index de72f87..8b0af06 100644
+index 1bb2c06..cc7ac8b 100644
 --- a/lib/pygments/popen.rb
 +++ b/lib/pygments/popen.rb
 @@ -19,7 +19,7 @@ module Pygments
diff --git a/debian/patches/0004-Conditional-use-of-lexers-file-path.patch b/debian/patches/0003-Conditional-use-of-lexers-file-path.patch
similarity index 93%
rename from debian/patches/0004-Conditional-use-of-lexers-file-path.patch
rename to debian/patches/0003-Conditional-use-of-lexers-file-path.patch
index 2de2019..794a8fa 100644
--- a/debian/patches/0004-Conditional-use-of-lexers-file-path.patch
+++ b/debian/patches/0003-Conditional-use-of-lexers-file-path.patch
@@ -8,10 +8,10 @@ Use upstream file path during build, use shipped file once installed.
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/lib/pygments/popen.rb b/lib/pygments/popen.rb
-index 8b0af06..77f00f1 100644
+index cc7ac8b..eb3cb78 100644
 --- a/lib/pygments/popen.rb
 +++ b/lib/pygments/popen.rb
-@@ -110,7 +110,10 @@ module Pygments
+@@ -119,7 +119,10 @@ module Pygments
      # Returns an array of lexers
      def lexers
        begin
diff --git a/debian/patches/series b/debian/patches/series
index ec2de9d..2cfae36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Remove-failing-test-case.patch
-0002-Remove-gemspec-git-ls-files.patch
-0003-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
-0004-Conditional-use-of-lexers-file-path.patch
+0001-Remove-gemspec-git-ls-files.patch
+0002-Don-t-set-PYGMENTS_PATH-and-remove-sys.path-appends.patch
+0003-Conditional-use-of-lexers-file-path.patch

-- 
ruby-pygments.rb.git