[DRE-commits] [tdiary] 06/08: Add metapackage: tdiary, update README, NEWS

Youhei SASAKI uwabami-guest at moszumanska.debian.org
Thu Nov 19 11:58:17 UTC 2015


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

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

commit 69bcf2c0ad8bca99ea0835f185d91b2b696a85b6
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Nov 19 20:53:03 2015 +0900

    Add metapackage: tdiary, update README, NEWS
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/NEWS          | 24 +++++++++++++----
 debian/README.Debian | 73 ++++++++++++++++++++++++++--------------------------
 debian/control       | 35 +++++++++----------------
 3 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index fd6f9cd..6d93a3f 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,8 +1,22 @@
+tdiary (4.2.0-1) unstable; urgency=medium
+
+  The packages related tDiary are separate, follow upstream release:
+    + tdiary-core
+    + tdiary-theme
+    + tdiary-plugins
+    + tdiary-contrib
+  We provide metapackage "tDiary" in order to smooth upgrade.
+
+  Note: we don't provides "tdiary" cli interface. If you want to use "tdiary",
+  check /usr/share/doc/tdiary/examples/ and fix $LOAD_PATH as you like.
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Thu, 19 Nov 2015 20:50:00 +0900
+
 tdiary (2.2.1-1) unstable; urgency=low
 
   In order to obey Debian's policy, tdiary-theme's files do no more put under
-  /var/www/tdiary/theme. It is responsibility of a local administrator to 
-  make files in /usr/share/tdiary/theme available on the web. 
+  /var/www/tdiary/theme. It is responsibility of a local administrator to
+  make files in /usr/share/tdiary/theme available on the web.
   See README.Debian of tdiary-theme to get more information.
 
  -- Daigo Moriwaki <beatles at sgtpepper.net>  Tue, 17 Jun 2008 22:31:07 +0900
@@ -11,18 +25,18 @@ tdiary (2.0.2+20050720-1) unstable; urgency=low
 
   Following files are removed from Debian tdiary packages because they lack
   license or copyright. It could cause errors to show your entries that depend
-  on the files. Please install them by yourself. 
+  on the files. Please install them by yourself.
 
   - misc/plugin/amazon
   - misc/plugin/bq
   - misc/plugin/comment_rank
-  - misc/plugin/gradation 
+  - misc/plugin/gradation
   - misc/plugin/gradient
   - misc/plugin/makelirs
   - misc/plugin/recent_comment
   - misc/plugin/doctype-html401tr
   - misc/plugin/dropdown_calendar
-  - misc/plugin/highlight 
+  - misc/plugin/highlight
   - misc/plugin/referer-utf8 (this is also deprecated)
   - misc/plugin/src
   - misc/plugin/title_list
diff --git a/debian/README.Debian b/debian/README.Debian
index 132dafb..b2e5ced 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,67 +1,68 @@
 tDiary for Debian
 -----------------
 
+We provides custom setup scripts.
+
 Set up your own tDiary
+======================
+
+A setup script I make is available. Type
 
-  A setup script I make is available. Type 
     /usr/bin/tdiary-setup {default|symlink|copy}
-  and follow the messages. That's all.
-  
-  The `default' mode is recommended. The `symlink' mode, which just makes
-  symbolic links, does not work well under Apache suExec mode. 
 
-  For example
+and follow the messages. That's all.
+
+The `default' mode is recommended. The `symlink' mode, which just makes
+symbolic links, does not work well under Apache suExec mode.
+
+For example:
+
     $ pwd
     /home/daigo/
     $ tdiary-setup default /home/daigo/public_html/diary
-  Then your tDiary can be seen at http://localhost/~daigo/diary/.
 
+Then your tDiary can be seen at http://localhost/~daigo/diary/.
 
 Configure the tDiary
+====================
 
-  Most features can be set from browsers; a few basic features must be set in
-  the configuration file. At first edit `tdiary.conf' under the installation
-  directory. The configuration page is for example
-  http://localhost/~daigo/diary/update.rb, which can be reached from the top
-  page.
+Most features can be set from browsers; a few basic features must be set in
+the configuration file. At first edit `tdiary.conf' under the installation
+directory. The configuration page is for example
+http://localhost/~daigo/diary/update.rb, which can be reached from the top
+page.
 
-  tDiary plugins and themes expand functionalities. Find your favorites.
-  
+tDiary plugins and themes expand functionalities. Find your favorites.
 
 Apache (Web Server) setting
