[DRE-commits] [diaspora] 01/01: revert wrap and sort
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Mar 12 05:49:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 088e9e60206ceb5e31f0032360be46f51d08fd84
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Mar 12 11:18:57 2016 +0530
revert wrap and sort
- its easier to follow Gemfile sequence
---
debian/control | 229 +++++++++++++++++++++++++-------------------------
debian/diaspora.links | 2 +-
debian/install | 22 ++---
3 files changed, 125 insertions(+), 128 deletions(-)
diff --git a/debian/control b/debian/control
index cc4c8cf..4b5af54 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: web
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Pirate Praveen <praveen at debian.org>
-Build-Depends: debhelper (>= 9~),
- gem2deb
+Build-Depends: debhelper (>= 9~), gem2deb
Standards-Version: 3.9.7
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/diaspora.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/diaspora.git
@@ -14,120 +13,118 @@ XS-Ruby-Versions: all
Package: diaspora
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: bundler (>= 1.9~),
- diaspora-common (>= 0.5.2.0+debian4),
- fonts-roboto-hinted,
- imagemagick,
- nodejs,
- rake (>= 10.4.2~),
- ruby | ruby-interpreter,
- ruby-actionpack-action-caching,
- ruby-actionpack-page-caching,
- ruby-active-model-serializers,
- ruby-activerecord-import (>= 0.10.0~),
- ruby-acts-as-api,
- ruby-acts-as-taggable-on,
- ruby-addressable (>= 2.3.8~),
- ruby-asset-sync,
- ruby-autoprefixer-rails (<< 6.1),
- ruby-autoprefixer-rails (>= 6.0.3~),
- ruby-backbone-on-rails (>= 1.2.0.0~),
- ruby-carrierwave (>= 0.10~),
- ruby-client-side-validations,
- ruby-compass-rails (<= 2.1),
- ruby-compass-rails (>= 2.0.5-5~),
- ruby-configurate (>= 0.2.0~),
- ruby-devise (>= 3.5.2~),
- ruby-devise-lastseenable (<< 0.1),
- ruby-devise-lastseenable (>= 0.0.6~),
- ruby-devise-token-authenticatable,
- ruby-diaspora-federation-rails (>= 0.0.8~),
- ruby-entypo-rails (>= 2.2.3~),
- ruby-eye (>= 0.7-3~),
- ruby-facebox-rails,
- ruby-faraday (>= 0.9.2~),
- ruby-faraday-cookie-jar,
- ruby-faraday-middleware,
- ruby-fog (>= 1.34~),
- ruby-gon (>= 6.0.1~),
- ruby-haml (>= 4.0.7~),
- ruby-handlebars-assets (>= 2:0.21.0-5~),
- ruby-http-accept-language,
- ruby-i18n-inflector-rails,
- ruby-jquery-rails (>= 4.0.5~),
- ruby-jquery-ui-rails (>= 5.0.5~),
- ruby-js-image-paths,
- ruby-js-routes (>= 1.1.2~),
- ruby-json,
- ruby-json-schema,
- ruby-logging-rails,
- ruby-markerb (>= 1.1.0~),
- ruby-messagebus-api (>= 3.0.7+git.20130130.97b34ece.REALLY.1.0.3~),
- ruby-mini-magick (>= 4.3.6~),
- ruby-mobile-fu,
- ruby-nokogiri,
- ruby-oembed,
- ruby-omniauth,
- ruby-omniauth-facebook (>= 3.0.0~),
- ruby-omniauth-tumblr,
- ruby-omniauth-twitter (>= 1.2.1~),
- ruby-omniauth-wordpress,
- ruby-open-graph-reader,
- ruby-pg (>= 0.18.3~),
- ruby-rack-cors,
- ruby-rack-google-analytics,
- ruby-rack-piwik (>=0.3.0~),
- ruby-rack-protection (>= 1.5.3~),
- ruby-rack-rewrite (>= 1.5.1~),
- ruby-rack-ssl,
- ruby-rails (<< 2:5.0),
- ruby-rails (>= 2:4.2.5~),
- ruby-rails-admin (>= 0.7.0~),
- ruby-rails-assets-diaspora-jsxc (>= 0.1.4~),
- ruby-rails-assets-favico.js (>= 0.3.9~dfsg-2~),
- ruby-rails-assets-highlightjs (>= 8.9.1~),
- ruby-rails-assets-jakobmattsson-jquery-elastic,
- ruby-rails-assets-jeresig-jquery.hotkeys (>= 0.2.0-3~),
- ruby-rails-assets-jquery,
- ruby-rails-assets-jquery-colorbox (>= 1.6.3~),
- ruby-rails-assets-jquery-fullscreen-plugin,
- ruby-rails-assets-jquery-idletimer,
- ruby-rails-assets-jquery-placeholder (>= 2.1.3~),
- ruby-rails-assets-jquery-textchange,
- ruby-rails-assets-markdown-it (>= 5.0.2~),
- ruby-rails-assets-markdown-it--markdown-it-for-inline,
- ruby-rails-assets-markdown-it-diaspora-mention (>= 0.4.0~),
- ruby-rails-assets-markdown-it-hashtag (>= 0.4.0~),
- ruby-rails-assets-markdown-it-sanitizer (>= 0.4.1~),
- ruby-rails-assets-markdown-it-sub,
- ruby-rails-assets-markdown-it-sup,
- ruby-rails-assets-perfect-scrollbar (<< 0.7),
- ruby-rails-assets-perfect-scrollbar (>= 0.6.7~),
- ruby-rails-autolink,
- ruby-rails-i18n (>= 4.0.5~),
- ruby-rails-timeago,
- ruby-redcarpet (>= 3.3.3~),
- ruby-remotipart,
- ruby-responders (>= 2.1.0~),
- ruby-roxml,
- ruby-sass-rails (<< 5.1),
- ruby-sass-rails (>= 5.0.3~),
- ruby-sidekiq (>= 4.0~),
- ruby-sidekiq-cron,
- ruby-simple-captcha2,
- ruby-sinatra,
- ruby-twitter (>= 5.15.0~),
- ruby-twitter-text (>= 1.13.0~),
- ruby-typhoeus (>= 0.8.0~),
- ruby-uglifier (>= 2.7.2~),
- ruby-uuid (>= 2.3.8~),
- ruby-will-paginate,
- ruby-zip (>= 1.1.7~),
- unicorn (>= 4.9.0~),
- ${misc:Depends},
- ${shlibs:Depends}
-Conflicts: diaspora-installer,
- ruby-jbuilder
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
+ diaspora-common (>= 0.5.2.0+debian4),
+ bundler (>= 1.9~),
+ rake (>= 10.4.2~),
+ ruby-rails (>= 2:4.2.5~),
+ ruby-rails (<< 2:5.0),
+ ruby-responders (>= 2.1.0~),
+ ruby-actionpack-action-caching,
+ ruby-actionpack-page-caching,
+ unicorn (>= 4.9.0~),
+ ruby-diaspora-federation-rails (>= 0.0.8~),
+ ruby-acts-as-api,
+ ruby-json,
+ ruby-json-schema,
+ ruby-devise (>= 3.5.2~),
+ ruby-devise-lastseenable (>= 0.0.6~),
+ ruby-devise-lastseenable (<< 0.1),
+ ruby-devise-token-authenticatable,
+ ruby-simple-captcha2,
+ ruby-sidekiq (>= 4.0~),
+ ruby-sinatra,
+ ruby-sidekiq-cron,
+ ruby-configurate (>= 0.2.0~),
+ ruby-rack-cors,
+ ruby-pg (>= 0.18.3~),
+ ruby-activerecord-import (>= 0.10.0~),
+ ruby-carrierwave (>= 0.10~),
+ ruby-fog (>= 1.34~),
+ ruby-mini-magick (>= 4.3.6~),
+ ruby-remotipart,
+ ruby-uuid (>= 2.3.8~),
+ ruby-http-accept-language,
+ ruby-i18n-inflector-rails,
+ ruby-rails-i18n (>= 4.0.5~),
+ ruby-markerb (>= 1.1.0~),
+ ruby-messagebus-api (>= 3.0.7+git.20130130.97b34ece.REALLY.1.0.3~),
+ ruby-nokogiri,
+ ruby-rails-autolink,
+ ruby-redcarpet (>= 3.3.3~),
+ ruby-twitter-text (>= 1.13.0~),
+ ruby-roxml,
+ ruby-oembed,
+ ruby-open-graph-reader,
+ ruby-omniauth,
+ ruby-omniauth-facebook (>= 3.0.0~),
+ ruby-omniauth-tumblr,
+ ruby-omniauth-twitter (>= 1.2.1~),
+ ruby-twitter (>= 5.15.0~),
+ ruby-omniauth-wordpress,
+ ruby-active-model-serializers,
+ ruby-rails-assets-diaspora-jsxc (>= 0.1.4~),
+ ruby-rails-assets-jquery-colorbox (>= 1.6.3~),
+ ruby-rails-assets-favico.js (>= 0.3.9~dfsg-2~),
+ ruby-rails-assets-jquery-fullscreen-plugin,
+ ruby-acts-as-taggable-on,
+ ruby-addressable (>= 2.3.8~),
+ ruby-faraday (>= 0.9.2~),
+ ruby-faraday-middleware,
+ ruby-faraday-cookie-jar,
+ ruby-typhoeus (>= 0.8.0~),
+ ruby-client-side-validations,
+ ruby-gon (>= 6.0.1~),
+ ruby-haml (>= 4.0.7~),
+ ruby-mobile-fu,
+ ruby-will-paginate,
+ ruby-rails-timeago,
+ ruby-logging-rails,
+ ruby-zip (>= 1.1.7~),
+ ruby-entypo-rails (>= 2.2.3~),
+# ruby-bootstrap-sass,
+ ruby-compass-rails (>= 2.0.5-5~),
+ ruby-compass-rails (<= 2.1),
+ ruby-sass-rails (>= 5.0.3~),
+ ruby-sass-rails (<< 5.1),
+ ruby-autoprefixer-rails (>= 6.0.3~),
+ ruby-autoprefixer-rails (<< 6.1),
+ ruby-uglifier (>= 2.7.2~),
+ ruby-backbone-on-rails (>= 1.2.0.0~),
+ ruby-handlebars-assets (>= 2:0.21.0-5~),
+ ruby-jquery-rails (>= 4.0.5~),
+ ruby-jquery-ui-rails (>= 5.0.5~),
+ ruby-js-image-paths,
+ ruby-js-routes (>= 1.1.2~),
+ ruby-rails-assets-jquery,
+ ruby-rails-assets-markdown-it (>= 5.0.2~),
+ ruby-rails-assets-markdown-it-hashtag (>= 0.4.0~),
+ ruby-rails-assets-markdown-it-diaspora-mention (>= 0.4.0~),
+ ruby-rails-assets-markdown-it-sanitizer (>= 0.4.1~),
+ ruby-rails-assets-markdown-it--markdown-it-for-inline,
+ ruby-rails-assets-markdown-it-sub,
+ ruby-rails-assets-markdown-it-sup,
+ ruby-rails-assets-highlightjs (>= 8.9.1~),
+ ruby-rails-assets-jeresig-jquery.hotkeys (>= 0.2.0-3~),
+ ruby-rails-assets-jquery-idletimer,
+ ruby-rails-assets-jquery-placeholder (>= 2.1.3~),
+ ruby-rails-assets-jquery-textchange,
+ ruby-rails-assets-perfect-scrollbar (>= 0.6.7~),
+ ruby-rails-assets-perfect-scrollbar (<< 0.7),
+ ruby-rails-assets-jakobmattsson-jquery-elastic,
+ ruby-facebox-rails,
+ nodejs,
+ ruby-rails-admin (>= 0.7.0~),
+ ruby-rack-google-analytics,
+ ruby-rack-piwik (>=0.3.0~),
+ ruby-rack-protection (>= 1.5.3~),
+ ruby-eye (>= 0.7-3~),
+ ruby-rack-rewrite (>= 1.5.1~),
+ ruby-rack-ssl,
+ ruby-asset-sync,
+ imagemagick,
+ fonts-roboto-hinted
+Conflicts: diaspora-installer, ruby-jbuilder
Replaces: diaspora-installer
Suggests: ruby-diaspora-vines
Description: distributed social networking service
diff --git a/debian/diaspora.links b/debian/diaspora.links
index bcd87ae..92ac71d 100644
--- a/debian/diaspora.links
+++ b/debian/diaspora.links
@@ -1,4 +1,4 @@
-usr/bin usr/share/diaspora/bin
usr/share/fonts/truetype/roboto/hinted/Roboto-Bold.ttf usr/share/diaspora/app/assets/images/fonts/Roboto-Bold.ttf
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
diff --git a/debian/install b/debian/install
index 9486aa7..1155812 100644
--- a/debian/install
+++ b/debian/install
@@ -1,25 +1,25 @@
+lib usr/share/diaspora
+app usr/share/diaspora
AUTHORS usr/share/diaspora
-COPYRIGHT usr/share/diaspora
Changelog.md usr/share/diaspora
-FederationProcfile usr/share/diaspora
-GNU-AGPL-3.0 usr/share/diaspora
-Gemfile usr/share/diaspora
-Guardfile usr/share/diaspora
-Procfile usr/share/diaspora
-README.md usr/share/diaspora
-Rakefile usr/share/diaspora
-app usr/share/diaspora
config usr/share/diaspora
config.ru usr/share/diaspora
+COPYRIGHT usr/share/diaspora
db usr/share/diaspora
-debian/gems-compat/bootstrap-sass-2.3.2.2 usr/share/diaspora/vendor/gems
features usr/share/diaspora
+FederationProcfile usr/share/diaspora
+Gemfile usr/share/diaspora
+GNU-AGPL-3.0 usr/share/diaspora
graphics usr/share/diaspora
-lib usr/share/diaspora
+Guardfile usr/share/diaspora
+Procfile usr/share/diaspora
public usr/share/diaspora
+Rakefile usr/share/diaspora
+README.md usr/share/diaspora
redis-integration1.conf usr/share/diaspora
redis-integration2.conf usr/share/diaspora
script usr/share/diaspora
spec usr/share/diaspora
tmp usr/share/diaspora
vendor usr/share/diaspora
+debian/gems-compat/bootstrap-sass-2.3.2.2 usr/share/diaspora/vendor/gems
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list