[DRE-commits] [diaspora] 04/04: tag patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit f4e69b296e161b9afce7bee87b65779cf74c39ce
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jul 9 23:13:32 2016 +0530

    tag patches
---
 debian/patches/002-remove-development-test-from-gemfile.patch | 4 ++++
 debian/patches/007-loosen-roxml-version.patch                 | 2 ++
 debian/patches/030-loosen-tiny-versions.patch                 | 2 ++
 debian/patches/031-embedded-gems.patch                        | 2 ++
 debian/patches/033-relax-rails-minor-version.patch            | 2 ++
 debian/patches/043-dont-do-git-checks.patch                   | 2 ++
 debian/patches/060-relax-devise.patch                         | 2 ++
 debian/patches/061-remove-diaspora-vines.patch                | 2 ++
 debian/patches/062-lower-jquery-rails.patch                   | 2 ++
 9 files changed, 20 insertions(+)

diff --git a/debian/patches/002-remove-development-test-from-gemfile.patch b/debian/patches/002-remove-development-test-from-gemfile.patch
index 7363025..4a488b9 100644
--- a/debian/patches/002-remove-development-test-from-gemfile.patch
+++ b/debian/patches/002-remove-development-test-from-gemfile.patch
@@ -1,3 +1,7 @@
+Description: Workaround for bundler
+ bundler can't ignore groups when --local is specified for bundle install
+Bug: https://github.com/bundler/bundler/issues/4023
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
index 136c461..7bfd946 100644
--- a/debian/patches/007-loosen-roxml-version.patch
+++ b/debian/patches/007-loosen-roxml-version.patch
@@ -1,3 +1,5 @@
+debian has a newer roxml
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 22bd823..f959177 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -1,3 +1,5 @@
+relax dependecies
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
index 61f5f05..7ea2d4b 100644
--- a/debian/patches/031-embedded-gems.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -1,3 +1,5 @@
+debian has an incompatible version packaged
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/033-relax-rails-minor-version.patch b/debian/patches/033-relax-rails-minor-version.patch
index c1431c2..be545e5 100644
--- a/debian/patches/033-relax-rails-minor-version.patch
+++ b/debian/patches/033-relax-rails-minor-version.patch
@@ -1,3 +1,5 @@
+allow newer rails patch releases
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/043-dont-do-git-checks.patch b/debian/patches/043-dont-do-git-checks.patch
index dcd8713..f1bc532 100644
--- a/debian/patches/043-dont-do-git-checks.patch
+++ b/debian/patches/043-dont-do-git-checks.patch
@@ -1,3 +1,5 @@
+don't fail when not a git repo
+
 Index: diaspora/script/server
 ===================================================================
 --- diaspora.orig/script/server
diff --git a/debian/patches/060-relax-devise.patch b/debian/patches/060-relax-devise.patch
index 3afc088..58a547e 100644
--- a/debian/patches/060-relax-devise.patch
+++ b/debian/patches/060-relax-devise.patch
@@ -1,3 +1,5 @@
+gitlab needs device 4.x
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/061-remove-diaspora-vines.patch b/debian/patches/061-remove-diaspora-vines.patch
index dfc269a..6ae6af8 100644
--- a/debian/patches/061-remove-diaspora-vines.patch
+++ b/debian/patches/061-remove-diaspora-vines.patch
@@ -1,3 +1,5 @@
+vines is optional
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
diff --git a/debian/patches/062-lower-jquery-rails.patch b/debian/patches/062-lower-jquery-rails.patch
index 4f3170f..0cb3f0b 100644
--- a/debian/patches/062-lower-jquery-rails.patch
+++ b/debian/patches/062-lower-jquery-rails.patch
@@ -1,3 +1,5 @@
+jquery is backword compatible
+
 Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile

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