[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 24e0e5efc95b64a9119099d665aad34ad5d846ec
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 20:15:47 2012 +0900

    Dependency fix

diff --git a/debian/control b/debian/control
index 1a09f84..779ddbb 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,6 @@ 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
  tDiary is a weblog system, which makes your weblog communication-friendly for
@@ -39,6 +37,8 @@ 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.

-- 
tdiary.git