Merge ~paelzer/+git/diaspora-installer:fix-disco-lp-1828194-non-installable into ~paelzer/+git/diaspora-installer:master

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This isn't in git-ubuntu so I pushed my own to LP for a quick second pair of eyes.

This is Debian native it seems, but versioning works the usual way, all these are good:
# old D->E Upgrade
$ dpkg --compare-versions 0.7.6.1build1 lt-nl 0.7.6.1+debian1
# new upgrade D -> D-updated
$ dpkg --compare-versions 0.7.6.1build1 lt-nl 0.7.6.1ubuntu0.1
# new upgrade D-updated -> E
$ dpkg --compare-versions 0.7.6.1ubuntu0.1 lt-nl 0.7.6.1+debian1

Test builds in PPA:
 https://launchpad.net/~paelzer/+archive/ubuntu/lp-1828194-fix-diaspora-installability

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

merged (is in proposed)

diff --git a/debian/changelog b/debian/changelog
index 3198954..eb654a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+diaspora-installer (0.7.6.1ubuntu0.1) disco; urgency=medium
+
+  * Use system bundler (LP: #1828194)
+    Thanks to Pirate Praveen for the fix in Debian 919978
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 08 May 2019 12:07:02 +0200
+
 diaspora-installer (0.7.6.1build1) disco; urgency=high
 
   * No change rebuild to recover from imagemagick ABI breakage
diff --git a/debian/control b/debian/control
index 9f11c49..cae4f8a 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends: build-essential,
          zlib1g-dev,
          ruby (>= 2.2) | ruby-interpreter,
          ruby-dev,
+         ruby-bundler,
          wget,
          rsync,
          ${misc:Depends},
diff --git a/debian/postinst b/debian/postinst
index 5a6f6d9..d0b65d2 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -37,8 +37,7 @@ case "$1" in
 	. /usr/lib/diaspora-common/scripts/set-env-diaspora.sh
 	export RAILS_ENV=$RAILS_ENV BUNDLE_WITH=${BUNDLE_WITH} DB_NAME=${DB_NAME} ENVIRONMENT_URL=$ENVIRONMENT_URL
 
-        echo "Installing latest version of bundler..."
-	gem install bundler
+        echo "Using system bundler..."
 
 	echo "Installing gems with rubygems ..."
 	su ${diaspora_user} -s /bin/sh -c "mkdir -p ~/vendor/bundle"