summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/kdiff3
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-09-02 12:36:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-09-02 12:36:18 -0500
commiteb1762e9131bc942d7ca75414bcc3a2fda28c842 (patch)
treeb0af81dd0224ab456e98359f2341b47ac063ba5f /ubuntu/maverick/applications/kdiff3
parent41ba2e7b53b29f32d66ac4e4a7f1a21bab12bda5 (diff)
downloadtde-packaging-eb1762e9131bc942d7ca75414bcc3a2fda28c842.tar.gz
tde-packaging-eb1762e9131bc942d7ca75414bcc3a2fda28c842.zip
Fix Ubuntu -kde3 to -trinity automatic migration
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3')
-rw-r--r--ubuntu/maverick/applications/kdiff3/debian/control4
1 files changed, 4 insertions, 0 deletions
diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/maverick/applications/kdiff3/debian/control
index b2a88e31b..794382279 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/control
+++ b/ubuntu/maverick/applications/kdiff3/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kdiff3-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kdiff3-kde3 (<< 4:3.5.13)
+Breaks: kdiff3-kde3 (<< 4:3.5.13)
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
@@ -20,6 +22,8 @@ Description: compares and merges 2 or 3 files or directories [Trinity]
Package: kdiff3-trinity-doc
Architecture: all
Recommends: kdiff3-trinity
+Replaces: kdiff3-kde3-doc (<< 4:3.5.13)
+Breaks: kdiff3-kde3-doc (<< 4:3.5.13)
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