[DRE-commits] [ruby-gollum-lib] 04/08: use gitlab-markup, relax deps

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-gollum-lib.

commit 28413a6bb99fcbb565c246fadce3d517aaa14d8e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Oct 31 11:28:33 2016 +0530

    use gitlab-markup, relax deps
---
 debian/patches/relax-deps.patch        | 16 ++++++++++++++++
 debian/patches/relax-stringex.patch    |  2 +-
 debian/patches/series                  |  2 ++
 debian/patches/use-gitlab-markup.patch | 13 +++++++++++++
 debian/patches/use-rugged.patch        |  4 ++--
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/patches/relax-deps.patch b/debian/patches/relax-deps.patch
new file mode 100644
index 0000000..c8c175e
--- /dev/null
+++ b/debian/patches/relax-deps.patch
@@ -0,0 +1,16 @@
+Index: ruby-gollum-lib/gemspec.rb
+===================================================================
+--- ruby-gollum-lib.orig/gemspec.rb
++++ ruby-gollum-lib/gemspec.rb
+@@ -26,9 +26,9 @@ def specification(version, default_adapt
+ 
+     s.add_dependency *default_adapter
+     s.add_dependency 'rouge', '~> 1.10'
+-    s.add_dependency 'nokogiri', '~> 1.6.4'
++    s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.4'
+     s.add_dependency 'stringex', '~> 2.5'
+-    s.add_dependency 'sanitize', '~> 2.1.0'
++    s.add_dependency 'sanitize', '~> 2.1'
+     s.add_dependency 'gitlab-markup', '~> 1.5'
+ 
+     s.add_development_dependency 'org-ruby', '~> 0.9.9'
diff --git a/debian/patches/relax-stringex.patch b/debian/patches/relax-stringex.patch
index cb1002a..4b967c5 100644
--- a/debian/patches/relax-stringex.patch
+++ b/debian/patches/relax-stringex.patch
@@ -10,7 +10,7 @@ Index: ruby-gollum-lib/gemspec.rb
 +++ ruby-gollum-lib/gemspec.rb
 @@ -27,7 +27,7 @@ def specification(version, default_adapt
      s.add_dependency *default_adapter
-     s.add_dependency 'rouge', '~> 2.0'
+     s.add_dependency 'rouge', '~> 1.10'
      s.add_dependency 'nokogiri', '~> 1.6.4'
 -    s.add_dependency 'stringex', '~> 2.5.1'
 +    s.add_dependency 'stringex', '~> 2.5'
diff --git a/debian/patches/series b/debian/patches/series
index 8faf39f..d3ce28c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 use-rugged.patch
 relax-stringex.patch
+use-gitlab-markup.patch
+relax-deps.patch
diff --git a/debian/patches/use-gitlab-markup.patch b/debian/patches/use-gitlab-markup.patch
new file mode 100644
index 0000000..9bd87e0
--- /dev/null
+++ b/debian/patches/use-gitlab-markup.patch
@@ -0,0 +1,13 @@
+Index: ruby-gollum-lib/gemspec.rb
+===================================================================
+--- ruby-gollum-lib.orig/gemspec.rb
++++ ruby-gollum-lib/gemspec.rb
+@@ -29,7 +29,7 @@ def specification(version, default_adapt
+     s.add_dependency 'nokogiri', '~> 1.6.4'
+     s.add_dependency 'stringex', '~> 2.5'
+     s.add_dependency 'sanitize', '~> 2.1.0'
+-    s.add_dependency 'github-markup', '~> 1.4.0'
++    s.add_dependency 'gitlab-markup', '~> 1.5'
+ 
+     s.add_development_dependency 'org-ruby', '~> 0.9.9'
+     s.add_development_dependency 'kramdown', '~> 1.6.0'
diff --git a/debian/patches/use-rugged.patch b/debian/patches/use-rugged.patch
index 6954777..292bef7 100644
--- a/debian/patches/use-rugged.patch
+++ b/debian/patches/use-rugged.patch
@@ -16,9 +16,9 @@ Index: ruby-gollum-lib/lib/gollum-lib.rb
 ===================================================================
 --- ruby-gollum-lib.orig/lib/gollum-lib.rb
 +++ ruby-gollum-lib/lib/gollum-lib.rb
-@@ -5,7 +5,7 @@ require 'digest/sha1'
+@@ -4,7 +4,7 @@ require 'digest/md5'
+ require 'digest/sha1'
  require 'ostruct'
- require 'pathname'
  
 -DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit_adapter' : 'grit_adapter'
 +DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit_adapter' : 'rugged_adapter'

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