Merge remote branch 'origin/master'

1 files changed, 12 insertions, 4 deletions

diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control
index ae97f656c..0029d1c47 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/maverick/applications/k3b/debian/control
@@ -11,9 +11,10 @@ Homepage: http://www.k3b.org
 Package: k3b-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, kdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version})
+Replaces: k3b-kde3 (<< 4:3.5.13)
+Breaks: k3b-kde3 (<< 4:3.5.13)
 Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
 Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7)
-Replaces: libk3b3-trinity (<< 1.0.5-2)
 Description: A sophisticated KDE CD burning application [Trinity]
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -29,8 +30,9 @@ Description: A sophisticated KDE CD burning application [Trinity]
 
 Package: k3b-data-trinity
 Conflicts: k3b-trinity (<< 1.0.4-4)
-Replaces: k3b-trinity (<< 1.0.5-2)
 Architecture: all
+Replaces: k3b-data-kde3 (<< 4:3.5.13)
+Breaks: k3b-data-kde3 (<< 4:3.5.13)
 Description: A sophisticated KDE CD burning application - data files [Trinity]
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -41,6 +43,8 @@ Description: A sophisticated KDE CD burning application - data files [Trinity]
 Package: libk3b-trinity-dev
 Conflicts: libk3bcore-trinity-dev, libk3bplugin-trinity-dev, libk3btools-trinity-dev, libk3bproject-trinity-dev, k3blibs-trinity-dev, k3blibs-trinity
 Section: libdevel
+Replaces: libk3b-kde3-dev (<< 4:3.5.13)
+Breaks: libk3b-kde3-dev (<< 4:3.5.13)
 Architecture: any
 Depends: libk3b3-trinity (= ${binary:Version})
 Description: The KDE cd burning application library - development files [Trinity]
@@ -53,9 +57,10 @@ Description: The KDE cd burning application library - development files [Trinity
 Package: libk3b3-trinity
 Section: libs
 Architecture: any
+Replaces: libk3b3-kde3 (<< 4:3.5.13)
+Breaks: libk3b3-kde3 (<< 4:3.5.13)
 Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
 Depends: ${shlibs:Depends}
-Replaces: libk3b2-trinity, libk3b-trinity-dev (<< 1.0.5-2)
 Description: The KDE cd burning application library - runtime files [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -66,9 +71,10 @@ Description: The KDE cd burning application library - runtime files [Trinity]
 Package: libk3b3-extracodecs-trinity
 Section: libs
 Architecture: any
+Replaces: libk3b3-extracodecs-kde3 (<< 4:3.5.13)
+Breaks: libk3b3-extracodecs-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: libk3b2-mp3-trinity
-Replaces: libk3b2-mp3-trinity, libk3b2-extracodecs-trinity, libk3b3-trinity (<< 1.0.5-2)
 Description: The KDE cd burning application library - extra decoders [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -79,6 +85,8 @@ Description: The KDE cd burning application library - extra decoders [Trinity]
 Package: libk3b2-extracodecs-trinity
 Architecture: all
 Priority: extra
+Replaces: libk3b2-extracodecs-kde3 (<< 4:3.5.13)
+Breaks: libk3b2-extracodecs-kde3 (<< 4:3.5.13)
 Depends: libk3b3-extracodecs-trinity
 Description: transitional package for K3b's extra decoders [Trinity]
  This is a dummy transitional package to enable a smooth transition from