diff options
| author | Pawel "l0ner" Soltys <[email protected]> | 2012-01-04 00:52:26 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <[email protected]> | 2012-01-04 00:52:26 +0100 |
| commit | 5e8992d3e1997336d2590807bf99ef090352be70 (patch) | |
| tree | 73d96f4b396ef219eca19456875b3db3c665d8a5 /ubuntu/maverick/applications/basket | |
| 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/basket')
| -rw-r--r-- | ubuntu/maverick/applications/basket/debian/control | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control index 45319008f..0f23477d8 100644 --- a/ubuntu/maverick/applications/basket/debian/control +++ b/ubuntu/maverick/applications/basket/debian/control @@ -10,9 +10,9 @@ Standards-Version: 3.8.4 Package: basket-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: basket-trinity (<< 4:14.0.0) +Breaks: basket-trinity (<< 4:14.0.0) Recommends: basket-kontact-integration-trinity -Replaces: basket-kde3 (<< 4:3.5.13) -Breaks: basket-kde3 (<< 4:3.5.13) Description: a multi-purpose note-taking application for TDE [Trinity] This application provides as many baskets (drawers) as you wish; Several kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. @@ -26,8 +26,8 @@ Description: a multi-purpose note-taking application for TDE [Trinity] Package: basket-kontact-integration-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr4) -Breaks: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr4) +Replaces: basket-kontact-integration-trinity (<< 4:14.0.0) +Breaks: basket-kontact-integration-trinity (<< 4:14.0.0) Description: a multi-purpose note-taking appliction, Kontact integration [Trinity] This application provides as many baskets (drawers) as you wish; Several kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. |