diff --git a/debian/control b/debian/control
index 054ade83..ec466369 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ XB-Ruby-Versions: ${ruby:Versions}
Pre-Depends: bc
Depends: ruby | ruby-interpreter,
diaspora-common (>= 0.7.15.0+debian2),
- bundler (>= 1.9~),
- rake (>= 10.4.2~),
+ bundler,
+ rake,
# rails 5.2.6 is embedded
ruby-arel,
ruby-marcel (>= 1.0~),
@@ -32,12 +32,12 @@ Depends: ruby | ruby-interpreter,
ruby-unicorn-worker-killer (>= 0.4.5~),
ruby-diaspora-federation-json-schema (>= 0.2.6~),
ruby-diaspora-federation-rails (>= 0.2.6~),
- ruby-acts-as-api (>= 1.0.1~),
+ ruby-acts-as-api,
ruby-json (>= 2.3~),
- ruby-json-schema (>= 2.8.1~),
+ ruby-json-schema,
ruby-devise (>= 4.7.3~),
ruby-devise-two-factor (>= 4.0~),
- ruby-devise-lastseenable (>= 0.0.6~),
+ ruby-devise-lastseenable,
ruby-devise-lastseenable (<< 0.1),
ruby-rqrcode (>= 1.1.2~),
ruby-simple-captcha2 (>= 0.5~),
@@ -50,61 +50,61 @@ Depends: ruby | ruby-interpreter,
ruby-rack-cors (>= 1.1.1~),
ruby-autoprefixer-rails (>= 10.2.4~),
ruby-bootstrap-sass (>= 3.4.1~),
- ruby-bootstrap-switch-rails (>= 3.3.4~),
+ ruby-bootstrap-switch-rails,
# compass-rails, compass, sass and sass-rails are embedded
ruby-chunky-png (>= 1.2~),
ruby-rb-inotify,
- ruby-sprockets-rails (>= 3.2.1~),
+ ruby-sprockets-rails,
ruby-pg (>= 1.2.3~),
ruby-activerecord-import (>= 1.0.4~),
ruby-carrierwave (>= 1.3.2~),
ruby-fog-aws (>= 3.5.2~),
ruby-mini-magick (>= 4.10.1~),
- ruby-uuid (>= 2.3.9~),
- ruby-entypo-rails (>= 3.0~),
+ ruby-uuid,
+ ruby-entypo-rails,
ruby-handlebars-assets (>= 2:0.23.8~),
ruby-jquery-rails (>= 4.3.5~),
ruby-js-routes (>= 1.4.9~),
- ruby-js-image-paths (>= 0.1.1~),
+ ruby-js-image-paths,
ruby-rails-assets-jquery (>= 3.4.1~),
ruby-jquery-ui-rails (>= 5.0.5~),
- ruby-rails-assets-highlightjs (>= 9.12~),
- ruby-rails-assets-markdown-it (>= 8.4.2~),
- ruby-rails-assets-markdown-it-hashtag (>= 0.4.0~),
- ruby-rails-assets-markdown-it-diaspora-mention (>= 1.2~),
- ruby-rails-assets-markdown-it-sanitizer (>= 0.4.3~),
- ruby-rails-assets-markdown-it--markdown-it-for-inline (>= 0.1.1~),
- ruby-rails-assets-markdown-it-sub (>= 1.0~),
- ruby-rails-assets-markdown-it-sup (>= 1.0~),
+ ruby-rails-assets-highlightjs,
+ ruby-rails-assets-markdown-it,
+ ruby-rails-assets-markdown-it-hashtag,
+ ruby-rails-assets-markdown-it-diaspora-mention,
+ ruby-rails-assets-markdown-it-sanitizer,
+ ruby-rails-assets-markdown-it--markdown-it-for-inline,
+ ruby-rails-assets-markdown-it-sub,
+ ruby-rails-assets-markdown-it-sup,
ruby-rails-assets-backbone,
- ruby-rails-assets-bootstrap-markdown (>= 2.10~),
+ ruby-rails-assets-bootstrap-markdown,
ruby-rails-assets-corejs-typeahead (>= 1.2.1-2~),
ruby-rails-assets-fine-uploader (>= 5.13.0-2~),
- ruby-rails-assets-autosize (>= 4.0.2~),
+ ruby-rails-assets-autosize,
libjs-autosize (>= 4.0.2~dfsg1-6~),
- ruby-rails-assets-blueimp-gallery (>= 2.33~),
+ ruby-rails-assets-blueimp-gallery,
ruby-rails-assets-jquery.are-you-sure (>= 1.9.0-2~),
- ruby-rails-assets-jquery-placeholder (>= 2.3.1~),
- ruby-rails-assets-jquery-textchange (>= 0.2.3~),
+ ruby-rails-assets-jquery-placeholder,
+ ruby-rails-assets-jquery-textchange,
ruby-rails-assets-perfect-scrollbar (>= 1.4.0-4~),
ruby-markdown-it-html5-embed (>= 1.0.0+dfsg-5~),
- ruby-http-accept-language (>= 2.1.1~),
- ruby-i18n-inflector-rails (>= 1.0.7~),
+ ruby-http-accept-language,
+ ruby-i18n-inflector-rails,
# Embedded
# ruby-rails-i18n (>= 5.1.2~),
- ruby-markerb (>= 1.1~),
+ ruby-markerb,
ruby-leaflet-rails (>= 1.6~),
ruby-nokogiri (>= 1.11.3~),
ruby-open-graph-reader (>= 0.7.1~),
ruby-redcarpet (>= 3.5.1~),
- ruby-oembed (>= 0.12~),
- ruby-twitter-text (>= 1.14.7~),
+ ruby-oembed,
+ ruby-twitter-text,
ruby-string-direction (>= 1.2.2~),
ruby-secure-headers (>= 6.3.2~),
ruby-omniauth (>= 1.9.1~),
- ruby-omniauth-tumblr (>= 1.2~),
- ruby-omniauth-twitter (>= 1.4~),
- ruby-omniauth-wordpress (>= 0.2.2~),
+ ruby-omniauth-tumblr,
+ ruby-omniauth-twitter,
+ ruby-omniauth-wordpress,
# for compatibility with newer faraday
ruby-omniauth-oauth2 (>= 1.6~),
ruby-oauth2 (>= 1.4.4~),
@@ -113,30 +113,30 @@ Depends: ruby | ruby-interpreter,
# This is embedded in diaspora now as packaged version is 0.10
# ruby-active-model-serializers (>= 0.9.7~),
# ruby-active-model-serializers (<< 0.10~),
- ruby-diaspora-prosody-config (>= 0.0.7~),
- ruby-rails-assets-diaspora-jsxc (>= 0.1.5~),
+ ruby-diaspora-prosody-config,
+ ruby-rails-assets-diaspora-jsxc,
ruby-acts-as-taggable-on (>= 6.5~),
ruby-addressable (>= 2.7~),
ruby-faraday (>= 1.0~),
ruby-faraday-middleware (>= 0.13.1~),
- ruby-faraday-cookie-jar (>= 0.0.6~),
+ ruby-faraday-cookie-jar,
ruby-typhoeus (>= 1.4~),
ruby-gon (>= 6.3.2~),
ruby-hamlit (>= 2.14.6~),
- ruby-mobile-fu (>= 1.4~),
+ ruby-mobile-fu,
ruby-rails-timeago (>= 2.18~),
ruby-will-paginate (>= 3.3~),
- ruby-logging-rails (>= 0.6~),
+ ruby-logging-rails,
ruby-zip (>= 2.3~),
ruby-versionist (>= 2.0.1~),
nodejs,
- ruby-rack-google-analytics (>= 1.2~),
- ruby-rack-piwik (>= 0.3.0~),
- ruby-rack-rewrite (>= 1.5.1~),
- ruby-rack-ssl (>= 1.4.1~),
+ ruby-rack-google-analytics,
+ ruby-rack-piwik,
+ ruby-rack-rewrite,
+ ruby-rack-ssl,
ruby-asset-sync (>= 2.11~),
imagemagick,
- fonts-roboto-hinted,
+ fonts-roboto-unhinted (>= 0~20170802~),
${shlibs:Depends},
${misc:Depends}
Conflicts: diaspora-installer
diff --git a/debian/maintscript b/debian/maintscript
index fc3a256b..148c69c6 100644
--- a/debian/maintscript
+++ b/debian/maintscript
@@ -1,4 +1,3 @@
-dir_to_symlink /usr/share/diaspora/config /etc/diaspora 0.5.9.1+debian3 diaspora-common
dir_to_symlink /usr/share/diaspora/tmp /run/diaspora 0.6.0.0+debian-8 diaspora
dir_to_symlink /usr/share/diaspora/tmp/cache /var/cache/diaspora 0.6.0.0+debian-8 diaspora
dir_to_symlink /usr/share/diaspora/public/uploads /var/lib/diaspora/uploads 0.6.0.0+debian-8 diaspora
