[DRE-commits] [SCM] tdiary.git branch, master, updated. debian/3.0.1-3-42-g5c33597

[Taku YASUI]

The following commit has been merged in the master branch:
commit 68d4c99ec5121ea3724c83a12824d49e32dfa06e
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 16:34:37 2012 +0900

    Dependency fix for new ruby library packages

diff --git a/debian/control b/debian/control
index e33e599..2498f45 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Daigo Moriwaki <daigo at debian.org>, Taku YASUI <tach at debian.org>
-Build-Depends: debhelper (>= 8), docbook-to-man
+Build-Depends: debhelper (>= 8), docbook-to-man, cdbs
 Standards-Version: 3.9.3
 Homepage: http://www.tdiary.org/
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/tdiary.git
@@ -11,8 +11,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/tdiary.git;a=summary
 
 Package: tdiary
 Architecture: all
-Depends: ${misc:Depends}, ruby (>= 1.8), libuconv-ruby1.8, rdtool, libdpkg-ruby1.8
-Suggests: tdiary-mode, tdiary-contrib (>= 3.0), tdiary-contrib (<< 3.1)
+Depends: ${misc:Depends}, ruby1.9.1 | ruby1.8 (>= 1.8.2), ruby-uconv, rdtool, ruby-debian
+Suggests: tdiary-mode, tdiary-contrib (>= 3.1), tdiary-contrib (<< 3.2)
 Recommends: tdiary-theme (= ${source:Version}), tdiary-plugin (= ${source:Version}), 
 Description: Communication-friendly weblog system
  tDiary is a weblog system, which makes your weblog communication-friendly for
@@ -43,7 +43,7 @@ Description: Themes of tDiary to change the design
 
 Package: tdiary-plugin
 Architecture: all
-Depends: ${misc:Depends}, tdiary (= ${source:Version}), ruby (>= 1.8), libnora-ruby1.8
+Depends: ${misc:Depends}, tdiary (= ${source:Version}), ruby-nora
 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
@@ -51,17 +51,8 @@ Description: Plugins of tDiary to add functionalities
 
 Package: tdiary-mode
 Architecture: all
-Depends: ${misc:Depends}, emacs | emacsen, apel, psgml
+Depends: ${misc:Depends}, emacs23 | emacsen, apel, psgml
 Suggests: tdiary
 Description: tDiary editing mode for Emacsen
  This package provides Emacs major mode to edit and post entries to tDiary.
  You can edit/post your article to tDiary easily using this package.
-
-Package: tdiary-contrib
-Architecture: all
-Depends: ${misc:Depends}, tdiary (>= 3.0), tdiary (<< 3.1), ruby (>= 1.8), curl
-Suggests: libestraier-ruby1.8, hyperestraier
-Description: Plugins of tDiary to add functionalities
- This package includes optional utilities and plugins for tDiary. They are
- valuable but not so useful for general users. Some can not be completely
- internationalized. 

-- 
tdiary.git