Bug#972785: zeromq3: Include cmake files for cppzmq

2022-08-16 Thread Stephan Lachnit
Hi Laszlo,

ah ok, I thought maybe you just missed the mail. Anyway, of course I can
ping users of the headers as I introduced the new package.

Regards,
Stephan

On Mon, Aug 15, 2022 at 6:51 PM László Böszörményi (GCS) 
wrote:

> Hi Stephan,
>
> On Mon, Aug 15, 2022 at 5:27 PM Stephan Lachnit
>  wrote:
> > Sorry to annoy you, but please upload a new version of zeromq3, without
> it cppzmq is uninstallable.
>  Wanted to ping users of those header files to update their build
> dependencies. But then please do it yourself as you ship those files
> now.
>
> Regards,
> Laszlo/GCS
>


Bug#972785: zeromq3: Include cmake files for cppzmq

2022-08-15 Thread GCS
Hi Stephan,

On Mon, Aug 15, 2022 at 5:27 PM Stephan Lachnit
 wrote:
> Sorry to annoy you, but please upload a new version of zeromq3, without it 
> cppzmq is uninstallable.
 Wanted to ping users of those header files to update their build
dependencies. But then please do it yourself as you ship those files
now.

Regards,
Laszlo/GCS



Bug#972785: zeromq3: Include cmake files for cppzmq

2022-08-15 Thread Stephan Lachnit
Hi Laszlo,

Sorry to annoy you, but please upload a new version of zeromq3, without it
cppzmq is uninstallable.

Regards,
Stephan


Bug#972785: zeromq3: Include cmake files for cppzmq

2022-08-06 Thread Stephan Lachnit
Hi Laszlo,

cppzmq was accepted [1], so you can proceed with uploading zeromq3.

Cheers and thanks for maintaining zeromq,
Stephan

[1] https://tracker.debian.org/pkg/cppzmq


Bug#972785: zeromq3: Include cmake files for cppzmq

2022-07-30 Thread GCS
On Fri, Jul 29, 2022 at 10:48 PM Stephan Lachnit
 wrote:
> To do the migration, I would first put cppzmq in NEW (after your ok), and 
> after it has been accepted in NEW you would upload the new version of 
> zeromq3. Overall I think the transition will be less painful than patching 
> build systems downstream (and annoying Debian users that write software using 
> the CMake files).
 OK, ping me when I can remove the mentioned headers from src:zeromq3
and I will do the upload.

Cheers,
Laszlo/GCS



Bug#972785: zeromq3: Include cmake files for cppzmq

2022-07-29 Thread Stephan Lachnit
Hi,

I want to tackle this issue again - I really want to package cppzmq as a
separate package. Besides the already mentioned reason for not needing to
patch downstream build systems, there is also the advantage that you can
actually see from apt which version of cppzmq is in Debian.
Also, I added pkg-config support. While yes, cppzmq is header only and you
don't __need__ a pkg-config lookup, it is much simpler to just add
`dependency(cppzmq)` than to check for the headers and depend on libzmq.
Additionally I have added an autopkgtest, which is a nice bonus.

Anyway, the change is relatively easy: I already have the packaging done in
Salsa [1] and filled an ITP [2]. As I am a DD I can upload and maintain it,
the only thing I need from you Laszlo is to remove zmq.hpp and
zmq_addon.hpp from the binary package and add cppzmq in Suggests (which
should be very low effort). I think it is also a good idea to write a NEWS
entry so that users will know about the change, though I think this is not
that important if you don't want to put in that much effort.

To do the migration, I would first put cppzmq in NEW (after your ok), and
after it has been accepted in NEW you would upload the new version of
zeromq3. Overall I think the transition will be less painful than patching
build systems downstream (and annoying Debian users that write software
using the CMake files).

[1]: https://salsa.debian.org/debian/cppzmq
[2]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016347


Bug#972785: zeromq3: Include cmake files for cppzmq

