summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/kdiff3
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-03-20 18:24:54 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-03-20 18:24:54 +0100
commit9729a641b920e937801a31a96b86ac2ea98a1d66 (patch)
tree466fdc764fa6b966481d303c78583e7d67f73a28 /ubuntu/maverick/applications/kdiff3
parent6f4e4fffbc2a06567e878ceaecc203eecd94b567 (diff)
downloadtde-packaging-9729a641b920e937801a31a96b86ac2ea98a1d66.tar.gz
tde-packaging-9729a641b920e937801a31a96b86ac2ea98a1d66.zip
Fix Ubuntu -kde3 to -trinity automatic migration
Fix Debian krita to chalk automatic migration
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3')
-rw-r--r--ubuntu/maverick/applications/kdiff3/debian/control8
1 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/maverick/applications/kdiff3/debian/control
index fa27ccbdf..2d370d716 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/control
+++ b/ubuntu/maverick/applications/kdiff3/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
Package: kdiff3-trinity
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: kdiff3-trinity (<< 4:14.0.0)
-Breaks: kdiff3-trinity (<< 4:14.0.0)
+Replaces: kdiff3-kde3 (<< 4:14.0.0), kdiff3-trinity (<< 4:14.0.0)
+Breaks: kdiff3-kde3 (<< 4:14.0.0), kdiff3-trinity (<< 4:14.0.0)
Recommends: kdiff3-trinity-doc
Description: compares and merges 2 or 3 files or directories [Trinity]
KDiff3 compares two or three input files and shows the differences
@@ -22,8 +22,8 @@ Description: compares and merges 2 or 3 files or directories [Trinity]
Package: kdiff3-trinity-doc
Architecture: all
Recommends: kdiff3-trinity
-Replaces: kdiff3-trinity-doc (<< 4:14.0.0)
-Breaks: kdiff3-trinity-doc (<< 4:14.0.0)
+Replaces: kdiff3-kde3-doc (<< 4:14.0.0), kdiff3-trinity-doc (<< 4:14.0.0)
+Breaks: kdiff3-kde3-doc (<< 4:14.0.0), kdiff3-trinity-doc (<< 4:14.0.0)
Description: documentation for kdiff3 [Trinity]
KDiff3 compares two or three input files and shows the differences
line by line and character by character. This package contains the