[neon/backports-jammy/gpgme/Neon/unstable] debian: split out qt5 & qt6 deps

Carlos De Maine null at kde.org
Thu May 18 01:42:31 BST 2023 

Git commit e8fe84f9e78ed015a053f2287102e8cb97f6273e by Carlos De Maine.
Committed on 18/05/2023 at 00:42.
Pushed by carlosdem into branch 'Neon/unstable'.

split out qt5 & qt6 deps

M  +53   -4    debian/control
M  +1    -5    debian/libgpgmepp-dev.install
A  +3    -0    debian/libqgpgme15-dev.install
A  +3    -0    debian/libqgpgme15-qt6-dev.install
C  +0    -1    debian/libqgpgme15-qt6.install [from: debian/libqgpgme15.install - 052% similarity]
C  +1    -2    debian/libqgpgme15-qt6.lintian-overrides [from: debian/libqgpgme15.lintian-overrides - 070% similarity]
M  +0    -1    debian/libqgpgme15.install
M  +1    -2    debian/libqgpgme15.lintian-overrides

https://invent.kde.org/neon/backports-jammy/gpgme/commit/e8fe84f9e78ed015a053f2287102e8cb97f6273e

diff --git a/debian/control b/debian/control
index 8ec0dd8d..0aff47a9 100644
--- a/debian/control
+++ b/debian/control
@@ -115,7 +115,20 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Description: library for GPGME integration with Qt
+Description: library for GPGME integration with Qt5
+ QGpgME is a library that provides GPGME integration with QEventLoop
+ and some Qt datatypes (e.g. QByteArray).
+ .
+ This is the official upstream Qt binding for GPGME.
+
+Package: libqgpgme15-qt6
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks: libqgpgme15 (<< ${source:Version}~ciBuild),
+Description: library for GPGME integration with Qt6
  QGpgME is a library that provides GPGME integration with QEventLoop
  and some Qt datatypes (e.g. QByteArray).
  .
@@ -140,8 +153,6 @@ Multi-Arch: same
 Depends:
  libgpgmepp6 (= ${binary:Version}),
  libqgpgme15 (= ${binary:Version}),
- qtbase5-dev,
- qt6-base-dev,
  ${misc:Depends},
 Recommends:
  libgpgmepp-doc (= ${binary:Version}),
@@ -149,7 +160,45 @@ Breaks:
  kdepimlibs5-dev,
 Replaces:
  kdepimlibs5-dev,
-Description: C++ and Qt bindings for GPGME (development files)
+Description: C++ bindings for GPGME (development files)
+ GpgME++ (aka GpgMEpp) is a C++ wrapper (or C++ bindings) for the
+ GnuPG project's GPGME (GnuPG Made Easy) library.
+ .
+ QGpgME is a library that provides GPGME integration with QEventLoop
+ and some Qt datatypes (e.g. QByteArray).
+ .
+ This package contains the headers and other files needed to compile
+ against either of these libraries.
+
+Package: libgqpgme15-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libgpgmepp-dev (= ${binary:Version}),
+ qtbase5-dev,
+ ${misc:Depends},
+Breaks: libgpgmepp-dev (<< ${source:Version}~ciBuild),
+Description: Qt5 bindings for GPGME (development files)
+ GpgME++ (aka GpgMEpp) is a C++ wrapper (or C++ bindings) for the
+ GnuPG project's GPGME (GnuPG Made Easy) library.
+ .
+ QGpgME is a library that provides GPGME integration with QEventLoop
+ and some Qt datatypes (e.g. QByteArray).
+ .
+ This package contains the headers and other files needed to compile
+ against either of these libraries.
+
+Package: libqgpgme15-qt6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libgpgmepp-dev (= ${binary:Version}),
+ qt6-base-dev,
+ ${misc:Depends},
+Breaks: libgpgmepp-dev (<< ${source:Version}~ciBuild),
+Description: Qt6 bindings for GPGME (development files)
  GpgME++ (aka GpgMEpp) is a C++ wrapper (or C++ bindings) for the
  GnuPG project's GPGME (GnuPG Made Easy) library.
  .
diff --git a/debian/libgpgmepp-dev.install b/debian/libgpgmepp-dev.install
index fe05541a..84e6ec0c 100644
--- a/debian/libgpgmepp-dev.install
+++ b/debian/libgpgmepp-dev.install
@@ -1,10 +1,6 @@
 usr/include/QGpgME
 usr/include/gpgme++
 usr/include/qgpgme