2021-05-18 Thread Lukas K.
On Mon, 26 Oct 2020 08:58:22 + Gordon Ball  wrote:
> On Sun, Oct 25, 2020 at 05:13:52PM +0100, László Böszörményi (GCS) wrote:
> > On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  wrote:
> > > src:zeromq3 and libzmq3-dev currently embed headers from the separate
> > > cppzmq repository. However, the associated cmake files are not included,
> > > which means when trying to build downstream projects which use cppzmq
> > > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > > files from cppzmq.
> >  These are different projects and should be packaged differently. As
> > czmq is packaged by Luca, I think cppzmq should be packaged by him as
> > well. But let's hear what he says.
> > 
> 
> Yes, this seems reasonable. I'm quite willing to see the patch I
> prepared as a bit of a nasty hack.
> 
> I prepared standalone packaging for cppzmq a while ago before I realised
> that it collided with headers already in libzmq3-dev. The packaging can
> be found here: https://salsa.debian.org/chronitis/cppzmq - it's pretty
> trivial since it's header only. The package should be more or less ready
> to upload if wanted (but probably should be moved out of my salsa namespace).
> 
> However, the maintainer point is a good one. I'm coming at ZMQ in
> general as a downstream user and I'm not a domain expert; it would be very
> good if the packaging was maintained or co-maintained by someone who
> knows the details of ZMQ a bit better.
> 
> > Regards,
> > Laszlo/GCS
> 
> 

As user of cppzmq, I'd really like to see it packaged in its own package
as this makes it easier to track which version of cppzmq is available.
This also helps to prevent accidents such as packaging an unreleased
version of cppzmq, as it's currently the case at ubuntu.

Regards,

Lukas



Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Gordon Ball
On Mon, Oct 26, 2020 at 01:07:09PM +, Luca Boccassi wrote:
> On Mon, 2020-10-26 at 12:28 +, Gordon Ball wrote:
> > On Mon, Oct 26, 2020 at 11:52:17AM +, Luca Boccassi wrote:
> > > On Mon, 2020-10-26 at 11:40 +, Gordon Ball wrote:
> > > > On Mon, Oct 26, 2020 at 09:48:52AM +, Luca Boccassi wrote:
> > > > > On Sun, 2020-10-25 at 17:13 +0100, László Böszörményi (GCS) wrote:
> > > > > > On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  
> > > > > > wrote:
> > > > > > > src:zeromq3 and libzmq3-dev currently embed headers from the 
> > > > > > > separate
> > > > > > > cppzmq repository. However, the associated cmake files are not 
> > > > > > > included,
> > > > > > > which means when trying to build downstream projects which use 
> > > > > > > cppzmq
> > > > > > > and cmake, it's necessary to hack the buildsystem or embed the 
> > > > > > > cmake
> > > > > > > files from cppzmq.
> > > > > >  These are different projects and should be packaged differently. As
> > > > > > czmq is packaged by Luca, I think cppzmq should be packaged by him 
> > > > > > as
> > > > > > well. But let's hear what he says.
> > > > > > 
> > > > > > Regards,
> > > > > > Laszlo/GCS
> > > > > 
> > > > > Hi,
> > > > > 
> > > > > Given it's just a header, I don't think it's necessary to do anything
> > > > > complicated - there's nothing to build and there's no dependencies to
> > > > > track. No point in having separate packages or cmake files or whatnot 
> > > > > -
> > > > > #include is all a user needs.
> > > > > 
> > > > 
> > > > The CMake files aren't _needed_, but they're provided upstream and
> > > > downstream projects that use cppzmq and CMake expect them to be there,
> > > > and it feels like an unnecessary friction to need to patch/override the
> > > > buildsystem of downstream projects to get round us shipping the headers
> > > > but not the other parts of the cppzmq distribution.
> > > 
> > > Sorry I still don't follow, why does the downstream build system need
> > > to be patched/overriden? Again, it's just a header. There's nothing to
> > > build - just install the package, #include and it's good to go.
> > > 
> > 
> > This is probably a case where build tools provide you with extra ways to
> > shoot yourself in the foot. See, for example:
> > 
> > https://github.com/jupyter-xeus/xeus/blob/master/CMakeLists.txt
> > 
> > While the source files do just do `#include `, as you say, the
> > CMakeLists.txt wants to find the CMake config files for cppzmq to check
> > for the version, linker flags required, etc:
> > 
> > set(cppzmq_REQUIRED_VERSION 4.4.1)
> > find_package(cppzmq ${cppzmq_REQUIRED_VERSION} REQUIRED)
> > target_link_libraries(... PUBLIC ${CPPZMQ_TARGET_NAME} ...)
> > 
> > The CMake files for cppzmq don't (as you'd expect) do much - define a
> > target which requires linking to libzmq and declare the version.
> > 
> > So, to build the above project against the current debian libzmq3-dev is
> > possible, but some patching of the downstream package's CMakeLists is
> > required.
> 
> Then why not just fix that project upstream to avoid all that? Sorry,
> but I am not going to take on additional work just because of the
> arbitrary choice of a downstream build system. Please fix that instead.
> Thank you.
> 

