[DRE-commits] [diaspora] 02/02: move config/* to /etc

[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 bc74a2ee6b05190bf0acd1af1b69e6515efd32cc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jul 27 18:32:26 2016 +0530

    move config/* to /etc
    
    remove ruby-jbuilder conflcit
---
 debian/changelog                         |  3 ++-
 debian/control                           |  4 ++--
 debian/diaspora.links                    |  1 +
 debian/install                           |  2 +-
 debian/maintscript                       |  1 +
 debian/patches/0100-set-rails-root.patch | 11 +++++++++++
 debian/patches/series                    |  1 +
 debian/postinst                          |  3 +++
 8 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef954e8..9d4c647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diaspora (0.5.9.1+debian-2) unstable; urgency=medium
 
-  * Enable autopkgtest 
+  * Enable autopkgtest
+  * Move config/* to /etc/diaspora
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 27 Jul 2016 17:18:37 +0530
 
diff --git a/debian/control b/debian/control
index ea9fe87..0e2c933 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Pre-Depends: bc
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
- diaspora-common (>= 0.5.2.0+debian4),
+ diaspora-common (>= 0.5.9.1+debian4),
  bundler (>= 1.9~),
  rake (>= 10.4.2~),
  ruby-rails (>= 2:4.2.5~),
@@ -125,7 +125,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-asset-sync,
  imagemagick,
  fonts-roboto-hinted
-Conflicts: diaspora-installer, ruby-jbuilder, ruby-bootstrap-sass (>> 3.0)
+Conflicts: diaspora-installer, ruby-bootstrap-sass (>> 3.0)
 Replaces: diaspora-installer
 Suggests: ruby-diaspora-vines
 Description: distributed social networking service
diff --git a/debian/diaspora.links b/debian/diaspora.links
index 92ac71d..bad37c9 100644
--- a/debian/diaspora.links
+++ b/debian/diaspora.links
@@ -2,3 +2,4 @@ usr/share/fonts/truetype/roboto/hinted/Roboto-Bold.ttf usr/share/diaspora/app/as
 usr/share/fonts/truetype/roboto/hinted/Roboto-Light.ttf usr/share/diaspora/app/assets/images/fonts/Roboto-Light.ttf
 usr/share/fonts/truetype/roboto/hinted/Roboto-Regular.ttf usr/share/diaspora/app/assets/images/fonts/Roboto-Regular.ttf
 usr/bin usr/share/diaspora/bin
+etc/diaspora usr/share/diaspora/config
diff --git a/debian/install b/debian/install
index 1155812..9b74713 100644
--- a/debian/install
+++ b/debian/install
@@ -2,7 +2,7 @@ lib usr/share/diaspora
 app usr/share/diaspora
 AUTHORS usr/share/diaspora
 Changelog.md usr/share/diaspora
-config usr/share/diaspora
+config/* etc/diaspora
 config.ru usr/share/diaspora
 COPYRIGHT usr/share/diaspora
 db usr/share/diaspora
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..5e4d29c
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/diaspora/config 0.5.9.1+debian3 diaspora-common
diff --git a/debian/patches/0100-set-rails-root.patch b/debian/patches/0100-set-rails-root.patch
new file mode 100644
index 0000000..03f1f95
--- /dev/null
+++ b/debian/patches/0100-set-rails-root.patch
@@ -0,0 +1,11 @@
+--- a/config/load_config.rb
++++ b/config/load_config.rb
+@@ -6,7 +6,7 @@
+ 
+ module Rails
+   def self.root
+-    @__root ||= Pathname.new File.expand_path("../../", __FILE__)
++    @__root ||= Pathname.new '/usr/share/diaspora'
+   end
+ end
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5929847..3d5bb73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 060-relax-devise.patch
 061-remove-diaspora-vines.patch
 062-lower-jquery-rails.patch
+0100-set-rails-root.patch
diff --git a/debian/postinst b/debian/postinst
index bfe3587..4a4c138 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -39,6 +39,9 @@ case "$1" in
 	
 	echo "Verifying we have all required libraries..."
 	sudo -u diaspora -E bundle install --local
+	
+	echo "Setting up secret_token..."
+        DB=$DB RAILS_ENV=$RAILS_ENV DISABLE_SPRING=1 bundle exec rake generate:secret_token 
         
 	echo "Running final rake tasks..."
 	. /usr/lib/diaspora-common/scripts/rake-tasks.sh

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