[DRE-commits] [diaspora] 05/06: 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 e44b17215646dc24c249b90fd02a4176e9ed166a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jan 13 13:27:19 2017 +0530

    tag patches
---
 debian/patches/0100-set-rails-root.patch | 2 ++
 debian/patches/0120-jquery-ui-6.patch    | 2 ++
 debian/patches/051-relax-eye.patch       | 2 ++
 debian/patches/060-use-db-env.patch      | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/debian/patches/0100-set-rails-root.patch b/debian/patches/0100-set-rails-root.patch
index 03f1f95..8de963c 100644
--- a/debian/patches/0100-set-rails-root.patch
+++ b/debian/patches/0100-set-rails-root.patch
@@ -1,3 +1,5 @@
+set rails engine root for finding assets
+
 --- a/config/load_config.rb
 +++ b/config/load_config.rb
 @@ -6,7 +6,7 @@
diff --git a/debian/patches/0120-jquery-ui-6.patch b/debian/patches/0120-jquery-ui-6.patch
index 3765e78..2aba653 100644
--- a/debian/patches/0120-jquery-ui-6.patch
+++ b/debian/patches/0120-jquery-ui-6.patch
@@ -1,3 +1,5 @@
+adapt to jquery-ui-rails 6 in debian
+
 --- a/Gemfile
 +++ b/Gemfile
 @@ -96,7 +96,7 @@
diff --git a/debian/patches/051-relax-eye.patch b/debian/patches/051-relax-eye.patch
index 62707a0..26f9503 100644
--- a/debian/patches/051-relax-eye.patch
+++ b/debian/patches/051-relax-eye.patch
@@ -1,3 +1,5 @@
+Use version available in debian
+
 --- a/Gemfile
 +++ b/Gemfile
 @@ -218,7 +218,7 @@
diff --git a/debian/patches/060-use-db-env.patch b/debian/patches/060-use-db-env.patch
index edcfb6a..09f4c91 100644
--- a/debian/patches/060-use-db-env.patch
+++ b/debian/patches/060-use-db-env.patch
@@ -1,3 +1,5 @@
+bundle install --local cannot skip groups, use environment variables instead
+
 --- a/Gemfile
 +++ b/Gemfile
 @@ -62,12 +62,17 @@

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