I think it is unlikely that they'll be receptive to making such changes
for my benefit, given they have something that works and is supported
by cppzmq upstream.

However, the workarounds for not having CMake integration in this case
aren't too complicated, so I'll work on that instead.
> -- 
> Kind regards,
> Luca Boccassi



Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Luca Boccassi
On Mon, 2020-10-26 at 12:28 +, Gordon Ball wrote:
> On Mon, Oct 26, 2020 at 11:52:17AM +, Luca Boccassi wrote:
> > On Mon, 2020-10-26 at 11:40 +, Gordon Ball wrote:
> > > On Mon, Oct 26, 2020 at 09:48:52AM +, Luca Boccassi wrote:
> > > > On Sun, 2020-10-25 at 17:13 +0100, László Böszörményi (GCS) wrote:
> > > > > On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  
> > > > > wrote:
> > > > > > src:zeromq3 and libzmq3-dev currently embed headers from the 
> > > > > > separate
> > > > > > cppzmq repository. However, the associated cmake files are not 
> > > > > > included,
> > > > > > which means when trying to build downstream projects which use 
> > > > > > cppzmq
> > > > > > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > > > > > files from cppzmq.
> > > > >  These are different projects and should be packaged differently. As
> > > > > czmq is packaged by Luca, I think cppzmq should be packaged by him as
> > > > > well. But let's hear what he says.
> > > > > 
> > > > > Regards,
> > > > > Laszlo/GCS
> > > > 
> > > > Hi,
> > > > 
> > > > Given it's just a header, I don't think it's necessary to do anything
> > > > complicated - there's nothing to build and there's no dependencies to
> > > > track. No point in having separate packages or cmake files or whatnot -
> > > > #include is all a user needs.
> > > > 
> > > 
> > > The CMake files aren't _needed_, but they're provided upstream and
> > > downstream projects that use cppzmq and CMake expect them to be there,
> > > and it feels like an unnecessary friction to need to patch/override the
> > > buildsystem of downstream projects to get round us shipping the headers
> > > but not the other parts of the cppzmq distribution.
> > 
> > Sorry I still don't follow, why does the downstream build system need
> > to be patched/overriden? Again, it's just a header. There's nothing to
> > build - just install the package, #include and it's good to go.
> > 
> 
> This is probably a case where build tools provide you with extra ways to
> shoot yourself in the foot. See, for example:
> 
> https://github.com/jupyter-xeus/xeus/blob/master/CMakeLists.txt
> 
> While the source files do just do `#include `, as you say, the
> CMakeLists.txt wants to find the CMake config files for cppzmq to check
> for the version, linker flags required, etc:
> 
> set(cppzmq_REQUIRED_VERSION 4.4.1)
> find_package(cppzmq ${cppzmq_REQUIRED_VERSION} REQUIRED)
> target_link_libraries(... PUBLIC ${CPPZMQ_TARGET_NAME} ...)
> 
> The CMake files for cppzmq don't (as you'd expect) do much - define a
> target which requires linking to libzmq and declare the version.
> 
> So, to build the above project against the current debian libzmq3-dev is
> possible, but some patching of the downstream package's CMakeLists is
> required.

