Christian Ehrhardt 

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

  1. Git
  2. lp:~paelzer/+git/diaspora-installer
  3. fix-disco-lp-1828194-non-installable
  4. Merge into master
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 8df49daffe3daae09272fdf48f16860649dca2d2
Merge reported by: Christian Ehrhardt 
Merged at revision: 8df49daffe3daae09272fdf48f16860649dca2d2
Proposed branch: ~paelzer/+git/diaspora-installer:fix-disco-lp-1828194-non-installable
Merge into: ~paelzer/+git/diaspora-installer:master
Diff against target: 41 lines (+9/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/postinst (+1/-2)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Core Reviewers Pending
Review via email: mp+367093@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

merged (is in proposed)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3198954..eb654a4 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+diaspora-installer (0.7.6.1ubuntu0.1) disco; urgency=medium
7+
8+ * Use system bundler (LP: #1828194)
9+ Thanks to Pirate Praveen for the fix in Debian 919978
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 08 May 2019 12:07:02 +0200
12+
13 diaspora-installer (0.7.6.1build1) disco; urgency=high
14
15 * No change rebuild to recover from imagemagick ABI breakage
16diff --git a/debian/control b/debian/control
17index 9f11c49..cae4f8a 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -30,6 +30,7 @@ Depends: build-essential,
21 zlib1g-dev,
22 ruby (>= 2.2) | ruby-interpreter,
23 ruby-dev,
24+ ruby-bundler,
25 wget,
26 rsync,
27 ${misc:Depends},
28diff --git a/debian/postinst b/debian/postinst
29index 5a6f6d9..d0b65d2 100755
30--- a/debian/postinst
31+++ b/debian/postinst
32@@ -37,8 +37,7 @@ case "$1" in
33 . /usr/lib/diaspora-common/scripts/set-env-diaspora.sh
34 export RAILS_ENV=$RAILS_ENV BUNDLE_WITH=${BUNDLE_WITH} DB_NAME=${DB_NAME} ENVIRONMENT_URL=$ENVIRONMENT_URL
35
36- echo "Installing latest version of bundler..."
37- gem install bundler
38+ echo "Using system bundler..."
39
40 echo "Installing gems with rubygems ..."
41 su ${diaspora_user} -s /bin/sh -c "mkdir -p ~/vendor/bundle"

Subscribers

People subscribed via source and target branches

to all changes: