Merge ~ahasenack/ubuntu/+source/libpmemobj-cpp:focal-libpmemobj-cpp-merge into ubuntu/+source/libpmemobj-cpp:debian/sid

[Andreas Hasenack]

Merge from debian. This can almost become a sync, but I rather keep that tiny change for now.

Bileto ticket (I used the same one I had for pmdk, which I already uploaded):
https://bileto.ubuntu.com/#/ticket/3853

There was just an adm64 failure but due to a problem installing the kernel. I retriggered that test.

[Bryce Harrington (bryce)]

Simple enough, just adding the version requirement looks straightforward. The bileto PPA built the package successfully with the required version.

> libpmemobj-dev | 1.7-1ubuntu1 | focal-proposed/universe | amd64, arm64

+1 LGTM

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

+1 on those changes.

Just one comment: did you see the DEP-3 headers of the valgrind_concurrent_hash_map patch added by the Debian maintainer? There is just the template :) do you think it worth to report this to him?

review: Approve

[Andreas Hasenack (ahasenack)]

I hadn't seen that, I'll let him know :)

[Andreas Hasenack (ahasenack)]

Tagging and uploading 3d05f706c692c2f0d0b3161448697360fbce5915

$ git push pkg upload/1.8-2ubuntu1
Warning: Permanently added the RSA host key for IP address '91.189.94.77' to the list of known hosts.
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 4 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (17/17), 3.24 KiB | 3.24 MiB/s, done.
Total 17 (delta 11), reused 13 (delta 9)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libpmemobj-cpp
 * [new tag] upload/1.8-2ubuntu1 -> upload/1.8-2ubuntu1

$ dput ubuntu ../libpmemobj-cpp_1.8-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../libpmemobj-cpp_1.8-2ubuntu1_source.changes: Valid signature from 784259B3F3DDC290
Checking signature on .dsc
gpg: ../libpmemobj-cpp_1.8-2ubuntu1.dsc: Valid signature from 784259B3F3DDC290
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.8-2ubuntu1.dsc: done.
  Uploading libpmemobj-cpp_1.8.orig.tar.gz: done.
  Uploading libpmemobj-cpp_1.8-2ubuntu1.debian.tar.xz: done.
  Uploading libpmemobj-cpp_1.8-2ubuntu1_source.buildinfo: done.
  Uploading libpmemobj-cpp_1.8-2ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated.

diff --git a/debian/changelog b/debian/changelog
index 40c0577..d9bd25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libpmemobj-cpp (1.8-2ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: add an explicit versioned dependency on libpmemobj-dev to
+      match the build-depends version
+      [Updated the added versioned dependency to 1.7]
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 05 Dec 2019 18:19:52 -0300
+
 libpmemobj-cpp (1.8-2) unstable; urgency=medium
 
   * Cherry-pick a fix for random test failures in concurrent_hash_map.
@@ -18,6 +27,51 @@ libpmemobj-cpp (1.8~rc1-1) experimental; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Thu, 03 Oct 2019 15:07:25 +0200
 
+libpmemobj-cpp (1.7-2ubuntu4) eoan; urgency=medium
+
+  * d/control, d/t/control: Drop extra deps added in 2ubuntu3 and 2ubuntu2, no
+    longer needed with pmdk 1.6.1-1ubuntu1 which adds them to each *-dev package
+    where needed.
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 02 Sep 2019 11:06:55 -0300
+
+libpmemobj-cpp (1.7-2ubuntu3) eoan; urgency=medium
+
+  * d/control: add libndctl-dev and libdaxctl-dev to build-deps
+    (LP: #1841463)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 26 Aug 2019 15:51:25 -0300
+
+libpmemobj-cpp (1.7-2ubuntu2) eoan; urgency=medium
+
+  * d/t/control: add missing libdaxctl-dev and libndctl-dev dep8 dependencies
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 22 Aug 2019 22:59:28 -0300
+
+libpmemobj-cpp (1.7-2ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: add an explicit versioned dependency on libpmemobj-dev to
+      match the build-depends version
+  * Dropped:
+    - 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]
+      [Included in 1.6-2]
+    - d/control: setup split transition from libpmemobj-dev, case #7 from
+      https://wiki.debian.org/PackageTransition
+      [Can be dropped after 20.04]
+      [Included in 1.6-2]
+    - d/control: libpmemobj-cpp-dev is arch amd64 only
+      [Included in 1.6-2]
+    - d/control lintian fixes:
+      + doc package belongs in the doc section
+        [Included in 1.6-2]
+      + update doc package's short description
+        [Included in 1.6-2]
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 16 Aug 2019 14:43:32 -0300
+
 libpmemobj-cpp (1.7-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -52,12 +106,46 @@ libpmemobj-cpp (1.6-2) experimental; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Fri, 24 May 2019 15:34:31 +0200
 
+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 8c838db..6b96b8d 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-compat (= 12),
                doxygen,
@@ -23,7 +24,7 @@ Package: libpmemobj-cpp-dev
 Section: libdevel
 Architecture: amd64
 Multi-Arch: same
-Depends: libpmemobj-dev, ${misc:Depends}, ${shlibs:Depends}
+Depends: libpmemobj-dev (>= 1.7~), ${misc:Depends}, ${shlibs:Depends}
 # These versions were found in Ubuntu ≤ Disco; can be removed after 20.04.
 Breaks: libpmemobj-dev (<< 1.5)
 Replaces: libpmemobj-dev (<< 1.5)