Then why not just fix that project upstream to avoid all that? Sorry,
but I am not going to take on additional work just because of the
arbitrary choice of a downstream build system. Please fix that instead.
Thank you.

-- 
Kind regards,
Luca Boccassi


signature.asc
Description: This is a digitally signed message part


Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Gordon Ball
On Mon, Oct 26, 2020 at 11:52:17AM +, Luca Boccassi wrote:
> On Mon, 2020-10-26 at 11:40 +, Gordon Ball wrote:
> > On Mon, Oct 26, 2020 at 09:48:52AM +, Luca Boccassi wrote:
> > > On Sun, 2020-10-25 at 17:13 +0100, László Böszörményi (GCS) wrote:
> > > > On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  
> > > > wrote:
> > > > > src:zeromq3 and libzmq3-dev currently embed headers from the separate
> > > > > cppzmq repository. However, the associated cmake files are not 
> > > > > included,
> > > > > which means when trying to build downstream projects which use cppzmq
> > > > > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > > > > files from cppzmq.
> > > >  These are different projects and should be packaged differently. As
> > > > czmq is packaged by Luca, I think cppzmq should be packaged by him as
> > > > well. But let's hear what he says.
> > > > 
> > > > Regards,
> > > > Laszlo/GCS
> > > 
> > > Hi,
> > > 
> > > Given it's just a header, I don't think it's necessary to do anything
> > > complicated - there's nothing to build and there's no dependencies to
> > > track. No point in having separate packages or cmake files or whatnot -
> > > #include is all a user needs.
> > > 
> > 
> > The CMake files aren't _needed_, but they're provided upstream and
> > downstream projects that use cppzmq and CMake expect them to be there,
> > and it feels like an unnecessary friction to need to patch/override the
> > buildsystem of downstream projects to get round us shipping the headers
> > but not the other parts of the cppzmq distribution.
> 
> Sorry I still don't follow, why does the downstream build system need
> to be patched/overriden? Again, it's just a header. There's nothing to
> build - just install the package, #include and it's good to go.
> 

This is probably a case where build tools provide you with extra ways to
shoot yourself in the foot. See, for example:

https://github.com/jupyter-xeus/xeus/blob/master/CMakeLists.txt

While the source files do just do `#include `, as you say, the
CMakeLists.txt wants to find the CMake config files for cppzmq to check
for the version, linker flags required, etc:

set(cppzmq_REQUIRED_VERSION 4.4.1)
find_package(cppzmq ${cppzmq_REQUIRED_VERSION} REQUIRED)
target_link_libraries(... PUBLIC ${CPPZMQ_TARGET_NAME} ...)

The CMake files for cppzmq don't (as you'd expect) do much - define a
target which requires linking to libzmq and declare the version.

So, to build the above project against the current debian libzmq3-dev is
possible, but some patching of the downstream package's CMakeLists is
required.

