[DRE-commits] [redmine] 01/02: Imported Debian patch 2.5.1-2~bpo70+1
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Jul 21 00:54:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master-wheezy-backports
in repository redmine.
commit 2e01f086526b3d1cf69bbed5650656fb8414786d
Merge: 4e3baa7 fdd33cc
Author: Ondřej Surý <ondrej at debian.org>
Date: Wed Jul 16 12:17:24 2014 +0200
Imported Debian patch 2.5.1-2~bpo70+1
.travis.yml | 38 +
Gemfile | 14 +-
app/controllers/account_controller.rb | 4 +-
app/controllers/activities_controller.rb | 2 +-
app/controllers/admin_controller.rb | 2 +-
app/controllers/application_controller.rb | 13 +-
app/controllers/attachments_controller.rb | 2 +-
app/controllers/auth_sources_controller.rb | 2 +-
app/controllers/auto_completes_controller.rb | 2 +-
app/controllers/boards_controller.rb | 2 +-
app/controllers/calendars_controller.rb | 2 +-
app/controllers/comments_controller.rb | 2 +-
app/controllers/context_menus_controller.rb | 8 +-
app/controllers/custom_fields_controller.rb | 9 +-
app/controllers/documents_controller.rb | 2 +-
app/controllers/enumerations_controller.rb | 2 +-
app/controllers/files_controller.rb | 2 +-
app/controllers/gantts_controller.rb | 2 +-
app/controllers/groups_controller.rb | 4 +-
app/controllers/issue_categories_controller.rb | 2 +-
app/controllers/issue_relations_controller.rb | 2 +-
app/controllers/issue_statuses_controller.rb | 4 +-
app/controllers/issues_controller.rb | 18 +-
app/controllers/journals_controller.rb | 4 +-
app/controllers/mail_handler_controller.rb | 2 +-
app/controllers/members_controller.rb | 13 +-
app/controllers/messages_controller.rb | 8 +-
app/controllers/my_controller.rb | 4 +-
app/controllers/news_controller.rb | 12 +-
app/controllers/previews_controller.rb | 2 +-
app/controllers/project_enumerations_controller.rb | 2 +-
app/controllers/projects_controller.rb | 6 +-
app/controllers/queries_controller.rb | 10 +-
app/controllers/reports_controller.rb | 2 +-
app/controllers/repositories_controller.rb | 4 +-
app/controllers/roles_controller.rb | 2 +-
app/controllers/search_controller.rb | 2 +-
app/controllers/settings_controller.rb | 2 +-
app/controllers/sys_controller.rb | 2 +-
app/controllers/timelog_controller.rb | 4 +-
app/controllers/trackers_controller.rb | 2 +-
app/controllers/users_controller.rb | 6 +-
app/controllers/versions_controller.rb | 2 +-
app/controllers/watchers_controller.rb | 38 +-
app/controllers/welcome_controller.rb | 2 +-
app/controllers/wiki_controller.rb | 17 +-
app/controllers/wikis_controller.rb | 2 +-
app/controllers/workflows_controller.rb | 17 +-
app/helpers/account_helper.rb | 2 +-
app/helpers/activities_helper.rb | 2 +-
app/helpers/admin_helper.rb | 2 +-
app/helpers/application_helper.rb | 129 +++-
app/helpers/attachments_helper.rb | 2 +-
app/helpers/auth_sources_helper.rb | 2 +-
app/helpers/boards_helper.rb | 2 +-
app/helpers/calendars_helper.rb | 2 +-
app/helpers/context_menus_helper.rb | 2 +-
app/helpers/custom_fields_helper.rb | 142 ++--
app/helpers/documents_helper.rb | 2 +-
app/helpers/enumerations_helper.rb | 2 +-
app/helpers/gantt_helper.rb | 2 +-
app/helpers/groups_helper.rb | 2 +-
app/helpers/issue_categories_helper.rb | 2 +-
app/helpers/issue_relations_helper.rb | 2 +-
app/helpers/issue_statuses_helper.rb | 2 +-
app/helpers/issues_helper.rb | 14 +-
app/helpers/journals_helper.rb | 2 +-
app/helpers/mail_handler_helper.rb | 2 +-
app/helpers/members_helper.rb | 2 +-
app/helpers/messages_helper.rb | 2 +-
app/helpers/my_helper.rb | 2 +-
app/helpers/news_helper.rb | 2 +-
app/helpers/projects_helper.rb | 11 +-
app/helpers/queries_helper.rb | 56 +-
app/helpers/reports_helper.rb | 2 +-
app/helpers/repositories_helper.rb | 4 +-
app/helpers/roles_helper.rb | 2 +-
app/helpers/routes_helper.rb | 2 +-
app/helpers/search_helper.rb | 2 +-
app/helpers/settings_helper.rb | 4 +-
app/helpers/timelog_helper.rb | 6 +-
app/helpers/trackers_helper.rb | 2 +-
app/helpers/users_helper.rb | 4 +-
app/helpers/versions_helper.rb | 2 +-
app/helpers/watchers_helper.rb | 3 +-
app/helpers/welcome_helper.rb | 2 +-
app/helpers/wiki_helper.rb | 2 +-
app/helpers/workflows_helper.rb | 2 +-
app/models/attachment.rb | 2 +-
app/models/auth_source.rb | 4 +-
app/models/auth_source_ldap.rb | 2 +-
app/models/board.rb | 8 +-
app/models/change.rb | 2 +-
app/models/changeset.rb | 15 +-
app/models/comment.rb | 2 +-
app/models/custom_field.rb | 222 ++----
app/models/custom_field_value.rb | 12 +-
app/models/custom_value.rb | 2 +-
app/models/document.rb | 2 +-
app/models/document_category.rb | 2 +-
app/models/document_category_custom_field.rb | 2 +-
app/models/enabled_module.rb | 3 +-
app/models/enumeration.rb | 4 +-
app/models/group.rb | 11 +-
app/models/group_custom_field.rb | 2 +-
app/models/issue.rb | 32 +-
app/models/issue_category.rb | 4 +-
app/models/issue_custom_field.rb | 15 +-
app/models/issue_priority.rb | 6 +-
app/models/issue_priority_custom_field.rb | 2 +-
app/models/issue_query.rb | 13 +-
app/models/issue_relation.rb | 10 +-
app/models/issue_status.rb | 8 +-
app/models/journal.rb | 4 +-
app/models/journal_detail.rb | 2 +-
app/models/mail_handler.rb | 13 +-
app/models/mailer.rb | 11 +-
app/models/member.rb | 5 +-
app/models/member_role.rb | 5 +-
app/models/message.rb | 6 +-
app/models/news.rb | 16 +-
app/models/principal.rb | 8 +-
app/models/project.rb | 51 +-
app/models/project_custom_field.rb | 2 +-
app/models/query.rb | 71 +-
app/models/repository.rb | 22 +-
app/models/repository/bazaar.rb | 6 +-
app/models/repository/cvs.rb | 8 +-
app/models/repository/darcs.rb | 6 +-
app/models/repository/filesystem.rb | 2 +-
app/models/repository/git.rb | 22 +-
app/models/repository/mercurial.rb | 65 +-
app/models/repository/subversion.rb | 11 +-
app/models/role.rb | 2 +-
app/models/setting.rb | 11 +-
app/models/time_entry.rb | 12 +-
app/models/time_entry_activity.rb | 2 +-
app/models/time_entry_activity_custom_field.rb | 2 +-
app/models/time_entry_custom_field.rb | 2 +-
app/models/time_entry_query.rb | 8 +-
app/models/token.rb | 2 +-
app/models/tracker.rb | 5 +-
app/models/user.rb | 59 +-
app/models/user_custom_field.rb | 2 +-
app/models/user_preference.rb | 2 +-
app/models/version.rb | 6 +-
app/models/version_custom_field.rb | 2 +-
app/models/watcher.rb | 13 +-
app/models/wiki.rb | 2 +-
app/models/wiki_content.rb | 2 +-
app/models/wiki_page.rb | 16 +-
app/models/wiki_redirect.rb | 2 +-
app/models/workflow_permission.rb | 2 +-
app/models/workflow_rule.rb | 2 +-
app/models/workflow_transition.rb | 2 +-
app/views/account/register.html.erb | 3 +
app/views/auto_completes/issues.html.erb | 2 +-
app/views/common/_tabs.html.erb | 2 -
app/views/common/feed.atom.builder | 7 +-
app/views/custom_fields/_form.html.erb | 75 +-
app/views/custom_fields/_index.html.erb | 4 +-
app/views/custom_fields/formats/_bool.html.erb | 3 +
app/views/custom_fields/formats/_date.html.erb | 3 +
app/views/custom_fields/formats/_link.html.erb | 3 +
app/views/custom_fields/formats/_list.html.erb | 7 +
app/views/custom_fields/formats/_numeric.html.erb | 3 +
app/views/custom_fields/formats/_regexp.html.erb | 9 +
app/views/custom_fields/formats/_string.html.erb | 4 +
app/views/custom_fields/formats/_text.html.erb | 3 +
app/views/custom_fields/formats/_user.html.erb | 24 +
app/views/custom_fields/formats/_version.html.erb | 24 +
app/views/custom_fields/index.api.rsb | 11 +-
app/views/custom_fields/index.html.erb | 10 +-
app/views/custom_fields/new.html.erb | 3 +-
app/views/custom_fields/select_type.html.erb | 15 +
app/views/groups/_memberships.html.erb | 4 +-
app/views/groups/_users.html.erb | 2 +-
app/views/issues/_action_menu.html.erb | 2 +-
app/views/issues/_edit.html.erb | 2 +-
app/views/issues/_form.html.erb | 10 +
app/views/issues/_list_simple.html.erb | 6 +-
app/views/issues/bulk_edit.html.erb | 2 +-
app/views/issues/index.html.erb | 16 +-
app/views/issues/new.html.erb | 2 -
app/views/issues/show.html.erb | 2 +-
app/views/journals/index.builder | 1 +
app/views/layouts/base.html.erb | 2 +-
app/views/my/account.html.erb | 2 +
app/views/my/password.html.erb | 2 -
app/views/news/index.html.erb | 1 +
app/views/projects/_form.html.erb | 6 +-
app/views/projects/index.api.rsb | 1 +
app/views/projects/index.html.erb | 7 +-
app/views/projects/new.html.erb | 1 -
app/views/projects/settings/_members.html.erb | 17 +-
app/views/projects/settings/_modules.html.erb | 2 +-
app/views/projects/show.api.rsb | 1 +
app/views/queries/_columns.html.erb | 4 +-
app/views/repositories/_dir_list_content.html.erb | 2 +-
app/views/repositories/_revisions.html.erb | 2 +-
app/views/repositories/committers.html.erb | 2 +-
app/views/repositories/revision.html.erb | 2 +-
app/views/roles/_form.html.erb | 2 +-
app/views/search/index.html.erb | 9 +-
app/views/settings/_display.html.erb | 4 +
app/views/settings/_general.html.erb | 2 +-
app/views/settings/_projects.html.erb | 2 +-
app/views/settings/_repositories.html.erb | 40 +-
app/views/timelog/_date_range.html.erb | 8 +-
app/views/timelog/bulk_edit.html.erb | 2 +-
app/views/trackers/_form.html.erb | 4 +-
app/views/trackers/fields.html.erb | 4 +-
app/views/users/_form.html.erb | 2 +
app/views/users/_groups.html.erb | 2 +-
app/views/users/_memberships.html.erb | 5 +-
app/views/watchers/_new.html.erb | 2 +-
app/views/watchers/create.js.erb | 2 +-
app/views/watchers/new.js.erb | 2 +-
app/views/wiki/edit.html.erb | 3 +-
app/views/wiki/rename.html.erb | 2 +-
config/environments/development.rb | 2 +-
config/environments/test.rb | 2 +-
config/initializers/10-patches.rb | 32 +
config/locales/ar.yml | 11 +
config/locales/az.yml | 11 +
config/locales/bg.yml | 12 +-
config/locales/bs.yml | 11 +
config/locales/ca.yml | 11 +
config/locales/cs.yml | 36 +-
config/locales/da.yml | 11 +
config/locales/de.yml | 10 +-
config/locales/el.yml | 11 +
config/locales/en-GB.yml | 11 +
config/locales/en.yml | 8 +
config/locales/es.yml | 9 +
config/locales/et.yml | 11 +
config/locales/eu.yml | 11 +
config/locales/fa.yml | 11 +
config/locales/fi.yml | 11 +
config/locales/fr.yml | 44 +-
config/locales/gl.yml | 11 +
config/locales/he.yml | 11 +
config/locales/hr.yml | 11 +
config/locales/hu.yml | 11 +
config/locales/id.yml | 11 +
config/locales/it.yml | 11 +
config/locales/ja.yml | 8 +
config/locales/ko.yml | 34 +-
config/locales/lt.yml | 11 +
config/locales/lv.yml | 11 +
config/locales/mk.yml | 11 +
config/locales/mn.yml | 11 +
config/locales/nl.yml | 11 +
config/locales/no.yml | 11 +
config/locales/pl.yml | 261 ++++---
config/locales/pt-BR.yml | 34 +-
config/locales/pt.yml | 11 +
config/locales/ro.yml | 11 +
config/locales/ru.yml | 8 +
config/locales/sk.yml | 11 +
config/locales/sl.yml | 11 +
config/locales/sq.yml | 11 +
config/locales/sr-YU.yml | 11 +
config/locales/sr.yml | 11 +
config/locales/sv.yml | 11 +
config/locales/th.yml | 11 +
config/locales/tr.yml | 22 +-
config/locales/uk.yml | 11 +
config/locales/vi.yml | 11 +
config/locales/zh-TW.yml | 14 +-
config/locales/zh.yml | 11 +
config/routes.rb | 2 +-
config/settings.yml | 6 +-
db/migrate/018_set_doc_and_files_notifications.rb | 16 +-
db/migrate/025_add_search_permission.rb | 2 +-
db/migrate/030_add_projects_feeds_permissions.rb | 2 +-
db/migrate/033_add_timelog_permissions.rb | 2 +-
db/migrate/043_add_relations_permissions.rb | 4 +-
db/migrate/047_add_boards_permissions.rb | 6 +-
db/migrate/049_add_wiki_destroy_page_permission.rb | 2 +-
db/migrate/050_add_wiki_attachments_permissions.rb | 4 +-
.../056_add_repositories_changes_permission.rb | 2 +-
.../20090401221305_update_enumerations_to_sti.rb | 6 +-
.../20090614091200_fix_messages_sticky_null.rb | 2 +-
db/migrate/20090704172350_populate_users_type.rb | 2 +-
.../20091010093521_fix_users_custom_values.rb | 6 +-
...402_change_users_mail_notification_to_string.rb | 12 +-
...0110228000100_copy_repositories_log_encoding.rb | 3 +-
.../20120115143126_set_default_repositories.rb | 2 +-
...110929_change_attachments_container_defaults.rb | 4 +-
...120422150750_change_repositories_to_full_sti.rb | 13 +-
.../20130713104233_create_custom_fields_roles.rb | 2 +-
...0131124175346_add_custom_fields_format_store.rb | 9 +
...20131210180802_add_custom_fields_description.rb | 9 +
..._custom_fields_min_max_length_default_values.rb | 15 +
...04612_store_relation_type_in_journal_details.rb | 26 +
...023_delete_orphan_time_entries_custom_values.rb | 9 +
...40228130325_change_changesets_comments_limit.rb | 12 +
debian/changelog | 33 +-
debian/control | 9 +-
debian/gbp.conf | 5 +-
debian/install | 1 +
debian/patches/2002_FHS_through_env_vars.patch | 2 +-
debian/patches/2017_Gemfile_debian.patch | 22 +-
debian/patches/2019_unplug_bundler.patch | 25 -
debian/patches/2020_load_awesome_nested_set.patch | 9 +
debian/patches/series | 1 +
doc/CHANGELOG | 96 ++-
doc/INSTALL | 2 +-
doc/README_FOR_APP | 2 +-
doc/UPGRADING | 2 +-
extra/mail_handler/rdm-mailhandler.rb | 2 +-
.../lib/acts_as_activity_provider.rb | 2 +-
.../acts_as_attachable/lib/acts_as_attachable.rb | 2 +-
.../lib/acts_as_customizable.rb | 7 +-
lib/plugins/acts_as_event/lib/acts_as_event.rb | 2 +-
.../acts_as_list/lib/active_record/acts/list.rb | 33 +-
.../acts_as_searchable/lib/acts_as_searchable.rb | 17 +-
.../acts_as_tree/lib/active_record/acts/tree.rb | 6 +-
lib/plugins/awesome_nested_set/.autotest | 13 -
lib/plugins/awesome_nested_set/.travis.yml | 14 -
lib/plugins/awesome_nested_set/CHANGELOG | 14 -
lib/plugins/awesome_nested_set/MIT-LICENSE | 20 -
lib/plugins/awesome_nested_set/README.rdoc | 100 ---
lib/plugins/awesome_nested_set/Rakefile | 28 -
.../awesome_nested_set/awesome_nested_set.gemspec | 22 -
lib/plugins/awesome_nested_set/init.rb | 1 -
.../awesome_nested_set/lib/awesome_nested_set.rb | 7 -
.../lib/awesome_nested_set/awesome_nested_set.rb | 601 ---------------
.../lib/awesome_nested_set/helper.rb | 44 --
.../lib/awesome_nested_set/version.rb | 3 -
lib/plugins/awesome_nested_set/rails/init.rb | 13 -
.../spec/awesome_nested_set/helper_spec.rb | 67 --
.../spec/awesome_nested_set_spec.rb | 841 ---------------------
.../awesome_nested_set/spec/db/database.yml | 18 -
lib/plugins/awesome_nested_set/spec/db/schema.rb | 45 --
.../awesome_nested_set/spec/fixtures/brokens.yml | 3 -
.../spec/fixtures/categories.yml | 34 -
.../spec/fixtures/departments.yml | 3 -
.../awesome_nested_set/spec/fixtures/notes.yml | 38 -
.../awesome_nested_set/spec/fixtures/things.yml | 27 -
lib/plugins/awesome_nested_set/spec/spec_helper.rb | 32 -
.../awesome_nested_set/spec/support/models.rb | 72 --
.../test/awesome_nested_set/helper_test.rb | 41 -
.../test/awesome_nested_set_test.rb | 603 ---------------
.../awesome_nested_set/test/db/database.yml | 18 -
lib/plugins/awesome_nested_set/test/db/schema.rb | 23 -
.../test/fixtures/categories.yml | 34 -
.../awesome_nested_set/test/fixtures/category.rb | 15 -
.../test/fixtures/departments.yml | 3 -
.../awesome_nested_set/test/fixtures/notes.yml | 38 -
lib/plugins/awesome_nested_set/test/test_helper.rb | 31 -
lib/redmine.rb | 42 +-
lib/redmine/access_control.rb | 4 +-
lib/redmine/access_keys.rb | 2 +-
lib/redmine/activity.rb | 2 +-
lib/redmine/activity/fetcher.rb | 2 +-
lib/redmine/ciphering.rb | 2 +-
lib/redmine/configuration.rb | 2 +-
lib/redmine/core_ext/active_record.rb | 2 +-
lib/redmine/core_ext/date/calculations.rb | 2 +-
lib/redmine/core_ext/string/conversions.rb | 2 +-
lib/redmine/core_ext/string/inflections.rb | 2 +-
lib/redmine/custom_field_format.rb | 115 ---
lib/redmine/default_data/loader.rb | 2 +-
lib/redmine/export/pdf.rb | 14 +-
lib/redmine/field_format.rb | 684 +++++++++++++++++
lib/redmine/helpers/calendar.rb | 2 +-
lib/redmine/helpers/diff.rb | 2 +-
lib/redmine/helpers/gantt.rb | 6 +-
lib/redmine/helpers/time_report.rb | 13 +-
lib/redmine/hook.rb | 2 +-
lib/redmine/i18n.rb | 2 +-
lib/redmine/imap.rb | 2 +-
lib/redmine/menu_manager.rb | 2 +-
lib/redmine/mime_type.rb | 35 +-
lib/redmine/pagination.rb | 2 +-
lib/redmine/platform.rb | 2 +-
lib/redmine/plugin.rb | 4 +-
lib/redmine/pop3.rb | 2 +-
lib/redmine/safe_attributes.rb | 2 +-
lib/redmine/scm/adapters.rb | 2 +-
lib/redmine/scm/adapters/abstract_adapter.rb | 5 +-
lib/redmine/scm/adapters/bazaar_adapter.rb | 4 +-
lib/redmine/scm/adapters/darcs_adapter.rb | 2 +-
lib/redmine/scm/adapters/filesystem_adapter.rb | 2 +-
lib/redmine/scm/adapters/git_adapter.rb | 2 +-
.../scm/adapters/mercurial/hg-template-1.0.tmpl | 4 +-
.../scm/adapters/mercurial/redminehelper.py | 19 +-
lib/redmine/scm/adapters/mercurial_adapter.rb | 6 +-
lib/redmine/scm/adapters/subversion_adapter.rb | 2 +-
lib/redmine/search.rb | 2 +-
lib/redmine/subclass_factory.rb | 2 +-
lib/redmine/syntax_highlighting.rb | 15 +-
lib/redmine/themes.rb | 18 +-
lib/redmine/thumbnail.rb | 2 +-
lib/redmine/unified_diff.rb | 2 +-
lib/redmine/utils.rb | 2 +-
lib/redmine/version.rb | 4 +-
lib/redmine/views/api_template_handler.rb | 2 +-
lib/redmine/views/builders.rb | 2 +-
lib/redmine/views/builders/json.rb | 2 +-
lib/redmine/views/builders/structure.rb | 2 +-
lib/redmine/views/builders/xml.rb | 2 +-
lib/redmine/views/labelled_form_builder.rb | 8 +-
lib/redmine/views/my_page/block.rb | 2 +-
lib/redmine/views/other_formats_builder.rb | 2 +-
lib/redmine/wiki_formatting.rb | 17 +-
lib/redmine/wiki_formatting/macros.rb | 4 +-
lib/redmine/wiki_formatting/markdown/formatter.rb | 136 ++++
.../{textile => markdown}/helper.rb | 13 +-
lib/redmine/wiki_formatting/textile/formatter.rb | 2 +-
lib/redmine/wiki_formatting/textile/helper.rb | 2 +-
lib/tasks/ci.rake | 34 +-
lib/tasks/ciphering.rake | 2 +-
lib/tasks/email.rake | 2 +-
lib/tasks/migrate_from_mantis.rake | 2 +-
lib/tasks/migrate_from_trac.rake | 2 +-
lib/tasks/redmine.rake | 54 +-
lib/tasks/reminder.rake | 2 +-
public/404.html | 26 +-
public/500.html | 26 +-
public/javascripts/application.js | 23 +-
public/javascripts/attachments.js | 2 +-
public/javascripts/jstoolbar/markdown.js | 194 +++++
public/javascripts/select_list_move.js | 22 +
public/stylesheets/application.css | 40 +-
test/extra/redmine_pm/repository_git_test.rb | 2 +-
.../extra/redmine_pm/repository_subversion_test.rb | 2 +-
test/extra/redmine_pm/test_case.rb | 2 +-
test/fixtures/custom_fields.yml | 18 -
test/fixtures/mail_handler/body_ks_c_5601-1987.eml | 14 +
test/fixtures/repositories/mercurial_repository.hg | Bin 11046 -> 11213 bytes
test/functional/account_controller_openid_test.rb | 4 +-
test/functional/account_controller_test.rb | 34 +-
test/functional/activities_controller_test.rb | 6 +-
test/functional/admin_controller_test.rb | 2 +-
test/functional/attachments_controller_test.rb | 4 +-
test/functional/auth_sources_controller_test.rb | 19 +-
test/functional/auto_completes_controller_test.rb | 2 +-
test/functional/boards_controller_test.rb | 8 +-
test/functional/calendars_controller_test.rb | 6 +-
test/functional/comments_controller_test.rb | 2 +-
test/functional/context_menus_controller_test.rb | 18 +-
test/functional/custom_fields_controller_test.rb | 52 +-
test/functional/documents_controller_test.rb | 4 +-
test/functional/enumerations_controller_test.rb | 2 +-
test/functional/files_controller_test.rb | 2 +-
test/functional/gantts_controller_test.rb | 2 +-
test/functional/groups_controller_test.rb | 6 +-
.../functional/issue_categories_controller_test.rb | 4 +-
test/functional/issue_relations_controller_test.rb | 10 +-
test/functional/issue_statuses_controller_test.rb | 6 +-
test/functional/issues_controller_test.rb | 351 +++++----
.../issues_controller_transaction_test.rb | 8 +-
.../issues_custom_fields_visibility_test.rb | 6 +-
test/functional/journals_controller_test.rb | 2 +-
test/functional/mail_handler_controller_test.rb | 2 +-
test/functional/members_controller_test.rb | 2 +-
test/functional/messages_controller_test.rb | 13 +-
test/functional/my_controller_test.rb | 16 +-
test/functional/news_controller_test.rb | 12 +-
test/functional/previews_controller_test.rb | 16 +-
.../project_enumerations_controller_test.rb | 56 +-
test/functional/projects_controller_test.rb | 10 +-
test/functional/queries_controller_test.rb | 2 +-
test/functional/reports_controller_test.rb | 2 +-
.../repositories_bazaar_controller_test.rb | 2 +-
test/functional/repositories_controller_test.rb | 4 +-
.../functional/repositories_cvs_controller_test.rb | 2 +-
.../repositories_darcs_controller_test.rb | 2 +-
.../repositories_filesystem_controller_test.rb | 2 +-
.../functional/repositories_git_controller_test.rb | 4 +-
.../repositories_mercurial_controller_test.rb | 4 +-
.../repositories_subversion_controller_test.rb | 2 +-
test/functional/roles_controller_test.rb | 2 +-
test/functional/search_controller_test.rb | 5 +-
.../search_custom_fields_visibility_test.rb | 2 +-
test/functional/sessions_test.rb | 2 +-
test/functional/settings_controller_test.rb | 2 +-
test/functional/sys_controller_test.rb | 2 +-
.../time_entry_reports_controller_test.rb | 6 +-
test/functional/timelog_controller_test.rb | 32 +-
.../timelog_custom_fields_visibility_test.rb | 19 +-
test/functional/trackers_controller_test.rb | 13 +-
test/functional/users_controller_test.rb | 29 +-
test/functional/versions_controller_test.rb | 2 +-
test/functional/watchers_controller_test.rb | 69 +-
test/functional/welcome_controller_test.rb | 31 +-
test/functional/wiki_controller_test.rb | 14 +-
test/functional/wikis_controller_test.rb | 7 +-
test/functional/workflows_controller_test.rb | 3 +-
test/integration/account_test.rb | 2 +-
test/integration/admin_test.rb | 2 +-
test/integration/api_test/api_test.rb | 2 +-
test/integration/api_test/attachments_test.rb | 6 +-
test/integration/api_test/authentication_test.rb | 25 +-
.../api_test/custom_fields_attribute_test.rb | 46 ++
test/integration/api_test/custom_fields_test.rb | 2 +-
.../integration/api_test/disabled_rest_api_test.rb | 2 +-
test/integration/api_test/enumerations_test.rb | 2 +-
test/integration/api_test/groups_test.rb | 2 +-
test/integration/api_test/http_basic_login_test.rb | 2 +-
.../http_basic_login_with_api_token_test.rb | 2 +-
test/integration/api_test/issue_categories_test.rb | 4 +-
test/integration/api_test/issue_relations_test.rb | 4 +-
test/integration/api_test/issue_statuses_test.rb | 2 +-
test/integration/api_test/issues_test.rb | 35 +-
test/integration/api_test/jsonp_test.rb | 2 +-
test/integration/api_test/memberships_test.rb | 10 +-
test/integration/api_test/news_test.rb | 2 +-
test/integration/api_test/projects_test.rb | 19 +-
test/integration/api_test/queries_test.rb | 2 +-
test/integration/api_test/roles_test.rb | 2 +-
test/integration/api_test/time_entries_test.rb | 8 +-
.../api_test/token_authentication_test.rb | 2 +-
test/integration/api_test/trackers_test.rb | 2 +-
test/integration/api_test/users_test.rb | 6 +-
test/integration/api_test/versions_test.rb | 8 +-
test/integration/api_test/wiki_pages_test.rb | 2 +-
test/integration/application_test.rb | 2 +-
test/integration/attachments_test.rb | 2 +-
test/integration/{users_test.rb => feeds_test.rb} | 18 +-
test/integration/issues_test.rb | 4 +-
test/integration/layout_test.rb | 2 +-
test/integration/lib/redmine/hook_test.rb | 2 +-
test/integration/lib/redmine/menu_manager_test.rb | 2 +-
test/integration/lib/redmine/themes_test.rb | 51 +-
test/integration/projects_test.rb | 2 +-
test/integration/repositories_git_test.rb | 2 +-
test/integration/routing/account_test.rb | 2 +-
test/integration/routing/activities_test.rb | 2 +-
test/integration/routing/admin_test.rb | 2 +-
test/integration/routing/attachments_test.rb | 2 +-
test/integration/routing/auth_sources_test.rb | 2 +-
test/integration/routing/auto_completes_test.rb | 2 +-
test/integration/routing/boards_test.rb | 2 +-
test/integration/routing/calendars_test.rb | 2 +-
test/integration/routing/comments_test.rb | 2 +-
test/integration/routing/context_menus_test.rb | 2 +-
test/integration/routing/custom_fields_test.rb | 2 +-
test/integration/routing/documents_test.rb | 2 +-
test/integration/routing/enumerations_test.rb | 2 +-
test/integration/routing/files_test.rb | 2 +-
test/integration/routing/gantts_test.rb | 2 +-
test/integration/routing/groups_test.rb | 2 +-
test/integration/routing/issue_categories_test.rb | 2 +-
test/integration/routing/issue_relations_test.rb | 2 +-
test/integration/routing/issue_statuses_test.rb | 2 +-
test/integration/routing/issues_test.rb | 2 +-
test/integration/routing/journals_test.rb | 2 +-
test/integration/routing/mail_handler_test.rb | 2 +-
test/integration/routing/members_test.rb | 2 +-
test/integration/routing/messages_test.rb | 2 +-
test/integration/routing/my_test.rb | 2 +-
test/integration/routing/news_test.rb | 2 +-
test/integration/routing/previews_test.rb | 2 +-
.../routing/project_enumerations_test.rb | 2 +-
test/integration/routing/projects_test.rb | 2 +-
test/integration/routing/queries_test.rb | 2 +-
test/integration/routing/reports_test.rb | 2 +-
test/integration/routing/repositories_test.rb | 2 +-
test/integration/routing/roles_test.rb | 2 +-
test/integration/routing/search_test.rb | 2 +-
test/integration/routing/settings_test.rb | 2 +-
test/integration/routing/sys_test.rb | 2 +-
test/integration/routing/timelog_test.rb | 2 +-
test/integration/routing/trackers_test.rb | 2 +-
test/integration/routing/users_test.rb | 2 +-
test/integration/routing/versions_test.rb | 2 +-
test/integration/routing/watchers_test.rb | 2 +-
test/integration/routing/welcome_test.rb | 2 +-
test/integration/routing/wiki_test.rb | 2 +-
test/integration/routing/wikis_test.rb | 2 +-
test/integration/routing/workflows_test.rb | 2 +-
test/integration/users_test.rb | 2 +-
test/object_helpers.rb | 13 +
test/test_helper.rb | 28 +-
test/ui/base.rb | 5 +-
test/ui/issues_test.rb | 7 +-
test/unit/activity_test.rb | 2 +-
test/unit/attachment_test.rb | 13 +-
test/unit/auth_source_ldap_test.rb | 2 +-
test/unit/board_test.rb | 2 +-
test/unit/changeset_test.rb | 35 +-
test/unit/comment_test.rb | 2 +-
test/unit/custom_field_test.rb | 28 +-
test/unit/custom_field_user_format_test.rb | 19 +-
test/unit/custom_field_version_format_test.rb | 18 +-
test/unit/custom_value_test.rb | 2 +-
test/unit/default_data_test.rb | 2 +-
test/unit/document_category_test.rb | 2 +-
test/unit/document_test.rb | 2 +-
test/unit/enabled_module_test.rb | 2 +-
test/unit/enumeration_test.rb | 2 +-
test/unit/group_test.rb | 4 +-
test/unit/helpers/activities_helper_test.rb | 2 +-
test/unit/helpers/application_helper_test.rb | 426 ++++++++---
test/unit/helpers/custom_fields_helper_test.rb | 19 +-
test/unit/helpers/issues_helper_test.rb | 26 +-
test/unit/helpers/projects_helper_test.rb | 2 +-
test/unit/helpers/queries_helper_test.rb | 16 +-
test/unit/helpers/search_helper_test.rb | 2 +-
test/unit/helpers/sort_helper_test.rb | 2 +-
test/unit/helpers/timelog_helper_test.rb | 2 +-
test/unit/helpers/watchers_helper_test.rb | 7 +-
test/unit/initializers/patches_test.rb | 2 +-
test/unit/issue_category_test.rb | 6 +-
test/unit/issue_custom_field_test.rb | 2 +-
test/unit/issue_nested_set_test.rb | 212 +++---
test/unit/issue_priority_test.rb | 2 +-
test/unit/issue_relation_test.rb | 11 +-
test/unit/issue_status_test.rb | 5 +-
test/unit/issue_test.rb | 115 ++-
test/unit/issue_transaction_test.rb | 14 +-
test/unit/journal_observer_test.rb | 2 +-
test/unit/journal_test.rb | 2 +-
test/unit/lib/redmine/access_control_test.rb | 2 +-
test/unit/lib/redmine/ciphering_test.rb | 10 +-
test/unit/lib/redmine/codeset_util_test.rb | 2 +-
test/unit/lib/redmine/configuration_test.rb | 2 +-
test/unit/lib/redmine/export/pdf_test.rb | 2 +-
.../lib/redmine/field_format/field_format_test.rb | 62 ++
.../lib/redmine/field_format/link_format_test.rb | 90 +++
.../lib/redmine/field_format/list_format_test.rb | 156 ++++
.../numeric_format_test.rb} | 56 +-
.../redmine/field_format/user_field_format_test.rb | 58 ++
.../field_format/version_field_format_test.rb | 59 ++
test/unit/lib/redmine/helpers/calendar_test.rb | 2 +-
test/unit/lib/redmine/helpers/diff_test.rb | 2 +-
test/unit/lib/redmine/helpers/gantt_test.rb | 326 +++-----
test/unit/lib/redmine/hook_test.rb | 2 +-
test/unit/lib/redmine/i18n_test.rb | 2 +-
test/unit/lib/redmine/info_test.rb | 2 +-
test/unit/lib/redmine/menu_manager/mapper_test.rb | 2 +-
.../lib/redmine/menu_manager/menu_helper_test.rb | 2 +-
test/unit/lib/redmine/menu_manager_test.rb | 2 +-
test/unit/lib/redmine/mime_type_test.rb | 7 +-
test/unit/lib/redmine/notifiable_test.rb | 2 +-
test/unit/lib/redmine/pagination_helper_test.rb | 4 +-
test/unit/lib/redmine/pagination_test.rb | 2 +-
test/unit/lib/redmine/plugin_test.rb | 2 +-
test/unit/lib/redmine/safe_attributes_test.rb | 2 +-
.../redmine/scm/adapters/bazaar_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/cvs_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/darcs_adapter_test.rb | 2 +-
.../scm/adapters/filesystem_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/git_adapter_test.rb | 6 +-
.../redmine/scm/adapters/mercurial_adapter_test.rb | 107 ++-
.../scm/adapters/subversion_adapter_test.rb | 2 +-
test/unit/lib/redmine/themes_test.rb | 2 +-
test/unit/lib/redmine/unified_diff_test.rb | 2 +-
test/unit/lib/redmine/utils/date_calculation.rb | 2 +-
test/unit/lib/redmine/views/builders/json_test.rb | 2 +-
test/unit/lib/redmine/views/builders/xml_test.rb | 2 +-
.../lib/redmine/wiki_formatting/macros_test.rb | 42 +-
.../redmine/wiki_formatting/markdown_formatter.rb | 64 ++
.../wiki_formatting/textile_formatter_test.rb | 2 +-
test/unit/lib/redmine/wiki_formatting_test.rb | 6 +-
test/unit/lib/redmine_test.rb | 2 +-
test/unit/mail_handler_test.rb | 30 +-
test/unit/mailer_test.rb | 19 +-
test/unit/member_test.rb | 8 +-
test/unit/message_test.rb | 4 +-
test/unit/news_test.rb | 2 +-
test/unit/principal_test.rb | 20 +-
test/unit/project_copy_test.rb | 2 +-
test/unit/project_members_inheritance_test.rb | 2 +-
test/unit/project_nested_set_test.rb | 6 +-
test/unit/project_test.rb | 26 +-
test/unit/query_test.rb | 19 +-
test/unit/repository_bazaar_test.rb | 5 +-
test/unit/repository_cvs_test.rb | 10 +-
test/unit/repository_darcs_test.rb | 5 +-
test/unit/repository_filesystem_test.rb | 2 +-
test/unit/repository_git_test.rb | 2 +-
test/unit/repository_mercurial_test.rb | 326 +++++++-
test/unit/repository_subversion_test.rb | 5 +-
test/unit/repository_test.rb | 56 +-
test/unit/role_test.rb | 2 +-
test/unit/search_test.rb | 2 +-
test/unit/setting_test.rb | 16 +-
test/unit/time_entry_activity_test.rb | 2 +-
test/unit/time_entry_query_test.rb | 2 +-
test/unit/time_entry_test.rb | 2 +-
test/unit/token_test.rb | 2 +-
test/unit/user_preference_test.rb | 2 +-
test/unit/user_test.rb | 129 ++--
test/unit/version_test.rb | 2 +-
test/unit/watcher_test.rb | 6 +-
test/unit/wiki_content_test.rb | 10 +-
test/unit/wiki_content_version_test.rb | 2 +-
test/unit/wiki_page_test.rb | 12 +-
test/unit/wiki_redirect_test.rb | 2 +-
test/unit/wiki_test.rb | 4 +-
test/unit/workflow_test.rb | 2 +-
696 files changed, 6578 insertions(+), 5683 deletions(-)
diff --cc debian/changelog
index 17a6dde,0000000..e20c8f7
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,737 -1,0 +1,744 @@@
- redmine (2.4.2-1~bpo70+1) wheezy-backports; urgency=low
-
- * Rebuild for wheezy-backports.
- * Drop version qualifiers from the following dependencies, to be able to use
- the versions already on wheezy.
- - ruby-railties
- + The `rake tmp:cache:clear` command will not work.
- - ruby-rack
- * debian/install: do not install Gemfile as passenger will try to load it,
- and will fail because this Gemfile is stricter than what we can provide in
- wheezy (e.g. it requires rails >= 3.2.12).
-
- -- Antonio Terceiro <terceiro at debian.org> Thu, 13 Feb 2014 21:11:28 -0300
++redmine (2.5.1-2~bpo70+1) wheezy-backports; urgency=medium
++
++ * Backport for Debian 7.0
++
++ -- Ondřej Surý <ondrej at debian.org> Wed, 16 Jul 2014 12:17:24 +0200
++
++redmine (2.5.1-2) unstable; urgency=medium
++
++ * New redmine needs awesome_nested_set gem
++ * Load awesome_nested_set in initializers
++
++ -- Ondřej Surý <ondrej at debian.org> Tue, 29 Apr 2014 11:48:47 +0200
++
++redmine (2.5.1-1) unstable; urgency=medium
++
++ * Add ruby-i18n (>= 0.6.9-1~) dependency to unbreak upgrades in backports
++ * New upstream version 2.5.1 (Closes: #743828)
++ * Refresh patches for 2.5.1 release
++
++ -- Ondřej Surý <ondrej at debian.org> Tue, 29 Apr 2014 09:38:26 +0200
+
+redmine (2.4.2-1) unstable; urgency=low
+
+ * New upstream version 2.4.2
+ * Update patches for 2.4.2 release
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 28 Jan 2014 11:25:00 +0100
+
+redmine (2.4.1-1) unstable; urgency=low
+
+ * New upstream version 2.4.1
+ * Refresh patches for 2.4.1 release
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 03 Dec 2013 12:04:41 +0100
+
+redmine (2.3.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Tighten redmine-mysql dependencies to ruby-mysql, as ruby-mysql2
+ exposes another interface and does not work OOTB with the current
+ postinst. (Closes: #728243)
+
+ -- Christian Hofstaedtler <zeha at debian.org> Tue, 31 Dec 2013 00:05:41 +0100
+
+redmine (2.3.3-3) unstable; urgency=low
+
+ * Drop unused rubygems build-dependency.
+ * Add ruby-rack1.4 as alternative. Closes: #731177.
+ * Remove dependency on ruby-fastercsv, this is part of the ruby1.8
+ removal.
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 02 Dec 2013 23:47:41 +0100
+
+redmine (2.3.3-2) unstable; urgency=low
+
+ * Add Gemfile patch back to allow backporting redmine
+ * Unplug bundler in the plugins as well
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 24 Oct 2013 08:55:43 +0200
+
+redmine (2.3.3-1) unstable; urgency=low
+
+ * Imported Upstream version 2.3.3
+ * Bundler is a development tool, it is not needed at runtime:
+ + remove (build-)dependency on it
+ + add 2019 patch to remove calls to it
+ + depend only on ruby-railties, not rails nor ruby-rails-3.2
+ + do not build nor install Gemfile.lock
+ * Refresh patches, unapply changeset_r11680.diff, applied upstream
+ * Remove ruby-openid from Suggests, it is already in Depends
+ * Depends on ruby-rails-observers to ensure observers are loaded
+ * Depends on libjs-scriptaculous (Closes: #702303)
+ * Standards-Version 3.9.4
+ * redmine-(pgsql|sqlite|mysql) packages recommend redmine, avoids
+ circular dependency (Closes: #709801) and match long description.
+ * Breaks plugins installed in vendor/plugins (Closes: #712715):
+ + redmine-plugin-botsfilter <= 1.02-2
+ + redmine-plugin-recaptcha <=0.1.0+git20121018
+ * README.Debian: update webrick example (Closes: #709990)
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 28 Sep 2013 13:28:10 +0200
+
+redmine (2.3.1-1) unstable; urgency=low
+
+ * Imported Upstream version 2.3.1
+ * Upload to unstable.
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 23 May 2013 10:44:29 +0200
+
+redmine (2.3.0+dfsg1-6) experimental; urgency=low
+
+ * Finish replacing RAILS_CACHE with RAILS_TMP (Closes: #704039)
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 27 Mar 2013 12:26:28 +0100
+
+redmine (2.3.0+dfsg1-5) experimental; urgency=low
+
+ * Import upstream fix to log SCM stderr when log level is set to debug
+ only.
+
+ -- Ondřej Surý <ondrej at debian.org> Fri, 22 Mar 2013 11:36:05 +0100
+
+redmine (2.3.0+dfsg1-4) experimental; urgency=low
+
+ * Fix missing then in the cache clear part of postinst script and don't
+ remove the cache directory, just the contents.
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 21 Mar 2013 17:14:30 +0100
+
+redmine (2.3.0+dfsg1-3) experimental; urgency=low
+
+ * Put scm.stderr.log into correct directory, this will reenable scm
+ commands again.
+ * Remove patch reverting caching of I18N, we just need to ensure that
+ /var/cache/redmine is cleared properly
+ * Move cache directory under cache/ subdirectory, so the rake task
+ works.
+ * Depend on ruby-railties-3.2 (>= 3.2.13-2~), so the rake
+ tmp:cache:clear command works.
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 21 Mar 2013 14:17:34 +0100
+
+redmine (2.3.0+dfsg1-2) experimental; urgency=low
+
+ * Add patch which reverts I18N caching and fix Redmine issue #13520
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 20 Mar 2013 15:00:24 +0100
+
+redmine (2.3.0+dfsg1-1) experimental; urgency=low
+
+ * Imported Upstream version 2.3.0+dfsg1
+ * Update patches for 2.3.0 release
+ * Update dependencies for redmine 2.3.0, add ruby-mysql2 as optional mysql library
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 20 Mar 2013 12:40:16 +0100
+
+redmine (2.2.3+dfsg1-1) experimental; urgency=low
+
+ * Imported Upstream version 2.2.3+dfsg1
+ * Update patches to 3.2.12 release
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 13 Feb 2013 09:06:27 +0100
+
+redmine (2.2.2+dfsg1-1) experimental; urgency=low
+
+ * Imported Upstream version 2.2.2+dfsg1
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 22 Jan 2013 11:37:49 +0100
+
+redmine (2.2.1+dfsg1-1) experimental; urgency=low
+
+ * Imported Upstream version 2.2.1+dfsg1
+ * Update patches to 2.2.1
+ * Force to use rails 3.2.11 which contain critical security update
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 15 Jan 2013 14:50:28 +0100
+
+redmine (2.2.0+dfsg1-1) experimental; urgency=low
+
+ * Imported Upstream version 2.2.0+dfsg1
+ * Refresh patches for 2.2.0 release
+ * Rework the logic of replacing session tokens to trigger when the file
+ doesn't exist or we are upgrading from previous version
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 03 Jan 2013 12:46:35 +0100
+
+redmine (2.1.4+dfsg2-2) experimental; urgency=low
+
+ * Regenerate session.yml on upgrades to fix the Class incompatibility
+ breakage in Rails 2.3->3.2 migration.
+ * Purge session.yml from ucf database before replacing it
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 12 Dec 2012 15:13:17 +0100
+
+redmine (2.1.4+dfsg2-1) experimental; urgency=low
+
+ * Update gbp.conf to filter-out lib/plugins instead of vendor/plugins
+ * Update NEWS to match the news upstream version
+ * Add myself to Uploaders
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 11 Dec 2012 11:42:38 +0100
+
+redmine (2.1.4+dfsg1-1) experimental; urgency=low
+
+ [ Ondřej Surý ]
+ * Imported Upstream version 2.1.4
+ * Update plugins directory from vendor/plugins to lib/plugins
+ * debian/control:
+ + Update depedencies for redmine (mainly switch from Rails 2.3 to
+ Rails 3.2)
+ + Add rubygems to Build-Depends
+ + Adds Conflict with ruby-passenger << 3, because redmine is not
+ compatible with version 2
+ + Add dependency on redmine (= ${source:Version}) for all database
+ packages, so they are upgraded together.
+ + Bump ruby-mysql dependency to >= 2.8.1 per Gemfile
+ * debian/patches/*:
+ + Update (and refresh) patches to Redmine 2.1.x
+ + In ActiveRecord 3.2, MysqlAdapter extends AbstractMysqlAdapter, not
+ AbstractAdapter (Courtesy of Adrian Wilkins)
+ + Load session.yml only if the file exists
+ + Update Gemfile-comment-all-gems patch for 2.1.4 release
+ * debian/postinst:
+ + The rake task generate_session_store has been deprecated, using
+ the generate_secret_token in postinst instead.
+ + The rake task db:migrate_plugins has been deprecated, using the
+ replacement version redmine:plugins:migrate instead
+
+ [ Jérémy Lal ]
+ * debian/control:
+ + Recommends: libfcgi-ruby1.9.1 | libfcgi-ruby,
+ it is needed when using fastcgi with ruby1.9.
+ + Recommends: ruby-passenger.
+ + Depends on ruby-{pg,mysql,sqlite3} instead of libxxx-ruby packages.
+ * debian/postinst: use exit 1 instead of illegal negative value.
+ (Closes: #687449)
+
+ -- Ondřej Surý <ondrej at debian.org> Mon, 10 Dec 2012 12:33:19 +0100
+
+redmine (1.4.4+dfsg1-3) unstable; urgency=low
+
+ [ Jérémy Lal ]
+ * This release is a candidate for proposed-updates.
+ Changes have been kept to the minimum.
+
+ [ Ondřej Surý ]
+ * Pull upstream fixes for Ruby 1.9 as default interpreter:
+ + Replace missing ParseDate with DateTime (Closes: #700754)
+ + Fix broken REST API (Closes: #700009)
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 11 May 2013 16:26:27 +0200
+
+redmine (1.4.4+dfsg1-2) unstable; urgency=low
+
+ * Manage and set dbuser default value like dbname. (Closes: #695774)
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 19 Jan 2013 15:54:02 +0100
+
+redmine (1.4.4+dfsg1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: add dependency on rubygems or recent enough ruby
+ (Closes: #693994) [Axel Beckert].
+ * debian/postinst: replace exit status -1 with 2 for shell compatibility
+ (e.g. ksh) (Closes: #687449).
+
+ -- Dominik George <nik at naturalnet.de> Sun, 29 Nov 2012 14:18:29 +0200
+
+redmine (1.4.4+dfsg1-1) unstable; urgency=low
+
+ * Upstream update.
+ * debian/patches: trivial refresh.
+ * debian/copyright: remove unused GPL section.
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 18 Jun 2012 23:26:07 +0200
+
+redmine (1.4.3+dfsg1-1) unstable; urgency=low
+
+ * Upstream update.
+ * debian/patches: trivial refresh.
+
+ -- Jérémy Lal <kapouer at melix.org> Wed, 06 Jun 2012 00:11:33 +0200
+
+redmine (1.4.2+dfsg1-1) unstable; urgency=low
+
+ * Upstream update.
+ Gem dependencies are managed by bundler, thus were removed from tarball.
+ * debian/control:
+ + depends on ruby | ruby-interpreter, as redmine is compatible with
+ ruby1.8 and ruby1.9.
+ + depends on ruby-net-ldap >= 0.3.1.
+ + depends on ruby-fastercsv.
+ + depends on ruby-openid instead of libopenid-ruby.
+ + build-depends and depends on bundler.
+ * debian/rules: do a bundler --local install, without any actual gem.
+ * debian/copyright:
+ + remove rails, ruby-net-ldap, rubytree, coderay dependencies.
+ + remove lib/faster_csv.rb, now a dependency.
+ + extend year to 2012.
+ * debian/patches:
+ + remove 2001_fix_shebang_interpreter.patch, unbundled file.
+ + remove 2014_relax_RAILS_GEM_VERSION.patch, moved to Gemfile.
+ + remove 2015_use_system_coderay.patch, moved to Gemfile.
+ + trivial refresh on other patches.
+ + remove 2016_fix_openid_login_7857_and_8473.patch, not needed
+ since rails 2.3.14, necessity unclear.
+ + 2017_Gemfile_debian.patch, prevents bundler from installing gems.
+ * debian/README.source: update how to run tests.
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 20 May 2012 16:43:11 +0200
+
+redmine (1.3.3+dfsg1-2) unstable; urgency=low
+
+ * Depends on coderay >= 1.0.5. (Closes: #669153)
+ * Drop unneeded Suggests: libsvn-ruby.
+ * Suggests: bzr, cvs, darcs, git, mercurial, subversion.
+ Redmine directly calls SCM binary and doesn't use any ruby bindings.
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 22 Apr 2012 12:28:24 +0200
+
+redmine (1.3.3+dfsg1-1) unstable; urgency=low
+
+ * Upstream update.
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 14 Apr 2012 18:34:03 +0200
+
+redmine (1.3.2+dfsg1-1) unstable; urgency=low
+
+ * Upstream update.
+ * Standards-Version 3.9.3.
+ * Explicit dependency on ruby-rake >= 1.4.0.
+ * debian/patches:
+ + 1014_logout_cookie_rake.patch disabled, fixed by ruby-rake >= 1.4.0.
+ + 1015_update_rubytree_specification.patch, applied upstream.
+
+ -- Jérémy Lal <kapouer at melix.org> Tue, 13 Mar 2012 11:09:31 +0100
+
+redmine (1.3.1+dfsg1-1) unstable; urgency=low
+
+ * Upstream update.
+ * Adds 'ar' language to debian/config list.
+ * Update nl (Dutch) translation. (Closes: #659247)
+ Thanks to Jeroen Schot.
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 11 Feb 2012 16:50:07 +0100
+
+redmine (1.3.0+dfsg1-2) unstable; urgency=low
+
+ [ Jérémy Lal ]
+ * debian/patches/2002_FHS_through_env_vars.patch:
+ Output pdf in RAILS_CACHE, not in Rails.root/tmp.
+ (Closes: #656329)
+
+ [ Paul van Tilburg ]
+ * debian/watch: fixed a small error in the dversionmangle pattern.
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 19 Jan 2012 22:54:28 +0100
+
+redmine (1.3.0+dfsg1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Require rails >= 2.3.14
+ * New pt_BR.po file for debian. (Closes:#652881)
+ * Update debian/copyright (raphael.js, coderay 0.9.7 to 1.0.0).
+ * Refresh patches :
+ + RAILS_ROOT is now Rails.root
+ + Remove unused or applied upstream patches.
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 26 Dec 2011 17:49:51 +0100
+
+redmine (1.2.2+dfsg1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 13 Nov 2011 09:18:17 +0100
+
+redmine (1.2.1+dfsg2-3) unstable; urgency=low
+
+ * Fix vendor/gems/rubytree-0.5.2/.specification file, which was
+ not recognized by rubygems >= 1.8.10. (Closes: #645139)
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 23 Oct 2011 13:21:18 +0200
+
+redmine (1.2.1+dfsg2-2) unstable; urgency=low
+
+ [ Jérémy Lal ]
+ * Require rails >= 2.3.11. (Closes: #642382)
+ * Upload to unstable. (Closes: #645139)
+
+ [ Ondřej Surý ]
+ * Fix NoMethodError and OpenID authentication errors.
+ + http://www.redmine.org/issues/7857
+ + http://www.redmine.org/issues/8473
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 13 Oct 2011 01:31:53 +0200
+
+redmine (1.2.1+dfsg2-1) experimental; urgency=low
+
+ [ Jérémy Lal ]
+ * DFSG vendor/plugins/rfpdf/lib/fonts except makefontuni_ruby.php
+ * Use ttf2ufm and makefontuni_ruby.php to build the rfpdf fonts files
+ from ttf-freefont and ttf-dejavu packages.
+ * Update debian/copyright
+ * Depends on ruby-coderay package instead of installing bundled gem.
+ * Recommends ruby-net-ldap package instead of installing bundled one.
+ (Closes: #628710)
+
+ [ Ondřej Surý ]
+ * Imported Upstream version 1.2.1
+ * Add patch to prefix subtasks in generated PDF
+ (http://www.redmine.org/issues/8617)
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 26 Aug 2011 15:01:22 +0200
+
+redmine (1.2.0-1) UNRELEASED; urgency=low
+
+ [ Ondřej Surý ]
+ * Push redmine-1.2.0 to experimental
+ * Imported Upstream version 1.2.0
+ (Closes: #629608)
+ * Updated patches to 1.2.0 release
+ * Update scripts and documentation:
+ + email.yml was renamed to configuration.yml
+ + rfpdf/lib/rfpdf/ was changed to rfpdf/lib/fpdf/
+
+ [ Jérémy Lal ]
+ * Add new locale fa (Persian) in debian config
+ * email.yml renamed to configuration.yml : ucf purge accordingly.
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 02 Jul 2011 16:51:40 +0200
+
+redmine (1.1.3-4) unstable; urgency=low
+
+ * rack 1.3.1 does not support symbols as keys in cookie hash.
+ (Closes: #637486)
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 01 Sep 2011 21:53:43 +0200
+
+redmine (1.1.3-3) unstable; urgency=low
+
+ [ Jérémy Lal ]
+ * rack 1.3.1 does not support calling cookies.delete on a symbol.
+ (Closes: #637486).
+ * vendor/rails now links to /usr/lib/ruby/vendor_ruby/rails,
+ only if it exists, preserving older rails compatibility.
+ (Closes: #635456).
+ * backport r5134 to fix "Add a relation between issues"
+ (Closes: #639190)
+
+ [ Ondřej Surý ]
+ * Alternatively depend on rails to allow easy backports
+
+ -- Jérémy Lal <kapouer at melix.org> Wed, 24 Aug 2011 22:59:58 +0200
+
+redmine (1.1.3-2) unstable; urgency=low
+
+ * Do not setup /var/run/redmine in postinst, /run is tmpfs.
+ Propose other paths:/var/run/lighttpd, /tmp.
+ (Closes: #631058).
+ * Depends on renamed packages ruby-rails-2.3, ruby-rmagick.
+ * Depends on ruby1.8 only. Fix shebangs.
+ * Output a message and exit postinst with error if rake db:migrate fails
+ (Closes: #632178).
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 24 Jul 2011 23:02:50 +0200
+
+redmine (1.1.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #628180, #628181, #625270)
+ * Move VCS to git.debian.org
+ * Standards-Version 3.9.2
+ * Depends on rails >= 2.3.11, remove unneeded patches:
+ + debian/patches/2011_rubygems_need_thread.patch
+ + debian/patches/2010_use_i18n_0.4.1.patch (part of)
+ + debian/patches/2007_disable_deprecation_warnings.patch
+ + debian/patches/2012_rubygems_version_requirement.patch
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 30 May 2011 19:45:53 +0200
+
+redmine (1.1.2-2) unstable; urgency=low
+
+ * Upload to unstable. (Closes: #620911)
+
+ -- Jérémy Lal <kapouer at melix.org> Tue, 05 Apr 2011 04:06:22 +0200
+
+redmine (1.1.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Update and convert debian/copyright to dep5 format.
+ * Work around rubygems bug #587767.
+ * Add version_requirement method support for compatibility with
+ rubygems >= 1.5.0.
+
+ -- Jérémy Lal <kapouer at melix.org> Tue, 22 Mar 2011 01:16:28 +0100
+
+redmine (1.1.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * All patches follow DEP-3 format.
+
+ -- Jérémy Lal <kapouer at melix.org> Wed, 26 Jan 2011 11:26:59 +0100
+
+redmine (1.0.5-1) unstable; urgency=low
+
+ * New upstream release
+ * i18n patch needed because redmine 1.0.5 depend on libi18n-ruby 0.4.2.
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 24 Dec 2010 17:51:03 +0100
+
+redmine (1.0.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 28 Nov 2010 19:38:34 +0100
+
+redmine (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Support for variable 'x_debian_siteid' in thin config file,
+ and provide yml example.
+ * Update the list of supported locales for loading default data,
+ upstream added support for : en-GB, eu, lv, mk, mn, sr-YU.
+ (Closes: #566859)
+ * Remove "disable autologin" patch, applied upstream.
+
+ -- Jérémy Lal <kapouer at melix.org> Wed, 03 Nov 2010 12:33:52 +0100
+
+redmine (1.0.2-4) unstable; urgency=low
+
+ * Fix wrong dependencies on libdbd-*-ruby packages,
+ only lib(mysql|pgsql|sqlite3)-ruby are needed.
+ * Make "disable autologin" really work. From upstream patch
+ http://www.redmine.org/issues/6438
+ * Some patches were missing a description.
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 18 Oct 2010 01:14:19 +0200
+
+redmine (1.0.2-3) unstable; urgency=low
+
+ * Disable GEM deprecation more carefully. (Closes: #599943)
+ * Remove i18n deprecation message.
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 15 Oct 2010 21:50:28 +0200
+
+redmine (1.0.2-2) unstable; urgency=low
+
+ * Update vi translation. (Closes: #598605)
+ * Hint dbconfig-common so it creates mysql or pgsql databases
+ using UTF8 encoding, when that feature will be available.
+ * Patch ActiveRecord's MySql adapter so tables are created with
+ DEFAULT ENCODING = the one given in database.yml.
+ (Closes: #597652)
+ * Silence gem deprecation warnings in production env. (Closes: #599943)
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 15 Oct 2010 00:56:33 +0200
+
+redmine (1.0.2-1) unstable; urgency=low
+
+ * New upstream release: better stability, and translations
+ updates. See http://www.redmine.org/versions/show/24
+ * Reformat README.Debian to make it easier to read, mention that running
+ with webrick needs a log dir. (Closes: #597649)
+ * Remove patch for libi18n-ruby 0.4.1 support, applied upstream.
+ Silent deprecation warnings in production env.
+ * Update es translation. (Closes: #594853)
+ * Improve apache2-passenger-host.conf example.
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 27 Sep 2010 02:17:00 +0200
+
+redmine (1.0.1-1) unstable; urgency=low
+
+ * Upstream update, fixes many 1.0.0 RC bugs, see :
+ http://www.redmine.org/versions/show/21
+ * Patch for libi18n-ruby 0.4.1 support. (Closes: #592672)
+ * Postinst note should be an error. (Closes: #591220)
+ * Update translations. (Closes: #591072, #591219, #591235, #591268,
+ #591308, #591689, #591716, #592371)
+ * Fix /usr/share/doc/redmine/examples/apache2-* to work with
+ libapache2-mod-fcgid >= 2.3.5 (LP: #620392)
+ * Rephrase web server configuration section in README.Debian (LP: #620412)
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 01 Aug 2010 15:41:26 +0200
+
+redmine (1.0.0-4) unstable; urgency=low
+
+ * If package redmine-<dbtype> is not installed, display a postinst
+ debconf note and do not configure that db instance. (Closes: #590695)
+ * Migration from rails 2.2 links : check if link exists with -L, not -e.
+ * Add cs translation. (Closes: #589951)
+ * Display correct path for email.yml configuration. (Closes: #590846)
+ * Fix multiple db config by executing dbconfig scripts in a subshell.
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 30 Jul 2010 15:12:38 +0200
+
+redmine (1.0.0-3) unstable; urgency=low
+
+ * Ensure vendor/rails link is created.
+
+ -- Jérémy Lal <kapouer at melix.org> Tue, 20 Jul 2010 23:22:42 +0200
+
+redmine (1.0.0-2) unstable; urgency=low
+
+ * Fix detection of rails 2.2 links. (Closes: #588583)
+
+ -- Jérémy Lal <kapouer at melix.org> Tue, 20 Jul 2010 16:00:17 +0200
+
+redmine (1.0.0-1) unstable; urgency=low
+
+ * New upstream release : upstream considers it is a Release
+ Canditate. Expect an update soon.
+ * Refreshed quilt patches
+ * Coderay plugin has been updated : update debian/rules and
+ patch one of its files to remove an unnecessary shebang.
+ * README.Debian : add more info about launching with webrick.
+ (Closes: #589033)
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 18 Jul 2010 23:13:46 +0200
+
+redmine (0.9.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 09 Jul 2010 23:48:32 +0200
+
+redmine (0.9.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version 3.9.0, BSD license included in copyright file.
+ * uscan calls uupdate.
+
+ -- Jérémy Lal <kapouer at melix.org> Tue, 29 Jun 2010 06:59:34 +0200
+
+redmine (0.9.4-4) unstable; urgency=low
+
+ * Let rails decide GC. (Closes: #585976)
+
+ -- Jérémy Lal <kapouer at melix.org> Fri, 18 Jun 2010 23:36:14 +0200
+
+redmine (0.9.4-3) unstable; urgency=low
+
+ * Depends on rails 2.3.5. (Closes: #583107, #583313)
+ * Clean up dependencies and recommandations.
+ * Overall improvement over previous rails 2.2.3 version, since
+ upstream supports redmine-0.9.4 / rails 2.3.5 combination.
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 27 May 2010 02:44:42 +0200
+
+redmine (0.9.4-2) unstable; urgency=low
+
+ * ENV['RAILS_RELATIVE_URL_ROOT'] should never be empty.
+ (Closes: #581383)
+
+ -- Jérémy Lal <kapouer at melix.org> Wed, 12 May 2010 17:25:00 +0200
+
+redmine (0.9.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Migration from trac fix. (Closes: #576682)
+ * /usr/share/redmine/config/environment.rb owned by www-data:root,
+ so Passenger runs redmine as www-data instead of nobody.
+ (Closes: #575462)
+ * Use dh_installexamples instead of docs.
+ * Additionnal and tested examples for passenger, nginx, spawn-fcgi.
+ * Security fix : Escape revision on repository view.
+ * DM-Upload-Allowed: yes
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 02 May 2010 13:58:12 +0200
+
+redmine (0.9.3-3) unstable; urgency=low
+
+ * Removes completely ineffective fcgi patch.
+ * Security fix : Escape href attribute in auto links.
+ * Security fix : Fixes permission check in QueriesController.
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 25 Mar 2010 00:13:02 +0100
+
+redmine (0.9.3-2) unstable; urgency=low
+
+ * Rails 2.2 fix for mantis and trac migration tasks.
+ * Rails 2.2 fix for application_controller naming, allows
+ better compatibility with plugins.
+ * Rails 2.2 fix hanging fcgi processes when database connections
+ are left open : restarting spawn-fcgi is no more painful.
+ * fr.po update. (Closes: #575152)
+
+ -- Jérémy Lal <kapouer at melix.org> Wed, 24 Mar 2010 12:28:13 +0100
+
+redmine (0.9.3-1) unstable; urgency=low
+
+ * First attempt to support plugins. Unfortunately, many of them
+ already depend on rails 2.3, so they'll need some patches.
+ * Load session.yml in config/environment.rb before loading plugins.
+ (Closes: #549453)
+ * Move public/plugin_assets to /var/cache/redmine/plugin_assets.
+ The server config must be fixed, examples are provided.
+ (Closes: #570308)
+ * Recommends libapache2-mod-passenger and provide some example for
+ its configuration. (Closes: #570184)
+ * Update email.yml example, document in README.Debian a bug with
+ delivery method async_smtp. (Closes: #570402)
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 28 Feb 2010 19:32:55 +0100
+
+redmine (0.9.2-2) unstable; urgency=low
+
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Drop get-orig-source, use uscan only, add copyright for rails
+ * Fix forms select helper, another rails 2.2 incompatibility.
+ (Closes: #569080)
+ * Correctly declare generate_session_store task. (Closes: #569555)
+ * Monkey patch to allow XHR requests in rails 2.2.3-2.
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 14 Feb 2010 15:58:08 +0100
+
+redmine (0.9.2-1) unstable; urgency=low
+
+ * Upstream update
+ * Adds id language to debian/config list.
+ * Correct apache2 host example config. (Closes: #568859)
+ * Migrate databases and plugins even when not reinstalled
+ by dbconfig. (Closes: #568861)
+
+ -- Jérémy Lal <kapouer at melix.org> Mon, 08 Feb 2010 14:08:42 +0100
+
+redmine (0.9.1-1) unstable; urgency=low
+
+ * Stop using deprecated dbfile param in database.yml.
+ * Use session.yml to store secret session key.
+ * Supports and documents running as unprivileged user. (Closes: #564086)
+ * Split debian/patches.
+ * Fix typo in po templates. (Closes: #553376)
+ * Adds pt, de, sv, ru, es, ja translations.
+ (Closes: #553375, #551002, #552736, #554351, #560999, #555693)
+ * Fixes CVE-2009-4459 : uses the title tag before defining
+ the character encoding in a meta tag. (Closes: #563940)
+ * Install does not fail if rake fails (Closes: #566160)
+ * Several rails 2.2 incompatibilities have been fixed,
+ patches are applied with greater care. (Closes: #555956, #567512)
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 30 Jan 2010 16:48:26 +0100
+
+redmine (0.9.0~svn2907-1) unstable; urgency=low
+
+ * Upstream update.
+ * Supports reconfigure in postinst.
+ * Db migration of plugins in postinst.
+ * Advertise async_smtp in email.yml example.
+
+ -- Jérémy Lal <kapouer at melix.org> Sat, 10 Oct 2009 17:43:46 +0200
+
+redmine (0.9.0~svn2903-1) unstable; urgency=low
+
+ * Upstream update.
+ * Removes circular dependencies (Closes: #549442)
+ * Session cookies path should respect RAILS_RELATIVE_URL_ROOT env variable.
+ * Add folder for proper initialization of some plugins.
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 08 Oct 2009 18:59:18 +0200
+
+redmine (0.9.0~svn2902-1) unstable; urgency=low
+
+ * Initial release (Closes: #478741)
+
+ -- Jérémy Lal <kapouer at melix.org> Thu, 01 Oct 2009 12:16:16 +0200
diff --cc debian/control
index 545ff89,0000000..5276f45
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,105 -1,0 +1,106 @@@
+Source: redmine
+Section: web
+Priority: extra
+Maintainer: Jérémy Lal <kapouer at melix.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>,
+ Ondřej Surý <ondrej at debian.org>,
+ Antonio Terceiro <terceiro at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, ttf2ufm, ttf-dejavu, ttf-freefont, php5-cli
+Build-Depends-Indep: po-debconf
+Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/redmine.git
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/redmine.git
+Homepage: http://www.redmine.org
+
+Package: redmine
+Architecture: all
+Pre-Depends: debconf
+Depends: ruby | ruby-interpreter,
- ruby-railties-3.2,
++ ruby-railties-3.2 (>= 3.2.16-1~),
+ ruby-rails-observers,
+ dbconfig-common,
+ redmine-sqlite | redmine-mysql | redmine-pgsql,
- ruby-rack | ruby-rack1.4,
++ ruby-rack (>= 1.4.5~) | ruby-rack1.4,
+ ruby-coderay (>= 1.0.6),
+ ruby-net-ldap (>= 0.3.1),
+ ruby-openid,
+ ruby-rack-openid,
+ libjs-scriptaculous,
+ ruby-i18n (>= 0.6.9-1~),
++ ruby-awesome-nested-set,
+ ${misc:Depends}
+Breaks: redmine-plugin-botsfilter (<=1.02-2),
+ redmine-plugin-recaptcha (<=0.1.0+git20121018)
+Conflicts: ruby-passenger (<< 3)
+Recommends: ruby-passenger, libfcgi-ruby1.9.1 | libfcgi-ruby
+Suggests: ruby-rmagick,
+ bzr,
+ cvs,
+ darcs,
+ git,
+ mercurial,
+ subversion
+Description: flexible project management web application
+ Redmine is a flexible project management web application. Written using Ruby
+ on Rails framework, it is cross-platform and cross-database.
+ .
+ Dependencies for database support are provided by these metapackages:
+ redmine-mysql, redmine-pgsql, redmine-sqlite.
+ .
+ Features
+ * Multiple projects support
+ * Flexible role based access control
+ * Flexible issue tracking system
+ * Gantt chart and calendar
+ * News, documents & files management
+ * Feeds & email notifications
+ * Per project wiki
+ * Per project forums
+ * Time tracking
+ * Custom fields for issues, time-entries, projects and users
+ * SCM integration (SVN, CVS, Git, Mercurial, Bazaar and Darcs)
+ * Issue creation via email
+ * Multiple LDAP authentication support
+ * User self-registration support
+ * Multilanguage support
+
+Package: redmine-mysql
+Architecture: all
+Depends: ruby-mysql (>= 2.8.1),
- mysql-client | virtual-mysql-client,
- ${misc:Depends}
++ mysql-client | virtual-mysql-client,
++ ${misc:Depends}
+Recommends: redmine (= ${source:Version})
+Suggests: mysql-server
+Description: metapackage providing MySQL dependencies for Redmine
+ This package only provides MySQL dependencies for Redmine, a
+ flexible project management web application. Install this
+ one if you want to use a MySQL database with Redmine.
+ .
+ Redmine package should be installed along with this package.
+
+Package: redmine-pgsql
+Architecture: all
+Depends: ruby-pg,
+ postgresql-client,
+ ${misc:Depends}
+Recommends: redmine (= ${source:Version})
+Suggests: postgresql
+Description: metapackage providing PostgreSQL dependencies for Redmine
+ This package provides PostgreSQL dependencies for Redmine, a
+ flexible project management web application. Install this
+ one if you want to use a PostgreSQL database with Redmine.
+ .
+ Redmine package should be installed along with this package.
+
+Package: redmine-sqlite
+Architecture: all
+Depends: ruby-sqlite3,
+ sqlite3,
+ ${misc:Depends}
+Recommends: redmine (= ${source:Version})
+Description: metapackage providing sqlite dependencies for Redmine
+ This package provides sqlite dependencies for Redmine, a
+ flexible project management web application. Install this
+ one if you want to use a sqlite database with Redmine.
+ .
+ Redmine package should be installed along with this package.
diff --cc debian/gbp.conf
index 5e5582e,0000000..ad1914a
mode 100644,000000..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,15 -1,0 +1,16 @@@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+pristine-tar = True
+sign-tags = True
+
- upstream-branch = upstream-wheezy-backports
- debian-branch = master-wheezy-backports
++upstream-branch = upstream
++debian-branch = master
++
+
+[git-import-orig]
+filter-pristine-tar = True
+# filter out *.bak, *~ files upstream sometimes let through.
+# Since redmine version 1.2, filter out vendor/plugins/rfpdf/lib/fonts except makefontuni_ruby.php because it's not DFSG
+# and instead generate needed font files when building package, using ttf2ufm and that php script.
+filter = ['*.bak', '*~', 'lib/plugins/rfpdf/lib/fonts/dejavu-ttf-2.15', 'lib/plugins/rfpdf/lib/fonts/ttf-bitstream-vera-1.10', 'lib/plugins/rfpdf/lib/fonts/freefont', 'lib/plugins/rfpdf/lib/fonts/old', 'lib/plugins/rfpdf/lib/fonts/*.z', 'lib/plugins/rfpdf/lib/fonts/*.rb', 'lib/plugins/rfpdf/lib/fonts/ttf2ufm/ttf2ufm*', 'lib/plugins/rfpdf/lib/fonts/.noencode']
diff --cc debian/install
index 1616017,0000000..041821e
mode 100644,000000..100644
--- a/debian/install
+++ b/debian/install
@@@ -1,15 -1,0 +1,16 @@@
+# Install the basic application files
+app usr/share/redmine
+config usr/share/redmine
+db usr/share/redmine
+extra usr/share/redmine
+lib usr/share/redmine
+public usr/share/redmine
+Rakefile usr/share/redmine
++Gemfile usr/share/redmine
+script 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
+buildfonts/*.z usr/share/redmine/lib/plugins/rfpdf/lib/fonts
+buildfonts/*.rb usr/share/redmine/lib/plugins/rfpdf/lib/fonts
diff --cc debian/patches/2002_FHS_through_env_vars.patch
index 1280ec0,0000000..a9385f6
mode 100644,000000..100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@@ -1,116 -1,0 +1,116 @@@
+Description: FHS through env vars
+Forwarded: not-needed
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2013-09-28
+--- redmine.orig/app/models/attachment.rb
++++ redmine/app/models/attachment.rb
+@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base
+ "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
+
+ cattr_accessor :storage_path
+- @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
++ @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], "files") : File.join(Rails.root, "files")
+
+ cattr_accessor :thumbnails_storage_path
+- @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
++ @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails")
+
+ before_save :files_to_final_location
+ after_destroy :delete_from_disk
+--- redmine.orig/lib/redmine/configuration.rb
++++ redmine/lib/redmine/configuration.rb
+@@ -32,7 +32,7 @@ module Redmine
+ # * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml)
+ # * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env)
+ def load(options={})
+- filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml')
++ filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml')
+ env = options[:env] || Rails.env
+
+ @config = @defaults.dup
+@@ -103,7 +103,7 @@ module Redmine
+ end
+
+ def load_deprecated_email_configuration(env)
+- deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml')
++ deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml')
+ if File.file?(deprecated_email_conf)
+ warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting."
+ @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
+--- redmine.orig/lib/redmine/export/pdf.rb
++++ redmine/lib/redmine/export/pdf.rb
+@@ -38,7 +38,7 @@ module Redmine
+ attr_accessor :footer_date
+
+ def initialize(lang, orientation='P')
+- @@k_path_cache = Rails.root.join('tmp', 'pdf')
++ @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf')
+ FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
+ set_language_if_valid lang
+ pdf_encoding = l(:general_pdf_encoding).upcase
+--- redmine.orig/config/application.rb
++++ redmine/config/application.rb
+@@ -2,6 +2,17 @@ require File.expand_path('../boot', __FI
+
+ require 'rails/all'
+
++# Force Rails environment to be production
++Rails.env ||= ActiveSupport::StringInquirer.new('production')
++
++# for debian package : setup proper environment variables and paths
++# To run redmine as unprivileged user, see /usr/share/doc/redmine/README.Debian
++ENV['X_DEBIAN_SITEID'] ||= 'default'
++ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
++ENV['RAILS_LOG'] ||= "/var/log/redmine/#{ENV['X_DEBIAN_SITEID']}"
++ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
++ENV['RAILS_TMP'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
++
+ if defined?(Bundler)
+ # If you precompile assets before deploying to production, use this line
+ Bundler.require(*Rails.groups(:assets => %w(development test)))
+@@ -52,8 +63,19 @@ module RedmineApp
+ # Do not include all helpers
+ config.action_controller.include_all_helpers = false
+
++ # move tmp directory to RAILS_TMP
++ config.paths['tmp'] = ENV['RAILS_TMP']
++
+ config.session_store :cookie_store, :key => '_redmine_session'
+
++ # log path
++ config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG']
++
++ config.cache_store = :file_store, File.join(ENV['RAILS_TMP'], "cache")
++
++ # Set Active Record's database.yml path
++ config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
++
+ if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
+ instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
+ end
+--- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb
++++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb
+@@ -89,10 +89,10 @@ class TCPDF
+ @@k_small_ratio = 2/3.0
+
+ cattr_accessor :k_path_cache
+- @@k_path_cache = Rails.root.join('tmp')
++ @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp')
+
+ cattr_accessor :k_path_url_cache
+- @@k_path_url_cache = Rails.root.join('tmp')
++ @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp')
+
+ attr_accessor :barcode
+
+--- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb
++++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb
- @@ -221,7 +221,7 @@ module Redmine
++@@ -222,7 +222,7 @@ module Redmine
+ if @stderr_log_file.nil?
+ writable = false
+ path = Redmine::Configuration['scm_stderr_log_file'].presence
+- path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
++ path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
+ if File.exists?(path)
+ if File.file?(path) && File.writable?(path)
+ writable = true
diff --cc debian/patches/2017_Gemfile_debian.patch
index 0bc8377,0000000..447042d
mode 100644,000000..100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@@ -1,93 -1,0 +1,103 @@@
- --- redmine.orig/Gemfile
- +++ redmine/Gemfile
- @@ -1,90 +1,5 @@
++diff --git a/Gemfile b/Gemfile
++index 13915c6..9bd2fc2 100644
++--- a/Gemfile
+++++ b/Gemfile
++@@ -1,98 +1,5 @@
+ source 'https://rubygems.org'
+
- -gem "rails", "3.2.16"
++-gem "rails", "3.2.17"
++-gem "rake", "~> 10.1.1"
+-gem "jquery-rails", "~> 2.0.2"
+-gem "coderay", "~> 1.1.0"
+-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+-gem "builder", "3.0.0"
++-gem "mime-types"
++-gem "awesome_nested_set", "2.1.6"
+-
+-# Optional gem for LDAP authentication
+-group :ldap do
+- gem "net-ldap", "~> 0.3.1"
+-end
+-
+-# Optional gem for OpenID authentication
+-group :openid do
+- gem "ruby-openid", "~> 2.3.0", :require => "openid"
+- gem "rack-openid"
+-end
+-
- -# Optional gem for exporting the gantt to a PNG file, not supported with jruby
+-platforms :mri, :mingw do
++- # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+- group :rmagick do
+- # RMagick 2 supports ruby 1.9
+- # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+- # different requirements for the same gem on different platforms
+- gem "rmagick", ">= 2.0.0"
+- end
++-
++- # Optional Markdown support, not for JRuby
++- group :markdown do
++- # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
++- gem "redcarpet", "~> 2.3.0"
++- end
+-end
+-
+-platforms :jruby do
+- # jruby-openssl is bundled with JRuby 1.7.0
+- gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
+- gem "activerecord-jdbc-adapter", "~> 1.3.2"
+-end
+-
+-# Include database gems for the adapters found in the database
+-# configuration file
+-require 'erb'
+-require 'yaml'
+-database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+-if File.exist?(database_file)
+- database_config = YAML::load(ERB.new(IO.read(database_file)).result)
+- adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
+- if adapters.any?
+- adapters.each do |adapter|
+- case adapter
+- when 'mysql2'
+- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+- when 'mysql'
+- gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+- when /postgresql/
+- gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+- when /sqlite3/
+- gem "sqlite3", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+- when /sqlserver/
+- gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
+- gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+- else
+- warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
+- end
+- end
+- else
+- warn("No adapter found in config/database.yml, please configure it first")
+- end
+-else
+- warn("Please configure your config/database.yml first")
+-end
+-
+-group :development do
+- gem "rdoc", ">= 2.4.2"
+- gem "yard"
+-end
+-
+-group :test do
+- gem "shoulda", "~> 3.3.2"
+- gem "mocha", ">= 0.14", :require => 'mocha/api'
+- if RUBY_VERSION >= '1.9.3'
+- gem "capybara", "~> 2.1.0"
+- gem "selenium-webdriver"
- - gem "database_cleaner"
+- end
+-end
+-
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exists?(local_gemfile)
+ puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
diff --cc debian/patches/2019_unplug_bundler.patch
index 43bcae7,0000000..ca18fe8
mode 100644,000000..100644
--- a/debian/patches/2019_unplug_bundler.patch
+++ b/debian/patches/2019_unplug_bundler.patch
@@@ -1,81 -1,0 +1,56 @@@
+Description: redmine package shouldn't need bundler to run
+ bundler is a development tool
+Forwarded: not-needed, i'm not ruby expert enough to convince upstream about changing that
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2013-09-28
+--- redmine.orig/config/boot.rb
++++ redmine/config/boot.rb
+@@ -3,4 +3,6 @@ require 'rubygems'
+ # Set up gems listed in the Gemfile.
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
++# disable bundler setup
++# require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
++
+--- redmine.orig/config/preinitializer.rb
++++ redmine/config/preinitializer.rb
+@@ -1,20 +1,20 @@
+-begin
+- require "rubygems"
+- require "bundler"
+-rescue LoadError
+- $stderr.puts "Redmine requires Bundler. Please install it with `gem install bundler`."
+- exit 1
+-end
++#begin
++# require "rubygems"
++# require "bundler"
++#rescue LoadError
++# $stderr.puts "Redmine requires Bundler. Please install it with `gem install bundler`."
++# exit 1
++#end
+
+-if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.21")
+- $stderr.puts "Redmine requires Bundler 1.0.21 (you're using #{Bundler::VERSION}).\nPlease install a newer version with `gem install bundler`."
+- exit 1
+-end
++#if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.21")
++# $stderr.puts "Redmine requires Bundler 1.0.21 (you're using #{Bundler::VERSION}).\nPlease install a newer version with `gem install bundler`."
++# exit 1
++#end
+
+-begin
+- ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+- Bundler.setup
+-rescue Bundler::GemNotFound
+- $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
+- exit 1
+-end
++#begin
++# ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
++# Bundler.setup
++#rescue Bundler::GemNotFound
++# $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
++# exit 1
++#end
- --- redmine.orig/lib/plugins/awesome_nested_set/Rakefile
- +++ redmine/lib/plugins/awesome_nested_set/Rakefile
- @@ -1,7 +1,7 @@
- # -*- encoding: utf-8 -*-
- $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
- -require 'rubygems'
- -require 'bundler/setup'
- +#require 'rubygems'
- +#require 'bundler/setup'
- require 'awesome_nested_set/version'
-
- require "rspec/core/rake_task"
- --- redmine.orig/lib/plugins/awesome_nested_set/spec/spec_helper.rb
- +++ redmine/lib/plugins/awesome_nested_set/spec/spec_helper.rb
- @@ -1,8 +1,8 @@
- $:.unshift(File.dirname(__FILE__) + '/../lib')
- plugin_test_dir = File.dirname(__FILE__)
-
- -require 'rubygems'
- -require 'bundler/setup'
- +#require 'rubygems'
- +#require 'bundler/setup'
-
- require 'rspec'
- require 'logger'
diff --cc debian/patches/2020_load_awesome_nested_set.patch
index 0000000,0000000..62e3e82
new file mode 100644
--- /dev/null
+++ b/debian/patches/2020_load_awesome_nested_set.patch
@@@ -1,0 -1,0 +1,9 @@@
++--- redmine.orig/config/initializers/10-patches.rb
+++++ redmine/config/initializers/10-patches.rb
++@@ -1,5 +1,6 @@
++ require 'active_record'
++ require 'active_record/connection_adapters/abstract_mysql_adapter'
+++require 'awesome_nested_set'
++
++ module ActiveRecord
++ module ConnectionAdapters
diff --cc debian/patches/series
index 90657b3,0000000..193a8c0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,10 @@@
+2002_FHS_through_env_vars.patch
+2003_externalize_session_config.patch
+2004_FHS_plugins_assets.patch
+2008_force_table_encoding_mysql.patch
+2009_FHS_thin_config.patch
+2018_get_rid_of_rdoctask.patch
+2019_unplug_bundler.patch
+2017_Gemfile_debian.patch
+1001_Parsedate.parsedate.patch
++2020_load_awesome_nested_set.patch
--
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