Merge ~ahasenack/ubuntu/+source/libpmemobj-cpp:eoan-libpmemobj-cpp-merge-1.6 into ubuntu/+source/libpmemobj-cpp:debian/experimental

[Andreas Hasenack]

PPA with a test build is the same one as for the pmdk merge:

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/pmdk-1.6-merge
sudo add-apt-repository ppa:ahasenack/pmdk-1.6-merge

Merge 1.6 from debian experimental.
Nothing big, and the very small delta I added I submitted to debian and it was just accepted (https://github.com/kilobyte/libpmemobj-cpp/pull/1)

I'll submit the other bits as well:
- d/control: libpmemobj-cpp-dev is arch amd64 only
- d/control: add an explicit versioned dependency on libpmemobj-dev to
  match the build-depends version

[Andreas Hasenack (ahasenack)]

Other submitted PRs:
- d/control: change libpmemobj-cpp-dev to be amd64: https://github.com/kilobyte/libpmemobj-cpp/pull/2
- d/control: version libpmemobj-cpp-dev's depends: https://github.com/kilobyte/libpmemobj-cpp/pull/3

[Christian Ehrhardt  (paelzer)]

Not sure on the plural of this, maybe:
"This is the HTML docs" -> "These are the HTML docs"

The transition changes look as we created them for 1.5 - ack
The doc fixups in general look correct to me and those are submittable to Debian.

The other changes we have discussed on the 1.5 merge already and they are retained correctly IMHO.
I'm interested to hear what Debian said about:
-Architecture: any
+Architecture: amd64
Let me know that when you have feedback.

Overall LGTM +1

review: Approve

[Andreas Hasenack (ahasenack)]

They didn't like it so far

[Andreas Hasenack (ahasenack)]

The doc-base file was accepted by debian already. I'll PR the fix to them later in the cycle. I hear a 1.6.1 version is due out soonish.

[Andreas Hasenack (ahasenack)]

the amd64 PR was merged

[Andreas Hasenack (ahasenack)]

Thanks, tagged and uploaded.

$ git push pkg upload/1.6-1ubuntu1
Enumerating objects: 45, done.
Counting objects: 100% (45/45), done.
Delta compression using up to 4 threads
Compressing objects: 100% (41/41), done.
Writing objects: 100% (41/41), 4.82 KiB | 411.00 KiB/s, done.
Total 41 (delta 28), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libpmemobj-cpp
 * [new tag] upload/1.6-1ubuntu1 -> upload/1.6-1ubuntu1

$ dput ubuntu ../libpmemobj-cpp_1.6-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../libpmemobj-cpp_1.6-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../libpmemobj-cpp_1.6-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libpmemobj-cpp_1.6-1ubuntu1.dsc: done.
  Uploading libpmemobj-cpp_1.6.orig.tar.gz: done.
  Uploading libpmemobj-cpp_1.6-1ubuntu1.debian.tar.xz: done.
  Uploading libpmemobj-cpp_1.6-1ubuntu1_source.buildinfo: done.
  Uploading libpmemobj-cpp_1.6-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated.

diff --git a/debian/changelog b/debian/changelog
index 2e060e3..7427b43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,43 @@
+libpmemobj-cpp (1.6-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: setup transition from libpmemobj-doc to
+      libpmemobj-cpp-doc, case #5 from https://wiki.debian.org/PackageTransition
+      [Can be dropped after 20.04]
+    - d/control: setup split transition from libpmemobj-dev, case #7 from
+      https://wiki.debian.org/PackageTransition
+      [Can be dropped after 20.04]
+    - d/control: libpmemobj-cpp-dev is arch amd64 only
+    - d/control: add an explicit versioned dependency on libpmemobj-dev to
+      match the build-depends version
+  * Added:
+    - d/libpmemobj-cpp-doc.doc-base: register doc package with doc-base
+    - d/control lintian fixes:
+      + doc package belongs in the doc section
+      + update doc package's short description
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 22 May 2019 18:11:47 +0000
+
 libpmemobj-cpp (1.6-1) experimental; urgency=medium
 
   * New upstream release.
 
  -- Adam Borowski <[e-mail]>  Mon, 18 Mar 2019 14:19:18 +0100
 
+libpmemobj-cpp (1.5.1-1ubuntu1) eoan; urgency=medium
+
+  * d/control: setup transition from libpmemobj-doc to
+    libpmemobj-cpp-doc, case #5 from https://wiki.debian.org/PackageTransition
+    [Can be dropped after 20.04]
+  * d/control: setup split transition from libpmemobj-dev, case #7 from
+    https://wiki.debian.org/PackageTransition
+    [Can be dropped after 20.04]
+  * d/control: libpmemobj-cpp-dev is arch amd64 only
+  * d/control: add an explicit versioned dependency on libpmemobj-dev to
+    match the build-depends version
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 15 May 2019 13:58:45 +0000
+
 libpmemobj-cpp (1.5.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index a8b0d7f..c888a5b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libpmemobj-cpp
 Priority: optional
-Maintainer: Adam Borowski <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Adam Borowski <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 11~),
                doxygen,
@@ -19,9 +20,11 @@ Vcs-Git: https://github.com/kilobyte/libpmemobj-cpp.git -b debian
 
 Package: libpmemobj-cpp-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64
 Multi-Arch: same
-Depends: libpmemobj-dev, ${misc:Depends}, ${shlibs:Depends}
+Depends: libpmemobj-dev (>= 1.5~), ${misc:Depends}, ${shlibs:Depends}
+Breaks: libpmemobj-dev (<< 1.5.1-1ubuntu1~)
+Replaces: libpmemobj-dev (<< 1.5.1-1ubuntu1~)
 Description: C++ bindings to libpmemobj
  The C++ bindings provide an easier to use (and thus less error prone
  version) of libpmemobj -- the persistent memory object store -- through
@@ -31,10 +34,13 @@ Description: C++ bindings to libpmemobj
  This package contains the development headers.
 
 Package: libpmemobj-cpp-doc
+Section: doc
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: C++ bindings to libpmemobj
+Breaks: libpmemobj-doc (<< 1.5.1-1ubuntu1~)
+Replaces: libpmemobj-doc (<< 1.5.1-1ubuntu1~)
+Description: C++ bindings to libpmemobj - documentation
  The C++ bindings provide an easier to use (and thus less error prone
  version) of libpmemobj -- the persistent memory object store -- through
  the implementation of a pmem-resident property, persistent pointers,
diff --git a/debian/libpmemobj-cpp-doc.doc-base b/debian/libpmemobj-cpp-doc.doc-base
new file mode 100644
index 0000000..cc36dd0
--- /dev/null
+++ b/debian/libpmemobj-cpp-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libpmemobj
+Title: PMDK libpmemobj C++ bindings Manual
+Author: PMDK Developers
+Abstract: This is the HTML docs for the C++ bindings for PMDK's libpmemobj.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libpmemobj-cpp/index.html
+Files: /usr/share/doc/libpmemobj-cpp/*