> > As observed, I don't know ZMQ that well, so I'm not trying to force
> > anything if you really don't think this is good idea, but from my
> > perspective either including the cmake files in libzmq3-dev or splitting
> > cppzmq into a separate source package which ships them would seem to be a
> > usability improvement.
> > 
> > > -- 
> > > Kind regards,
> > > Luca Boccassi
> > 
> > 
> 



Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Luca Boccassi
On Mon, 2020-10-26 at 11:40 +, Gordon Ball wrote:
> On Mon, Oct 26, 2020 at 09:48:52AM +, Luca Boccassi wrote:
> > On Sun, 2020-10-25 at 17:13 +0100, László Böszörményi (GCS) wrote:
> > > On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  wrote:
> > > > src:zeromq3 and libzmq3-dev currently embed headers from the separate
> > > > cppzmq repository. However, the associated cmake files are not included,
> > > > which means when trying to build downstream projects which use cppzmq
> > > > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > > > files from cppzmq.
> > >  These are different projects and should be packaged differently. As
> > > czmq is packaged by Luca, I think cppzmq should be packaged by him as
> > > well. But let's hear what he says.
> > > 
> > > Regards,
> > > Laszlo/GCS
> > 
> > Hi,
> > 
> > Given it's just a header, I don't think it's necessary to do anything
> > complicated - there's nothing to build and there's no dependencies to
> > track. No point in having separate packages or cmake files or whatnot -
> > #include is all a user needs.
> > 
> 
> The CMake files aren't _needed_, but they're provided upstream and
> downstream projects that use cppzmq and CMake expect them to be there,
> and it feels like an unnecessary friction to need to patch/override the
> buildsystem of downstream projects to get round us shipping the headers
> but not the other parts of the cppzmq distribution.

Sorry I still don't follow, why does the downstream build system need
to be patched/overriden? Again, it's just a header. There's nothing to
build - just install the package, #include and it's good to go.

> As observed, I don't know ZMQ that well, so I'm not trying to force
> anything if you really don't think this is good idea, but from my
> perspective either including the cmake files in libzmq3-dev or splitting
> cppzmq into a separate source package which ships them would seem to be a
> usability improvement.
> 
> > -- 
> > Kind regards,
> > Luca Boccassi
> 
> 



signature.asc
Description: This is a digitally signed message part


Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Gordon Ball
On Mon, Oct 26, 2020 at 09:48:52AM +, Luca Boccassi wrote:
> On Sun, 2020-10-25 at 17:13 +0100, László Böszörményi (GCS) wrote:
> > On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  wrote:
> > > src:zeromq3 and libzmq3-dev currently embed headers from the separate
> > > cppzmq repository. However, the associated cmake files are not included,
> > > which means when trying to build downstream projects which use cppzmq
> > > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > > files from cppzmq.
> >  These are different projects and should be packaged differently. As
> > czmq is packaged by Luca, I think cppzmq should be packaged by him as
> > well. But let's hear what he says.
> > 
> > Regards,
> > Laszlo/GCS
> 
> Hi,
> 
> Given it's just a header, I don't think it's necessary to do anything
> complicated - there's nothing to build and there's no dependencies to
> track. No point in having separate packages or cmake files or whatnot -
> #include is all a user needs.
> 

The CMake files aren't _needed_, but they're provided upstream and
downstream projects that use cppzmq and CMake expect them to be there,
and it feels like an unnecessary friction to need to patch/override the
buildsystem of downstream projects to get round us shipping the headers
but not the other parts of the cppzmq distribution.

As observed, I don't know ZMQ that well, so I'm not trying to force
anything if you really don't think this is good idea, but from my
perspective either including the cmake files in libzmq3-dev or splitting
cppzmq into a separate source package which ships them would seem to be a
usability improvement.

> -- 
> Kind regards,
> Luca Boccassi



Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Luca Boccassi
On Sun, 2020-10-25 at 17:13 +0100, László Böszörményi (GCS) wrote:
> On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  wrote:
> > src:zeromq3 and libzmq3-dev currently embed headers from the separate
> > cppzmq repository. However, the associated cmake files are not included,
> > which means when trying to build downstream projects which use cppzmq
> > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > files from cppzmq.
>  These are different projects and should be packaged differently. As
> czmq is packaged by Luca, I think cppzmq should be packaged by him as
> well. But let's hear what he says.
> 
> Regards,
> Laszlo/GCS

Hi,

Given it's just a header, I don't think it's necessary to do anything
complicated - there's nothing to build and there's no dependencies to
track. No point in having separate packages or cmake files or whatnot -
#include is all a user needs.

-- 
Kind regards,
Luca Boccassi


signature.asc
Description: This is a digitally signed message part


Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-26 Thread Gordon Ball
On Sun, Oct 25, 2020 at 05:13:52PM +0100, László Böszörményi (GCS) wrote:
> On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  wrote:
> > src:zeromq3 and libzmq3-dev currently embed headers from the separate
> > cppzmq repository. However, the associated cmake files are not included,
> > which means when trying to build downstream projects which use cppzmq
> > and cmake, it's necessary to hack the buildsystem or embed the cmake
> > files from cppzmq.
>  These are different projects and should be packaged differently. As
> czmq is packaged by Luca, I think cppzmq should be packaged by him as
> well. But let's hear what he says.
> 

Yes, this seems reasonable. I'm quite willing to see the patch I
prepared as a bit of a nasty hack.

I prepared standalone packaging for cppzmq a while ago before I realised
that it collided with headers already in libzmq3-dev. The packaging can
be found here: https://salsa.debian.org/chronitis/cppzmq - it's pretty
trivial since it's header only. The package should be more or less ready
to upload if wanted (but probably should be moved out of my salsa namespace).

However, the maintainer point is a good one. I'm coming at ZMQ in
general as a downstream user and I'm not a domain expert; it would be very
good if the packaging was maintained or co-maintained by someone who
knows the details of ZMQ a bit better.

> Regards,
> Laszlo/GCS



Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-25 Thread GCS
On Fri, Oct 23, 2020 at 4:57 PM Gordon Ball  wrote:
> src:zeromq3 and libzmq3-dev currently embed headers from the separate
> cppzmq repository. However, the associated cmake files are not included,
> which means when trying to build downstream projects which use cppzmq
> and cmake, it's necessary to hack the buildsystem or embed the cmake
> files from cppzmq.
 These are different projects and should be packaged differently. As
czmq is packaged by Luca, I think cppzmq should be packaged by him as
well. But let's hear what he says.

Regards,
Laszlo/GCS



Bug#972785: zeromq3: Include cmake files for cppzmq

2020-10-23 Thread Gordon Ball
Source: zeromq3
Severity: normal
Tags: patch

src:zeromq3 and libzmq3-dev currently embed headers from the separate
cppzmq repository. However, the associated cmake files are not included,
which means when trying to build downstream projects which use cppzmq
and cmake, it's necessary to hack the buildsystem or embed the cmake
files from cppzmq.

I've included a patch (against 4.3.3-2) which adds these files to the
source package and libzmq3-dev. Specifically:

 * move the existing cppzmq files (zmq.hpp, zmq_addon.hpp) to
   debian/cppzmq/ and add the cmake files from cppzmq 4.6.0
 * add Provides: cppzmq-dev to libzmq3-dev, which would hopefully make
   it easier to split the packages in future
 * build-depend on cmake, and add an override after dh_auto_install to
   process and install the cmake.in files from cppzmq 

I appreciate this is a larger change than #951135. Other options would be to

* continue to bundle cppzmq in a common source package, but use
  multiple upstream tarballs so cppzmq is a more obvious component and
  the embedded files can be more readily updated together.
* split cppzmq into a separate source package. Some downstream
  dependencies would need to be fixed. Codesearch suggests gnuradio,
  libopenshot, thrift, tango, ignition-transport, horizon-eda

Gordon
From 5c8f7f94d1e62a8a51bf73484493d9ae2e332a4d Mon Sep 17 00:00:00 2001
From: Gordon Ball 
Date: Tue, 15 Sep 2020 08:52:10 +
Subject: [PATCH] Add cppzmq cmake files

