DEB k3b: Remove the libk3b2-* transitional package and related links.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 069368e2985770689cadae44b976a6947bd6aade)

4 files changed, 2 insertions, 32 deletions

diff --git a/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 7b99dabec..7b65b9a3f 100644
--- a/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,8 +1,5 @@
 remove build-dep on libdvdread-dev
 
-libk3b3-extracodecs conflicts libk3b2-extracodecs
-transitional libk3b2-extracodecs package
-
 Do not recommend on tdebase-tdeio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control
index d036d1d22..ca1eb6f17 100644
--- a/debian/_base/applications/multimedia/k3b/debian/control
+++ b/debian/_base/applications/multimedia/k3b/debian/control
@@ -63,7 +63,7 @@ Section: libs
 Architecture: any
 Replaces: libk3b3-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-trinity (<< 4:14.0.0~)
-Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
+Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity
 Depends: ${shlibs:Depends}
 Description: The TDE cd burning application library - runtime files [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
@@ -78,7 +78,6 @@ Architecture: any
 Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Conflicts: libk3b2-mp3-trinity
 Description: The TDE 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
@@ -86,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity]
  .
  This package contains runtime libraries for the MP3 and FFMPEG decoder plugin.
 
-Package: libk3b2-extracodecs-trinity
-Architecture: all
-Priority: extra
-Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-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
- libk3b2-extracodecs to libk3b3-extracodecs.
- It may safely be removed after installation.
-
 Package: k3b-trinity-dbg
 Priority: extra
 Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 7b99dabec..7b65b9a3f 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,8 +1,5 @@
 remove build-dep on libdvdread-dev
 
-libk3b3-extracodecs conflicts libk3b2-extracodecs
-transitional libk3b2-extracodecs package
-
 Do not recommend on tdebase-tdeio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control
index 1ae1ab69a..b4a28b818 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/control
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/control
@@ -63,7 +63,7 @@ Section: libs
 Architecture: any
 Replaces: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
-Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
+Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity
 Depends: ${shlibs:Depends}
 Description: The TDE cd burning application library - runtime files [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
@@ -78,7 +78,6 @@ Architecture: any
 Replaces: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Conflicts: libk3b2-mp3-trinity
 Description: The TDE 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
@@ -86,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity]
  .
  This package contains runtime libraries for the MP3 and FFMPEG decoder plugin.
 
-Package: libk3b2-extracodecs-trinity
-Architecture: all
-Priority: extra
-Replaces: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-Breaks: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-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
- libk3b2-extracodecs to libk3b3-extracodecs.
- It may safely be removed after installation.
-
 Package: k3b-trinity-dbg
 Priority: extra
 Architecture: any