diff options
| author | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2012-01-04 00:52:26 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2012-01-04 00:52:26 +0100 |
| commit | 5e8992d3e1997336d2590807bf99ef090352be70 (patch) | |
| tree | 73d96f4b396ef219eca19456875b3db3c665d8a5 /ubuntu/maverick/applications/kdiff3/debian/control | |
| parent | 415fcb269ea8489a5066fd0188f022775a5871cf (diff) | |
| parent | e565534290c19c9f69d0672be1a79bc51e661a19 (diff) | |
| download | tde-packaging-5e8992d3e1997336d2590807bf99ef090352be70.tar.gz tde-packaging-5e8992d3e1997336d2590807bf99ef090352be70.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3/debian/control')
| -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 |