[DRE-commits] [redmine] 09/15: wrap-and-sort --wrap-always
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Feb 14 14:32:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit b3946caa4c815c1fa8e8faa4e3b8f9de5207b348
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Feb 13 21:43:35 2016 -0200
wrap-and-sort --wrap-always
---
debian/control | 48 ++++++++++++++++++++++++------------------------
debian/copyright | 2 +-
debian/dirs | 6 +++---
debian/examples | 2 +-
debian/install | 13 ++++++-------
debian/links | 3 +--
6 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/debian/control b/debian/control
index 174f8b0..4242381 100644
--- a/debian/control
+++ b/debian/control
@@ -5,28 +5,28 @@ Maintainer: Antonio Terceiro <terceiro at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>,
Jérémy Lal <kapouer at melix.org>
Build-Depends: bundler,
- dbconfig-common,
- debhelper (>= 9),
- ruby | ruby-interpreter,
- ruby-actionpack-action-caching,
- ruby-actionpack-xml-parser,
- ruby-awesome-nested-set,
- ruby-coderay (>= 1.0.6),
- ruby-i18n (>= 0.6.9-1~),
- ruby-jquery-rails,
- ruby-mime-types (>= 1.25),
- ruby-net-ldap (>= 0.3.1),
- ruby-openid,
- ruby-protected-attributes,
- ruby-rack (>= 1.4.5~),
- ruby-rack-openid,
- ruby-rails (>= 2:4),
- ruby-rails-observers,
- ruby-rbpdf,
- ruby-redcarpet,
- ruby-request-store,
- ruby-rmagick,
- ruby-roadie-rails,
+ dbconfig-common,
+ debhelper (>= 9),
+ ruby | ruby-interpreter,
+ ruby-actionpack-action-caching,
+ ruby-actionpack-xml-parser,
+ ruby-awesome-nested-set,
+ ruby-coderay (>= 1.0.6),
+ ruby-i18n (>= 0.6.9-1~),
+ ruby-jquery-rails,
+ ruby-mime-types (>= 1.25),
+ ruby-net-ldap (>= 0.3.1),
+ ruby-openid,
+ ruby-protected-attributes,
+ ruby-rack (>= 1.4.5~),
+ ruby-rack-openid,
+ ruby-rails (>= 2:4),
+ ruby-rails-observers,
+ ruby-rbpdf,
+ ruby-redcarpet,
+ ruby-request-store,
+ ruby-rmagick,
+ ruby-roadie-rails
Build-Depends-Indep: po-debconf
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/redmine.git
@@ -39,6 +39,7 @@ Architecture: all
Pre-Depends: debconf
Depends: bundler,
dbconfig-common,
+ redmine-sqlite | redmine-mysql | redmine-pgsql,
ruby | ruby-interpreter,
ruby-actionpack-action-caching,
ruby-actionpack-xml-parser,
@@ -59,8 +60,7 @@ Depends: bundler,
ruby-request-store,
ruby-rmagick,
ruby-roadie-rails,
- redmine-sqlite | redmine-mysql | redmine-pgsql,
- ${misc:Depends},
+ ${misc:Depends}
Breaks: redmine-plugin-botsfilter (<=1.02-2),
redmine-plugin-recaptcha (<=0.1.0+git20121018)
Recommends: passenger
diff --git a/debian/copyright b/debian/copyright
index c026bc0..0691f8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -57,7 +57,7 @@ Copyright: 2012 Kaitseministeerium
License: GPL-2+
Files: lib/plugins/acts_as_versioned/*
-Copyright: 2005 Rick Olson
+Copyright: 2005 Rick Olson
License: Expat
Files: lib/plugins/acts_as_tree/*
diff --git a/debian/dirs b/debian/dirs
index b99ccba..c5f40c7 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,5 +1,5 @@
-var/log/redmine
-var/cache/redmine
-var/lib/redmine
etc/redmine
usr/share/redmine/tmp
+var/cache/redmine
+var/lib/redmine
+var/log/redmine
diff --git a/debian/examples b/debian/examples
index e2c01a8..7bc2b03 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1,2 +1,2 @@
-debian/doc/examples/*
config/configuration.yml.example
+debian/doc/examples/*
diff --git a/debian/install b/debian/install
index b82da94..f88f6ca 100644
--- a/debian/install
+++ b/debian/install
@@ -1,16 +1,15 @@
# Install the basic application files
+Gemfile usr/share/redmine
+Rakefile usr/share/redmine
app usr/share/redmine
bin usr/share/redmine
+bin/redmine-instances usr/bin
config usr/share/redmine
+config.ru usr/share/redmine
db usr/share/redmine
+debian/conf/*.template usr/share/redmine/templates
extra usr/share/redmine
lib usr/share/redmine
+lib/plugins/* usr/share/redmine/lib/plugins
public usr/share/redmine
-Rakefile usr/share/redmine
-Gemfile usr/share/redmine
test usr/share/redmine
-config.ru usr/share/redmine
-lib/plugins/* usr/share/redmine/lib/plugins
-debian/conf/*.template usr/share/redmine/templates
-
-bin/redmine-instances usr/bin
diff --git a/debian/links b/debian/links
index cf91e01..684080a 100644
--- a/debian/links
+++ b/debian/links
@@ -1,4 +1,3 @@
-/var/lib/redmine/Gemfile.lock usr/share/redmine/Gemfile.lock
/var/lib/redmine usr/share/redmine/instances
-
+/var/lib/redmine/Gemfile.lock usr/share/redmine/Gemfile.lock
usr/share/javascript/raphael/raphael.min.js usr/share/redmine/public/javascripts/raphael.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git
More information about the Pkg-ruby-extras-commits
mailing list