[DRE-commits] [diaspora] 01/02: relax activerecord-import

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-0.5.5
in repository diaspora.

commit 8673c6c1f798940eddf93ae870052a3ac55864a0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 6 22:44:06 2016 +0530

    relax activerecord-import
---
 debian/changelog                                   |  7 +++++++
 debian/patches/053-relax-activerecord-import.patch | 13 +++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 59ec712..63f045b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+diaspora (0.5.5.1+debian-11) UNRELEASED; urgency=medium
+
+  [ Gemfile changes]
+  * Relax activerecord-import 
+
+ -- Pirate Praveen <praveen at debian.org>  Wed, 06 Jul 2016 22:43:17 +0530
+
 diaspora (0.5.5.1+debian-10) unstable; urgency=medium
 
   * Relax active_model_serializers in Gemfile
diff --git a/debian/patches/053-relax-activerecord-import.patch b/debian/patches/053-relax-activerecord-import.patch
new file mode 100644
index 0000000..13af10b
--- /dev/null
+++ b/debian/patches/053-relax-activerecord-import.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -65,7 +65,7 @@ ENV["DB"] ||= "mysql"
+ gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+ gem "pg",     "~> 0.18.3" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+ 
+-gem "activerecord-import", "0.10.0"
++gem "activerecord-import", "~> 0.10"
+ 
+ # File uploading
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1ec1b40..37e703e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 050-relax-stable-libs.patch
 051-relax-patch-release-versions.patch
 052-relax-diaspora-jsxc.patch
+053-relax-activerecord-import.patch

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