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/basket/debian/control | |
| 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/basket/debian/control')
| -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. |