---
 debian/changelog  |  10 ++
 debian/control|   5 +-
 debian/copyright  |   6 +-
 debian/cppzmq/CMakeLists.txt  | 102 ++
 debian/cppzmq/cmake/DetectCPPZMQVersion.cmake |   8 ++
 debian/cppzmq/cppzmqConfig.cmake.in   |  36 +++
 .../cppzmq/libzmq-pkg-config/FindZeroMQ.cmake |  26 +
 debian/{ => cppzmq}/zmq.hpp   |   0
 debian/{ => cppzmq}/zmq_addon.hpp |   0
 debian/libzmq3-dev.install|   3 +-
 debian/rules  |   9 ++
 11 files changed, 199 insertions(+), 6 deletions(-)
 create mode 100644 debian/cppzmq/CMakeLists.txt
 create mode 100644 debian/cppzmq/cmake/DetectCPPZMQVersion.cmake
 create mode 100644 debian/cppzmq/cppzmqConfig.cmake.in
 create mode 100644 debian/cppzmq/libzmq-pkg-config/FindZeroMQ.cmake
 rename debian/{ => cppzmq}/zmq.hpp (100%)
 rename debian/{ => cppzmq}/zmq_addon.hpp (100%)

diff --git a/debian/changelog b/debian/changelog
index 072ba91..d020488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zeromq3 (4.3.3-3) UNRELEASED; urgency=medium
+
+  * In addition to the header files zmq.hpp and zmq_addon.hpp from cppzmq,
+libzmq3-dev now includes the associated CMake files for cppzmq
+ + The embedded cppzmq source files have been moved to d/cppzmq/
+ + Add Provides: cppzmq-dev to libzmq3-dev
+ + Add cmake to Build-Depends
+
+ -- Gordon Ball   Tue, 25 Aug 2020 14:32:39 +
+
 zeromq3 (4.3.3-2) unstable; urgency=medium
 
   * Backport upstream fix of broken zmq_ctx_get API.
diff --git a/debian/control b/debian/control
index cac55c3..7eb56ac 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper-compat (= 11),
  libkrb5-dev,
  pkg-config,
  xmlto,
- asciidoc
+ asciidoc,
+ cmake
 Standards-Version: 4.5.0
 #Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/zeromq3.git
 #Vcs-Git: git://anonscm.debian.org/collab-maint/zeromq3.git
@@ -36,7 +37,7 @@ Section: libdevel
 Depends: libzmq5 (= ${binary:Version}), ${misc:Depends}, libpgm-dev (>= 
5.2.122~dfsg), libsodium-dev, libnorm-dev, libkrb5-dev
 Conflicts: libzmq-dev, libzmq5-dev
 Replaces: libzmq5-dev
-Provides: libzmq5-dev
+Provides: libzmq5-dev, cppzmq-dev
 Multi-Arch: same
 Description: lightweight messaging kernel (development files)
  ØMQ is a library which extends the standard socket interfaces with features
diff --git a/debian/copyright b/debian/copyright
index a7cd247..f11fb19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,12 +55,14 @@ Copyright: 2014-, Laszlo Boszormenyi (GCS) 

  2012, Alessandro Ghedini 
 License: LGPL-2.0+
 
-Files: debian/zmq.hpp
+Files: debian/cppzmq/*
 Copyright: 2009-2011, 250bpm s.r.o.
  2011, Botond Ballo
  2007-2013, iMatix Corporation
+ 2016, VOCA AS / Harald Nøkland
+ 2016-2020, ZeroMQ community
 License: MIT
-Comment: The C++ header was downloaded from https://github.com/zeromq/cppzmq
+Comment: Downloaded from https://github.com/zeromq/cppzmq
 
 License: LGPL-2.0+
  This package is free software; you can redistribute it and/or
diff --git a/debian/cppzmq/CMakeLists.txt b/debian/cppzmq/CMakeLists.txt
new file mode 100644
index 000..81e19e8
--- /dev/null
+++ b/debian/cppzmq/CMakeLists.txt
@@ -0,0 +1,102 @@
+cmake_minimum_required(VERSION 3.0.0)
+
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+include (DetectCPPZMQVersion)
+