-usr/lib/*/cmake
+usr/lib/*/cmake/Gpgmepp/
 usr/lib/*/libgpgmepp.a
 usr/lib/*/libgpgmepp.so
-usr/lib/*/libqgpgme.a
-usr/lib/*/libqgpgme.so
-usr/lib/*/libqgpgmeqt6.a
-usr/lib/*/libqgpgmeqt6.so
\ No newline at end of file
diff --git a/debian/libqgpgme15-dev.install b/debian/libqgpgme15-dev.install
new file mode 100644
index 00000000..c59f96c9
--- /dev/null
+++ b/debian/libqgpgme15-dev.install
@@ -0,0 +1,3 @@
+/usr/lib/*/cmake/QGpgme/
+usr/lib/*/libqgpgme.a
+usr/lib/*/libqgpgme.so
diff --git a/debian/libqgpgme15-qt6-dev.install b/debian/libqgpgme15-qt6-dev.install
new file mode 100644
index 00000000..e6dd0104
--- /dev/null
+++ b/debian/libqgpgme15-qt6-dev.install
@@ -0,0 +1,3 @@
+/usr/lib/*/cmake/QGpgmeQt6/
+usr/lib/*/libqgpgmeqt6.a
+usr/lib/*/libqgpgmeqt6.so
\ No newline at end of file
diff --git a/debian/libqgpgme15.install b/debian/libqgpgme15-qt6.install
similarity index 52%
copy from debian/libqgpgme15.install
copy to debian/libqgpgme15-qt6.install
index a369c506..d869ce13 100644
--- a/debian/libqgpgme15.install
+++ b/debian/libqgpgme15-qt6.install
@@ -1,2 +1 @@
-usr/lib/*/libqgpgme.so.*
 usr/lib/*/libqgpgmeqt6.so.*
diff --git a/debian/libqgpgme15.lintian-overrides b/debian/libqgpgme15-qt6.lintian-overrides
similarity index 70%
copy from debian/libqgpgme15.lintian-overrides
copy to debian/libqgpgme15-qt6.lintian-overrides
index 9dfbd6c4..140c355e 100644
--- a/debian/libqgpgme15.lintian-overrides
+++ b/debian/libqgpgme15-qt6.lintian-overrides
@@ -2,5 +2,4 @@
 # is not consistent across architectures in any way that i can reliably predict.
 # see https://lists.alioth.debian.org/pipermail/pkg-gnupg-maint/2016-October/004505.html
 # and https://anonscm.debian.org/git/pkg-gnupg/gpgme.git/commit/?id=0a9607a9abfbd16bf6ca2908a5b41a7b3f24761e
-libqgpgme15: no-symbols-control-file usr/lib/x86_64-linux-gnu/libqgpgme.so.15.1.0
-libqgpgme15: package-name-doesnt-match-sonames libqgpgmeqt6-15
\ No newline at end of file
+libqgpgmeqt6-15: package-name-doesnt-match-sonames libqgpgmeqt15-qt6
diff --git a/debian/libqgpgme15.install b/debian/libqgpgme15.install
index a369c506..5c005b85 100644
--- a/debian/libqgpgme15.install
+++ b/debian/libqgpgme15.install
@@ -1,2 +1 @@
 usr/lib/*/libqgpgme.so.*
-usr/lib/*/libqgpgmeqt6.so.*
diff --git a/debian/libqgpgme15.lintian-overrides b/debian/libqgpgme15.lintian-overrides
index 9dfbd6c4..ceeaf3b6 100644
--- a/debian/libqgpgme15.lintian-overrides
+++ b/debian/libqgpgme15.lintian-overrides
@@ -2,5 +2,4 @@
 # is not consistent across architectures in any way that i can reliably predict.
 # see https://lists.alioth.debian.org/pipermail/pkg-gnupg-maint/2016-October/004505.html
 # and https://anonscm.debian.org/git/pkg-gnupg/gpgme.git/commit/?id=0a9607a9abfbd16bf6ca2908a5b41a7b3f24761e
-libqgpgme15: no-symbols-control-file usr/lib/x86_64-linux-gnu/libqgpgme.so.15.1.0
-libqgpgme15: package-name-doesnt-match-sonames libqgpgmeqt6-15
\ No newline at end of file
+libqgpgme15: package-name-doesnt-match-sonames libqgpgme.so.*

More information about the Neon-commits mailing list