[DRE-commits] [nanoc] 03/03: Depend on ruby-rouge >= 2 now it is in the archive and drop test modification for older version

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit 8dda0a4b078e688c06157ca5896236619b4659e1
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jul 3 19:39:15 2016 +0200

    Depend on ruby-rouge >= 2 now it is in the archive and drop test modification for older version
---
 debian/changelog               |  5 +++--
 debian/control                 |  3 ++-
 debian/patches/rouge-1.x.patch | 16 ----------------
 debian/patches/series          |  1 -
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fab878..a34502a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 nanoc (4.2.3-1) unstable; urgency=medium
 
   * Imported Upstream version 4.2.3
-  * Imported Upstream version 4.2.3
-
+  * Depend on ruby-rouge >= 2 now it is in the archive
+    and drop test modification for older version
+  
  -- Cédric Boutillier <boutil at debian.org>  Sun, 03 Jul 2016 18:50:55 +0200
 
 nanoc (4.2.2-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 37e4980..41ddb0f 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: asciidoc,
                ruby-rack,
                ruby-rdiscount,
                ruby-redcloth,
+               ruby-rouge (>= 2~),
                ruby-rubypants,
                ruby-sass (>= 3.2.2~),
                ruby-slim,
@@ -67,7 +68,7 @@ Recommends: asciidoc,
             ruby-nokogiri,
             ruby-rdiscount,
             ruby-redcloth,
-            ruby-rouge,
+            ruby-rouge (>= 2~),
             ruby-rubypants,
             ruby-sass (>= 3.2.2~),
             ruby-slim,
diff --git a/debian/patches/rouge-1.x.patch b/debian/patches/rouge-1.x.patch
deleted file mode 100644
index e3528d1..0000000
--- a/debian/patches/rouge-1.x.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: undo some test adaptation for rouge 2.0
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2016-07-02
-
---- a/test/filters/test_colorize_syntax.rb
-+++ b/test/filters/test_colorize_syntax.rb
-@@ -406,7 +406,7 @@
- EOS
-       expected_output = <<EOS
- before
--<pre><code class=\"language-ruby\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
-+<pre><code class=\"language-ruby highlight\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
-   <span class=\"k\">end</span></code></pre>
- after
- EOS
diff --git a/debian/patches/series b/debian/patches/series
index c3a9fa0..ce10b99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ set-load_paths-for-sass-tests.patch
 filter_out_nil_gemspec.patch
 encoding.patch
 skip_tests_autopkgtest.patch
-rouge-1.x.patch

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