[DRE-commits] [tdiary] branch master updated (e7fe275 -> 2a2692c)

[Youhei SASAKI]

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

uwabami-guest pushed a change to branch master
in repository tdiary.

      from  e7fe275   Update debian/changelog
      adds  0b4fcc3   Imported Upstream version 4.2.0
       new  47bc87a   Merge tag 'upstream/4.2.0'
       new  afc1a13   Temp update/debian/changelog
       new  e152e3e   Add d/source/lintian-overrides
       new  df51744   Add patche: Add shebang into server.rake
       new  5e8e60c   Update Depends
       new  69bcf2c   Add metapackage: tdiary, update README, NEWS
       new  35f9819   Cleanup old stuff
       new  2a2692c   Update debian/changelog

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                                          | 17 +++-
 Gemfile                                            |  4 +-
 Gemfile.lock                                       | 98 +++++++++++-----------
 config.ru                                          |  2 +-
 debian/NEWS                                        | 24 ++++--
 debian/README.Debian                               | 73 ++++++++--------
 debian/changelog                                   | 32 +++----
 debian/control                                     | 40 ++++-----
 debian/patches/0001-10_core.patch                  |  2 +-
 .../0002-020_runnable_tdiary_convert2.patch        |  2 +-
 debian/patches/0003-Update-rpaproxy-URI.patch      |  2 +-
 .../0004-Add-Rack-Dependencies-for-CGI-mode.patch  |  6 +-
 .../patches/0005-Add-Pathname-Dependencies.patch   | 11 +++
 debian/patches/0006-Add-Shebang.patch              | 18 ++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 55 ------------
 debian/source/lintian-overrides                    |  2 +
 js/amazon.js                                       | 40 ++-------
 js/{amazon.js => amazon_bitly.js}                  |  2 +-
 lib/tdiary/admin.rb                                |  8 --
 lib/tdiary/application.rb                          | 35 ++++----
 lib/tdiary/configuration.rb                        | 10 +--
 lib/tdiary/core_ext.rb                             |  8 +-
 lib/tdiary/dispatcher/index_main.rb                | 26 +++---
 lib/tdiary/dispatcher/update_main.rb               | 26 ++----
 lib/tdiary/filter/spam.rb                          |  4 +-
 lib/tdiary/plugin/00default.rb                     | 50 +++--------
 lib/tdiary/plugin/en/00default.rb                  | 62 +++++++-------
 lib/tdiary/plugin/en/05referer.rb                  |  8 +-
 lib/tdiary/plugin/ja/00default.rb                  | 59 +++++++------
 lib/tdiary/plugin/ja/05referer.rb                  |  8 +-
 lib/tdiary/version.rb                              |  2 +-
 lib/tdiary/view.rb                                 |  4 -
 misc/plugin/amazon.rb                              |  6 +-
 misc/plugin/amazon/amazonimg.rb                    |  2 +-
 misc/plugin/category.rb                            | 32 +++----
 misc/plugin/category_autocomplete.rb               |  2 +-
 misc/plugin/comment_emoji_autocomplete.rb          |  3 +-
 misc/plugin/edit_today.rb                          | 14 ++--
 misc/plugin/en/pb-show.rb                          |  4 +-
 misc/plugin/en/tb-show.rb                          |  8 +-
 misc/plugin/hide-mail-field.rb                     |  4 +-
 misc/plugin/image.rb                               |  4 +-
 misc/plugin/ja/pb-show.rb                          |  4 +-
 misc/plugin/ja/tb-show.rb                          |  8 +-
 misc/plugin/my-ex.rb                               |  4 -
 misc/plugin/my-sequel.rb                           | 20 ++---
 misc/plugin/pb-show.rb                             |  6 --
 misc/plugin/ping.rb                                |  2 +-
 misc/plugin/random_google.rb                       | 24 +++---
 misc/plugin/recent_rss.rb                          |  5 +-
 misc/plugin/speed_comment.rb                       |  2 +-
 misc/plugin/tb-show.rb                             |  6 --
 misc/plugin/weather.rb                             | 10 +--
 spec/acceptance/save_conf_dnsbl_spec.rb            |  4 +-
 spec/core/core_ext_spec.rb                         |  7 ++
 spec/plugin/plugin_helper.rb                       | 12 +--
 views/i.category.rhtml                             |  6 --
 views/i.conf.rhtml                                 | 14 ----
 views/i.day.rhtml                                  | 28 -------
 views/i.diary.rhtml                                | 17 ----
 views/i.footer.rhtml                               |  2 -
 views/i.header.rhtml                               |  3 -
 views/i.latest.rhtml                               | 24 ------
 views/i.month.rhtml                                | 39 ---------
 views/i.search.rhtml                               |  5 --
 views/i.update.rhtml                               | 40 ---------
 views/i.update.rhtml.en                            | 40 ---------
 68 files changed, 410 insertions(+), 742 deletions(-)
 create mode 100644 debian/patches/0006-Add-Shebang.patch
 create mode 100644 debian/source/lintian-overrides
 copy js/{amazon.js => amazon_bitly.js} (93%)
 delete mode 100644 views/i.category.rhtml
 delete mode 100644 views/i.conf.rhtml
 delete mode 100644 views/i.day.rhtml
 delete mode 100644 views/i.diary.rhtml
 delete mode 100644 views/i.footer.rhtml
 delete mode 100644 views/i.header.rhtml
 delete mode 100644 views/i.latest.rhtml
 delete mode 100644 views/i.month.rhtml
 delete mode 100644 views/i.search.rhtml
 delete mode 100644 views/i.update.rhtml
 delete mode 100644 views/i.update.rhtml.en

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