+===========================
 
-  Be sure that Apache allows users to override configurations with a
-  `.htaccess' file because the default tDiary setup requires it. 
+Be sure that Apache allows users to override configurations with a
+`.htaccess' file because the default tDiary setup requires it.
 
 
 Update tDiary
+=============
 
-  After installing new packages run `tdiary-setup' with the `update' mode to
-  the installation directory. 
+After installing new packages run `tdiary-setup' with the `update' mode to
+the installation directory.
 
-  You might need to remove cached data because data format might have changed.
-  If you see an error page just after updating, give a try to delete caches:
-  
-  For example 
-    $ rm -rf /home/daigo/diary/cache
+You might need to remove cached data because data format might have changed.
+If you see an error page just after updating, give a try to delete caches:
 
+For example:
+      $ rm -rf /home/daigo/diary/cache
 
-Notice for users who are familiar with tDiary already.
-       
-  Each user's theme directory is not necessary because tDiary in Debian tries
-  to find it at /var/www/tdiary/theme, which is set in theme_url.rb.  
+Notice for users who are familiar with tDiary already
+======================================================
 
+Each user's theme directory is not necessary because tDiary in Debian tries
+to find it at /var/www/tdiary/theme, which is set in theme_url.rb.
 
 Community
 
-  There is an English Mailing List for tDiary users.
-  See http://lists.sourceforge.net/lists/listinfo/tdiary-talk.
+There is an English Mailing List for tDiary users.
+See http://lists.sourceforge.net/lists/listinfo/tdiary-talk.
 
-TODO
 
-  Create dedicated hikidoc package and depend on it
-  tdiary-setup improvement
-  setup tool for fcgi
-  
- -- Daigo Moriwaki <beatles at sgtpepper.net>, Wed, 13 Apr 2005 23:28:42 +0900
- 
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>, Thu, 19 Nov 2015 20:44:46 +0900
diff --git a/debian/control b/debian/control
index b58c4df..9c11164 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-coffee-script,
  ruby-mail,
  ruby-debian
-# Suggests: tdiary-mode, tdiary-contrib (>= 3.1), tdiary-contrib (<< 3.2), httpd-cgi
-# Recommends: tdiary-theme (= ${source:Version}), tdiary-plugin (= ${source:Version}), httpd
-# Conflicts: tdiary-theme (<< 3.1.3-1)
-# Breaks: tdiary-theme (<< 3.1.3-1)
+Suggests: tdiary-contrib (>= 4.0~), httpd-cgi
+Recommends: tdiary-theme (>= 4.0~), tdiary-plugin (>= 4.0~), httpd
+Replaces: tdiary (<< 4.0~)
+Breaks: tdiary (<< 4.0~)
 Description: Communication-friendly weblog system
  tDiary is a weblog system, which makes your weblog communication-friendly for
  the writer (you) and readers. It consists of Ruby scripts for CGI (Common
@@ -46,22 +46,11 @@ Description: Communication-friendly weblog system
     converted to HTML by tDiary. The converting grammars are called `styles'.
     Many styles are available.
 
-# Package: tdiary-theme
-# Architecture: all
-# Depends: ${misc:Depends}
-# Suggests: tdiary
-# Conflicts: tdiary (<< 3.1.3-1)
-# Breaks: tdiary (<< 3.1.3-1)
-# Description: Themes of tDiary to change the design
-#  This package includes a lot of Cascading Style Sheets, which change the design
-#  of tDiary. You can choose a theme at the configuration page.
-
-# Package: tdiary-plugin
-# Architecture: all
-# Depends: ${misc:Depends}, ruby | ruby-interpreter, tdiary (= ${source:Version}), ruby-nora, ruby-imagesize
-# Conflicts: tdiary (<< 3.1.3-1)
-# Breaks: tdiary (<< 3.1.3-1)
-# Description: Plugins of tDiary to add functionalities
-#  This package includes a lot of plugins that add functionalities to tDiary; for
-#  instance there are calendar, categories, footnotes, images, RSS (RDF Site
-#  Summary), search form, title lists, TODOs, what's new and so on.
+Package: tdiary
+Architecture: all
+Depends: ${misc:Depends}, tdiary-core, tdiary-theme, tdiary-plugin
+Description: Metapackages of tDiary
+ This package is metapackage of tDiary, depends followin packages:
+   - tdiary-core
+   - tdiary-theme
+   - tdiary-plugin

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



More information about the Pkg-ruby-extras-commits mailing list