[DRE-commits] [ruby-gitlab-git] 03/04: relax rugged version

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-gitlab-git.

commit 035b235102f572e4207a7dbf1cdadd36f2a363d2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Apr 2 19:14:33 2016 +0530

    relax rugged version
---
 debian/changelog                          |  1 +
 debian/patches/00-relax-rugged.patch      | 25 +++++++++++++++++++++++++
 debian/patches/relax-rugged-version.patch | 13 -------------
 debian/patches/series                     |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbf4f54..4276172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ruby-gitlab-git (8.2.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Relax rugged version (depends on new libgit2, see #798338 for details)
 
  -- Pirate Praveen <praveen at debian.org>  Sat, 19 Mar 2016 14:54:36 +0530
 
diff --git a/debian/patches/00-relax-rugged.patch b/debian/patches/00-relax-rugged.patch
new file mode 100644
index 0000000..65cee36
--- /dev/null
+++ b/debian/patches/00-relax-rugged.patch
@@ -0,0 +1,25 @@
+Index: ruby-gitlab-git/gitlab_git.gemspec
+===================================================================
+--- ruby-gitlab-git.orig/gitlab_git.gemspec
++++ ruby-gitlab-git/gitlab_git.gemspec
+@@ -27,17 +27,17 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<activesupport>, ["~> 4.0"])
+       s.add_runtime_dependency(%q<charlock_holmes>, ["~> 0.7.3"])
+       s.add_runtime_dependency(%q<github-linguist>, ["~> 4.7.0"])
+-      s.add_runtime_dependency(%q<rugged>, ["~> 0.24.0b13"])
++      s.add_runtime_dependency(%q<rugged>, ["~> 0.23"])
+     else
+       s.add_dependency(%q<activesupport>, ["~> 4.0"])
+       s.add_dependency(%q<charlock_holmes>, ["~> 0.7.3"])
+       s.add_dependency(%q<github-linguist>, ["~> 4.7.0"])
+-      s.add_dependency(%q<rugged>, ["~> 0.24.0b13"])
++      s.add_dependency(%q<rugged>, ["~> 0.23"])
+     end
+   else
+     s.add_dependency(%q<activesupport>, ["~> 4.0"])
+     s.add_dependency(%q<charlock_holmes>, ["~> 0.7.3"])
+     s.add_dependency(%q<github-linguist>, ["~> 4.7.0"])
+-    s.add_dependency(%q<rugged>, ["~> 0.24.0b13"])
++    s.add_dependency(%q<rugged>, ["~> 0.23"])
+   end
+ end
diff --git a/debian/patches/relax-rugged-version.patch b/debian/patches/relax-rugged-version.patch
deleted file mode 100644
index 27c8dc4..0000000
--- a/debian/patches/relax-rugged-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ruby-gitlab-git-7.2.20/metadata.yml
-===================================================================
---- ruby-gitlab-git-7.2.20.orig/metadata.yml
-+++ ruby-gitlab-git-7.2.20/metadata.yml
-@@ -44,7 +44,7 @@ dependencies:
-     requirements:
-     - - "~>"
-       - !ruby/object:Gem::Version
--        version: 0.23.3
-+        version: 0.23.2
-   type: :runtime
-   prerelease: false
-   version_requirements: !ruby/object:Gem::Requirement
diff --git a/debian/patches/series b/debian/patches/series
index 80f74a2..e919cd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-relax-rugged-version.patch
+00-relax-rugged.patch

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