[DRE-commits] [diaspora-installer] 01/03: Use mariadb instead of mysql; run wrap-and-sort

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository diaspora-installer.

commit 25b71cbfe32f562df04d1bcd09ecbb86a275feb4
Author: Balasankar C <balasankar at gitlab.com>
Date:   Mon Dec 26 22:53:19 2016 +0530

    Use mariadb instead of mysql; run wrap-and-sort
---
 debian/control                 | 14 +++++++-------
 debian/diaspora-common.install |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 2c6f6ef..0402652 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Package: diaspora-installer
 Architecture: all
 Section: contrib/ruby
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: diaspora-common (= ${source:Version}),
-         build-essential,
+Depends: build-essential,
+         diaspora-common (= ${source:Version}),
          ghostscript,
          imagemagick,
          libcurl4-openssl-dev,
@@ -58,10 +58,10 @@ Package: diaspora-installer-mysql
 Architecture: all
 Section: contrib/ruby
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: mysql-server,
+Depends: dbconfig-mysql,
+         default-libmysqlclient-dev,
+         default-mysql-server | virtual-mysql-server,
          diaspora-installer (= ${source:Version}),
-         dbconfig-mysql,
-         libmysqlclient-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: distributed social networking service - installer (with mysql)
@@ -89,13 +89,13 @@ XB-Ruby-Versions: ${ruby:Versions}
 Pre-Depends: ca-certificates
 Depends: adduser,
          bc,
-         dbconfig-pgsql | dbconfig-mysql | dbconfig-no-thanks,
-         postgresql | mysql-server,
          curl,
+         dbconfig-pgsql | dbconfig-mysql | dbconfig-no-thanks,
          exim4 | postfix | mail-transport-agent,
          net-tools,
          nginx,
          nodejs,
+         postgresql | mysql-server,
          rake,
          redis-server (>= 2:2.8),
          ruby | ruby-interpreter,
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 3c8e341..2c82883 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -1,13 +1,13 @@
 adduser.sh usr/lib/diaspora-common/scripts
 debian/database.yml usr/share/diaspora-common
+debian/diaspora.yml etc/diaspora
 diaspora-common.conf /etc/diaspora
-nginx.conf.example usr/share/diaspora-common
 diaspora-download.sh usr/lib/diaspora-common/scripts
 diaspora-versions.sh usr/lib/diaspora-common/scripts
 diaspora.conf usr/share/diaspora-common
-debian/diaspora.yml etc/diaspora
 grantpriv.sh usr/lib/diaspora-common/scripts
+initdb.sh usr/lib/diaspora-common/scripts
+nginx.conf.example usr/share/diaspora-common
 rake-tasks.sh usr/lib/diaspora-common/scripts
 set-env-diaspora.sh usr/lib/diaspora-common/scripts
 set-env-nginx.sh usr/lib/diaspora-common/scripts
-initdb.sh usr/lib/diaspora-common/scripts

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