diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2011-12-30 21:00:52 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2011-12-30 21:00:52 +0100 |
| commit | c8101403012cec942b568b679e56f8a6d6bb3dc0 (patch) | |
| tree | bffa8577e8d68bc9e9624b9cf27a987c1854d566 /ubuntu/maverick/applications/kdiff3/debian | |
| parent | 6d967c3097f4c7c077d35509cab6206feca351ea (diff) | |
| parent | 222c8a5f3bd5b962fe3d2b2ae602d5e9cc407ad4 (diff) | |
| download | tde-packaging-c8101403012cec942b568b679e56f8a6d6bb3dc0.tar.gz tde-packaging-c8101403012cec942b568b679e56f8a6d6bb3dc0.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3/debian')
| -rw-r--r-- | ubuntu/maverick/applications/kdiff3/debian/control | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/maverick/applications/kdiff3/debian/control index 9caa5fa2e..01e6d6a24 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-kde3 (<< 4:3.5.13) -Breaks: kdiff3-kde3 (<< 4:3.5.13) +Replaces: kdiff3-trinity (<< 4:14.0.0) +Breaks: 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-kde3-doc (<< 4:3.5.13) -Breaks: kdiff3-kde3-doc (<< 4:3.5.13) +Replaces: kdiff3-trinity-doc (<< 4:14.0.0) +Breaks: 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 |