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

[Taku YASUI]

The following commit has been merged in the master branch:
commit edfef86a19f31f51479e7c8de4fc3f8d87c6d66d
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 20:01:43 2012 +0900

    Fix dependency

diff --git a/debian/control b/debian/control
index aaaee4a..1a09f84 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: tdiary
 Architecture: all
 Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-uconv, rdtool, ruby-debian, ruby-json
 Suggests: tdiary-mode, tdiary-contrib (>= 3.1), tdiary-contrib (<< 3.2), httpd-cgi
+Conflicts: tdiary-theme (<< 3.1.3-1)
 Breaks: tdiary-theme (<< 3.1.3-1)
 Recommends: tdiary-theme (= ${source:Version}), tdiary-plugin (= ${source:Version}), httpd
 Description: Communication-friendly weblog system
@@ -45,6 +46,8 @@ Description: Themes of tDiary to change the design
 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

-- 
tdiary.git