[neon/kde/k3b/Neon/unstable] debian: Revert "revert soversion change"

Jonathan Esk-Riddell null at kde.org
Fri May 20 16:22:40 BST 2022


Git commit 998597bf76e8481da07f627f71936eae8c371431 by Jonathan Esk-Riddell.
Committed on 20/05/2022 at 15:22.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "revert soversion change"

This reverts commit e046e54199044bf087aa4e634cf1a931b4f696bc.

M  +34   -2    debian/control
D  +0    -16   debian/libk3b7-extracodecs.install
D  +0    -4    debian/libk3b7.install
D  +0    -1    debian/libk3b7.lintian-overrides
A  +16   -0    debian/libk3b8-extracodecs.install
A  +4    -0    debian/libk3b8.install
A  +1    -0    debian/libk3b8.lintian-overrides

https://invent.kde.org/neon/kde/k3b/commit/998597bf76e8481da07f627f71936eae8c371431

diff --git a/debian/control b/debian/control
index aa12a5f..d5b2b1b 100644
--- a/debian/control
+++ b/debian/control
@@ -111,7 +111,7 @@ Description: Sophisticated CD/DVD burning application - transitional
 Package: libk3b-dev
 Section: libdevel
 Architecture: any
-Depends: libk3b7 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libk3b8 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: KDE CD/DVD burning application library - development files
  K3b provides a comfortable user interface to perform most CD/DVD burning
  tasks. While the experienced user can take influence in all steps
@@ -120,10 +120,26 @@ Description: KDE CD/DVD burning application library - development files
  .
  This package contains development files.
 
-Package: libk3b7
+Package: libk3b8
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libk3b7 (<< ${source:Version}~ciBuild)
+Breaks: libk3b7 (<< ${source:Version}~ciBuild)
+Description: KDE CD/DVD burning application library - runtime files
+ K3b provides a comfortable user interface to perform most CD/DVD burning
+ tasks. While the experienced user can take influence in all steps
+ of the burning process the beginner may find comfort in the automatic settings
+ and the reasonable k3b defaults which allow a quick start.
+ .
+ This package contains runtime libraries.
+
+Package: libk3b7
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, libk3b8
+Priority: optional
+Section: oldlibs
 Description: KDE CD/DVD burning application library - runtime files
  K3b provides a comfortable user interface to perform most CD/DVD burning
  tasks. While the experienced user can take influence in all steps
@@ -132,10 +148,26 @@ Description: KDE CD/DVD burning application library - runtime files
  .
  This package contains runtime libraries.
 
+Package: libk3b8-extracodecs
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libk3b7-extracodecs (<< ${source:Version}~ciBuild)
+Breaks: libk3b7-extracodecs(<< ${source:Version}~ciBuild)
+Description: KDE CD/DVD burning application library - extra decoders
+ K3b provides a comfortable user interface to perform most CD/DVD burning
+ tasks. While the experienced user can take influence in all steps
+ of the burning process the beginner may find comfort in the automatic settings
+ and the reasonable k3b defaults which allow a quick start.
+ .
+ This package contains runtime libraries for the MP3 and FFMPEG decoder plugin.
+
 Package: libk3b7-extracodecs
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Priority: optional
+Section: oldlibs
 Description: KDE CD/DVD burning application library - extra decoders
  K3b provides a comfortable user interface to perform most CD/DVD burning
  tasks. While the experienced user can take influence in all steps
diff --git a/debian/libk3b7-extracodecs.install b/debian/libk3b7-extracodecs.install
deleted file mode 100644
index f89d17d..0000000
--- a/debian/libk3b7-extracodecs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-usr/lib/*/qt5/plugins/k3b/k3bexternalencoder.so
-usr/lib/*/qt5/plugins/k3b/k3bflacdecoder.so
-usr/lib/*/qt5/plugins/k3b/k3blameencoder.so
-usr/lib/*/qt5/plugins/k3b/k3blameencoder.so
-usr/lib/*/qt5/plugins/k3b/k3blibsndfiledecoder.so
-usr/lib/*/qt5/plugins/k3b/k3bmaddecoder.so
-usr/lib/*/qt5/plugins/k3b/k3bmpcdecoder.so
-usr/lib/*/qt5/plugins/k3b/k3boggvorbisdecoder.so
-usr/lib/*/qt5/plugins/k3b/k3boggvorbisencoder.so
-usr/lib/*/qt5/plugins/k3b/k3bsoxencoder.so
-usr/lib/*/qt5/plugins/k3b/k3bwavedecoder.so
-usr/lib/*/qt5/plugins/k3b/kcms/kcm_k3bexternalencoder.so
-usr/lib/*/qt5/plugins/k3b/kcms/kcm_k3blameencoder.so
-usr/lib/*/qt5/plugins/k3b/kcms/kcm_k3boggvorbisencoder.so
-usr/lib/*/qt5/plugins/k3b/kcms/kcm_k3bsoxencoder.so
-usr/lib/*/qt5/plugins/kf5/kio/videodvd.so
diff --git a/debian/libk3b7.install b/debian/libk3b7.install
deleted file mode 100644
index 65f2462..0000000
--- a/debian/libk3b7.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libk3bdevice.so.*
-usr/lib/*/libk3blib.so.*
-usr/lib/*/qt5/plugins/k3b/k3baudiometainforenamerplugin.so
-usr/lib/*/qt5/plugins/k3b/k3baudioprojectcddbplugin.so
diff --git a/debian/libk3b7.lintian-overrides b/debian/libk3b7.lintian-overrides
deleted file mode 100644
index 3c1aa1f..0000000
--- a/debian/libk3b7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libk3b7: package-name-doesnt-match-sonames libk3bdevice8 libk3blib8
diff --git a/debian/libk3b8-extracodecs.install b/debian/libk3b8-extracodecs.install
new file mode 100644
index 0000000..34d6b6a
--- /dev/null
+++ b/debian/libk3b8-extracodecs.install
@@ -0,0 +1,16 @@
+usr/lib/*/qt5/plugins/k3b_plugins/k3bexternalencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3bflacdecoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3blameencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3blameencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3blibsndfiledecoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3bmaddecoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3bmpcdecoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3boggvorbisdecoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3boggvorbisencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3bsoxencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3bwavedecoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3bexternalencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3blameencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3boggvorbisencoder.so
+usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3bsoxencoder.so
+usr/lib/*/qt5/plugins/kf5/kio/videodvd.so
diff --git a/debian/libk3b8.install b/debian/libk3b8.install
new file mode 100644
index 0000000..c5897e1
--- /dev/null
+++ b/debian/libk3b8.install
@@ -0,0 +1,4 @@
+usr/lib/*/libk3bdevice.so.8*
+usr/lib/*/libk3blib.so.8*
+usr/lib/*/qt5/plugins/k3b_plugins/k3baudiometainforenamerplugin.so
+usr/lib/*/qt5/plugins/k3b_plugins/k3baudioprojectcddbplugin.so
diff --git a/debian/libk3b8.lintian-overrides b/debian/libk3b8.lintian-overrides
new file mode 100644
index 0000000..f5c4032
--- /dev/null
+++ b/debian/libk3b8.lintian-overrides
@@ -0,0 +1 @@
+libk3b8: package-name-doesnt-match-sonames libk3bdevice8 libk3blib8


More information about the Neon-commits mailing list