tag 863149 + patch
thanks
Hi,
On Fri, May 26, 2017 at 04:45:05PM -0400, Daniel Kahn Gillmor wrote:
> On Mon 2017-05-22 20:32:48 +0200, Rene Engelhard wrote:
> > Can the qgpgme(pp) stuff split out to an own -dev (As was already done
> > with the library itself.) and only that one be made depedant on libqgpgme7?
> > ( This would probably require a transition and the above apps changing their
> > Build-Depends:, but..)
>
> I think that makes sense, but don't have the time to work on it right
> now myself. I'd be happy to review patches along these lines, though.
Attached. Based on experimental.
Pretty straightforward but I didn't test it yet (except that it builds,
packages and the files are where I would expect that). Should work, though.
Regards,
Rene
>From 16d127a52442af0c0be87c99c978e7b7a06a9c49 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <r...@debian.org>
Date: Sat, 27 May 2017 00:53:35 +0200
Subject: [PATCH] split qgpgme into own -dev
---
debian/changelog | 7 +++++++
debian/control | 29 +++++++++++++++++++++++------
debian/libgpgmepp-dev.install | 6 +-----
debian/libgpgmepp-dev.links | 1 -
debian/libqgpgme-dev.install | 5 +++++
debian/libqgpgme-dev.links | 1 +
6 files changed, 37 insertions(+), 12 deletions(-)
create mode 100644 debian/libqgpgme-dev.install
create mode 100644 debian/libqgpgme-dev.links
diff --git a/debian/changelog b/debian/changelog
index 3958fa81..b39a9b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gpgme1.0 (1.9.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * split qgpgme into own -dev
+
+ -- Rene Engelhard <r...@debian.org> Sat, 27 May 2017 00:22:10 +0200
+
gpgme1.0 (1.9.0-2) experimental; urgency=medium
* Remove Jose Carlos Garcia Sogo from Uploaders (Closes: #862622)
diff --git a/debian/control b/debian/control
index 233d53ea..d733f470 100644
--- a/debian/control
+++ b/debian/control
@@ -153,17 +153,34 @@ Priority: extra
Architecture: any
Depends:
libgpgmepp6 (= ${binary:Version}),
- libqgpgme7 (= ${binary:Version}),
- qtbase5-dev,
${misc:Depends},
${shlibs:Depends},
Recommends:
libgpgmepp-doc (= ${binary:Version}),
+Description: C++ wrapper library for GPGME (development files)
+ GpgME++ (aka GpgMEpp) is a C++ wrapper (or C++ bindings) for the
+ GnuPG project's GPGME (GnuPG Made Easy) library.
+ .
+ This package contains the headers and other files needed to compile
+ against it.
+
+Package: libqgpgme-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends:
+ libgpgmepp-dev (= ${binary:Version}),
+ libqgpgme7 (= ${binary:Version}),
+ qtbase5-dev,
Breaks:
- kdepimlibs5-dev
+ kdepimlibs5-dev,
+ libgpgmepp-dev (<< 1.9.0-3)
Replaces:
- kdepimlibs5-dev
-Description: C++ and Qt bindings for GPGME (development files)
+ kdepimlibs5-dev,
+ libgpgmepp-dev (<< 1.9.0-3)
+Recommends:
+ libgpgmepp-doc (= ${binary:Version}),
+Description: Qt 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.
.
@@ -171,7 +188,7 @@ Description: C++ and Qt bindings for GPGME (development files)
and some Qt datatypes (e.g. QByteArray).
.
This package contains the headers and other files needed to compile
- against either of these libraries.
+ against this library.
Package: libgpgmepp-doc
Section: doc
diff --git a/debian/libgpgmepp-dev.install b/debian/libgpgmepp-dev.install
index df13d706..813e1868 100644
--- a/debian/libgpgmepp-dev.install
+++ b/debian/libgpgmepp-dev.install
@@ -1,8 +1,4 @@
-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
diff --git a/debian/libgpgmepp-dev.links b/debian/libgpgmepp-dev.links
index e08e7fd0..1a9fed5c 100644
--- a/debian/libgpgmepp-dev.links
+++ b/debian/libgpgmepp-dev.links
@@ -1,2 +1 @@
usr/share/doc/libgpgmepp6/README usr/share/doc/libgpgmepp-dev/README.gpgmepp
-usr/share/doc/libqgpgme/README usr/share/doc/libgpgmepp-dev/README.qgpgme
diff --git a/debian/libqgpgme-dev.install b/debian/libqgpgme-dev.install
new file mode 100644
index 00000000..01e98ce0
--- /dev/null
+++ b/debian/libqgpgme-dev.install
@@ -0,0 +1,5 @@
+usr/include/QGpgME
+usr/include/qgpgme
+usr/lib/*/cmake/QGpgme
+usr/lib/*/libqgpgme.a
+usr/lib/*/libqgpgme.so
diff --git a/debian/libqgpgme-dev.links b/debian/libqgpgme-dev.links
new file mode 100644
index 00000000..ca7343a9
--- /dev/null
+++ b/debian/libqgpgme-dev.links
@@ -0,0 +1 @@
+usr/share/doc/libqgpgme/README usr/share/doc/libgpgmepp-dev/README.qgpgme
--
2.11.0
