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

[Andreas Hasenack]

Normal merge from Debian. Some delta dropped. This delta: "libpmemobj c++ bindings are on separate source now" had 3 parts before, now it has just one. I repeated that "heading" in d/changelog under "remaining changes", but if it looks odd by having just one subitem, I can drop it.

Bileto ticket, all green: https://bileto.ubuntu.com/#/ticket/3853

[Andreas Hasenack (ahasenack)]

I just uploaded a new libpmemobj-cpp to this same bileto ppa, to have that run together. It requires the new pmdk, so I thought of using this existing ppa.

[Andreas Hasenack (ahasenack)]

FTR, before I did that, the current results were:
autopkgtest for libpmemobj-cpp/1.7-2ubuntu4: amd64: Pass [artifacts]
autopkgtest for pmdk/1.7-1ubuntu1~ppa1: amd64: Pass [artifacts], arm64: Pass [artifacts], armhf: Always failed [artifacts], i386: Always failed [artifacts], ppc64el: Test in progress (always failed), s390x: Always failed [artifacts]
Valid candidate

pmdk amd64: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal-ci-train-ppa-service-3853/focal/amd64/p/pmdk/20191205_151239_824a0@/log.gz

libpmemobj-cpp 1.7-2u4 amd64: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal-ci-train-ppa-service-3853/focal/amd64/libp/libpmemobj-cpp/20191205_150503_43460@/log.gz

The new libpmemobj-cpp that I just uploaded is 1.8-2u1~ppa1

[Lucas Kanashiro (lucaskanashiro)]

+1 on those changes.

And I liked the way you organized the changelog, it is clear that those 3 parts are related (and it didn't bother me :)

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks!

Tagging and uploading 70b34bd11e971af5da5a321b8981942cac2011b4

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

$ dput ubuntu ../pmdk_1.7-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../pmdk_1.7-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../pmdk_1.7-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 pmdk_1.7-1ubuntu1.dsc: done.
  Uploading pmdk_1.7.orig.tar.gz: done.
  Uploading pmdk_1.7-1ubuntu1.debian.tar.xz: done.
  Uploading pmdk_1.7-1ubuntu1_source.buildinfo: done.
  Uploading pmdk_1.7-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..22e63d1
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,19 @@
+pmdk (1.5.1-1ubuntu1) eoan; urgency=medium
+
+  Important changes introduced in version 1.5. See
+  http://pmem.io/2018/10/22/release-1-5.html for details.
+
+  The libpmemcto code has been removed from upstream in this release, and as
+  such the corresponding libpmemcto* Debian packages are no longer being
+  built.
+
+  The c++ header files and documentation for libpmemobj were moved to a new
+  source package called libpmemobj-cpp, and are present in the binary packages
+  libpmemobj-cpp-dev and libpmemobj-cpp-doc respectively.
+
+  As a side effect of performance optimizations, the libpmemobj on-media layout
+  had to be changed, which means that old pools have to be converted using
+  pmdk-convert.
+
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 10 May 2019 18:38:26 +0000
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..6574150
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,33 @@
+lintian check: debian-watch-does-not-check-gpg-signature
+========================================================
+Upstream does not distribute detatched gpg signatures
+
+https://github.com/pmem/issues/issues/848
+
+
+lintian check: hardening-no-fortify-functions
+=============================================
+This check is raising warnings for the -debug library packages. As their
+respective description says, these packages are meant for special debugging
+cases and should not be installed or used outside of a debugging session.
+Therefore, this lintian warning is not being addressed for the libraries in the
+-debug packages.
+
+Also note that just installing the -debug packages is not enough to have
+applications use them, since they are installed in a path outside of the linker
+search path. The devel manpages for each library explain how to use them.
+
+
+Bundled jemalloc
+================
+The upstream source includes jemalloc version 3.6.0, released 2014-03-31, with
+local modifications, as declared in src/jemalloc/README.libvmem.
+
+Questioned if this was still necessary, and why the changes couldn't be sent
+back to jemalloc, upstream had this to say
+(https://bugs.launchpad.net/ubuntu/+bug/1752378/comments/72):
+
+"""
+We can't upstream those changes, because jemalloc changed too much since we
+forked it.
+"""
diff --git a/debian/changelog b/debian/changelog
index 3a39753..7797a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+pmdk (1.7-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - libpmemobj c++ bindings are on separate source now
+      + d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
+        [Can be dropped after 20.04]
+    - d/NEWS: added to explain important packaging changes in this update
+      [Can be dropped after 20.04]
+    - d/control: the valgrind test is failing, remove it from
+      build-depends
+    - d/README.source: explains some lintian checks and the reason why
+      jemalloc is bundled.
+    - d/rules: re-enabled TEST34 as it seems to work fine in the Ubuntu
+      test runners
+  * Dropped:
+    - libpmemobj c++ bindings are on separate source now:
+      + d/libpmemobj-doc.install: removed
+        [In 1.6.1-2]
+      + d/libpmemobj-doc.doc-base: removed
+        [In 1.6.1-2]
+    - d/t/{daxio-version,rpmemd-version}: adjust the test to cope with
+      release candidate versions
+      [In 1.7~rc2-1]
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 04 Dec 2019 18:15:12 -0300
+
 pmdk (1.7-1) unstable; urgency=medium
 
   * Upstream release.
@@ -30,6 +56,26 @@ pmdk (1.6.1-2) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Mon, 02 Sep 2019 20:41:03 +0200
 
+pmdk (1.6.1-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - libpmemobj c++ bindings are on separate source now:
+      + d/libpmemobj-doc.install: removed
+      + d/libpmemobj-doc.doc-base: removed
+      + d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
+    - d/NEWS: added to explain important packaging changes in this update
+      [Can be dropped after 20.04]
+    - d/control: the valgrind test is failing, remove it from
+      build-depends
+    - d/README.source: explains some lintian checks and the reason why
+      jemalloc is bundled.
+    - d/rules: re-enabled TEST34 as it seems to work fine in the Ubuntu
+      test runners
+    - d/t/{daxio-version,rpmemd-version}: adjust the test to cope with
+      release candidate versions
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 29 Aug 2019 15:54:42 -0300
+
 pmdk (1.6.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -38,12 +84,68 @@ pmdk (1.6.1-1) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Wed, 28 Aug 2019 02:41:52 +0200
 
+pmdk (1.6.1~rc1-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - libpmemobj c++ bindings are on separate source now:
+      + d/libpmemobj-doc.install: removed
+      + d/libpmemobj-doc.doc-base: removed
+      + d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
+    - d/NEWS: added to explain important packaging changes in this update
+      [Can be dropped after 20.04]
+    - d/control: the valgrind test is failing, remove it from
+      build-depends
+    - d/README.source: explains some lintian checks and the reason why
+      jemalloc is bundled.
+    - d/rules: re-enabled TEST34 as it seems to work fine in the Ubuntu
+      test runners
+  * Dropped:
+    - d/t/control, d/t/rpmemd-version: added simple rpmemd test just to
+      verify that the tool runs. Also flag the test as being amd64 only,
+      and skip it in other arches.
+      [Included in 1.6.1~rc1-1]
+  * Added:
+    - d/t/{daxio-version,rpmemd-version}: adjust the test to cope with
+      release candidate versions
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 22 Aug 2019 11:25:43 -0300
+
 pmdk (1.6.1~rc1-1) experimental; urgency=medium
 
   * New upstream pre-release.
 
  -- Adam Borowski <[e-mail]>  Mon, 19 Aug 2019 17:15:43 +0200
 
+pmdk (1.6-5ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - libpmemobj c++ bindings are on separate source now:
+      + d/libpmemobj-doc.install: removed
+      + d/libpmemobj-doc.doc-base: removed
+      + d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
+    - d/NEWS: added to explain important packaging changes in this update
+      [Can be dropped after 20.04]
+    - d/control: the valgrind test is failing, remove it from
+      build-depends
+    - d/README.source: explains some lintian checks and the reason why
+      jemalloc is bundled.
+  * Dropped:
+    - d/p/manpage-debug-packages.patch: mention the -debug package split
+      in Ubuntu systems
+      [Added in 1.6-2]
+    - d/rules: use dh_missing with --fail and known exclusions for files
+      installed by other dh tools
+      [Added in 1.6-2]
+  * Added:
+    - d/t/control, d/t/rpmemd-version: added simple rpmemd test just to
+      verify that the tool runs. Also flag the test as being amd64 only,
+      and skip it in other arches.
+      [This was dropped in Debian because it tried to run in arm64]
+    - d/rules: re-enabled TEST34 as it seems to work fine in the Ubuntu
+      test runners
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 29 Jul 2019 15:16:33 -0300
+
 pmdk (1.6-5) unstable; urgency=medium
 
   * B-Depend on ndctl with fixed fd leaks, don't ignore fails.
@@ -78,6 +180,32 @@ pmdk (1.6-2) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Mon, 08 Jul 2019 11:55:38 +0200
 
+pmdk (1.6-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/manpage-debug-packages.patch: mention the -debug package split
+      in Ubuntu systems
+    - libpmemobj c++ bindings are on separate source now:
+      + d/libpmemobj-doc.install: removed
+      + d/libpmemobj-doc.doc-base: removed
+      + d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
+    - d/rules: use dh_missing with --fail and known exclusions for files
+      installed by other dh tools
+    - d/NEWS: added to explain important packaging changes in this update
+      [Can be dropped after 20.04]
+    - d/control: the valgrind test is failing, remove it from
+      build-depends
+    - d/README.source: explains some lintian checks and the reason why
+      jemalloc is bundled.
+    - d/not-installed: list files from the pmreorder python script that
+      we are choosing to not install because it's not ready yet, requiring
+      forks of other tools.
+  * Dropped:
+    - d/rules: don't remove TEST34 as it is passing in Ubuntu atm
+      [In 1.6~rc2-1]
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 23 May 2019 11:57:43 -0300
+
 pmdk (1.6-1) experimental; urgency=medium
 
   * New upstream release.
@@ -90,6 +218,28 @@ pmdk (1.6~rc2-1) experimental; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Mon, 18 Mar 2019 02:04:47 +0100
 
+pmdk (1.5.1-1ubuntu1) eoan; urgency=medium
+
+  * d/p/manpage-debug-packages.patch: mention the -debug package split
+    in Ubuntu systems
+  * libpmemobj c++ bindings are on separate source now:
+    - d/libpmemobj-doc.install: removed
+    - d/libpmemobj-doc.doc-base: removed
+    - d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
+  * d/rules: use dh_missing with --fail and known exclusions for files
+    installed by other dh tools
+  * d/rules: don't remove TEST34 as it is passing in Ubuntu atm
+  * d/NEWS: added to explain important packaging changes in this update
+  * d/control: the valgrind test is failing, remove it from
+    build-depends
+  * d/README.source: explains some lintian checks and the reason why
+    jemalloc is bundled.
+  * d/not-installed: list files from the pmreorder python script that
+    we are choosing to not install because it's not ready yet, requiring
+    forks of other tools.
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 16 May 2019 14:48:30 +0000
+
 pmdk (1.5.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 1e94d16..a359bc4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pmdk
 Section: libs
 Priority: optional
-Maintainer: Adam Borowski <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Adam Borowski <[e-mail]>
 Build-Depends: bash-completion,
                bc,
                debhelper-compat (= 12),
@@ -13,8 +14,6 @@ Build-Depends: bash-completion,
                pkg-config,
                python3,
                strace,
-               valgrind,
-               valgrind (>= 1:3.15.0) [arm64],
 Standards-Version: 4.4.0
 Rules-Requires-Root: no
 Homepage: http://pmem.io/pmdk/
@@ -200,6 +199,14 @@ Description: development files for libpmemobj1
  This package contains libraries and header files used for linking programs
  against libpmemobj.
 
+Package: libpmemobj-doc
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends},
+         libpmemobj-cpp-doc
+Description: Transitional package for libpmemobj-cpp-doc
+ This is a transitional package. It can safely be removed.
+
 Package: libpmempool1
 Architecture: amd64 arm64
 Multi-Arch: same
diff --git a/debian/rules b/debian/rules
index 5d80556..18ff61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,5 @@ override_dh_missing:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cp debian/testconfig.* src/test/
-	# Still fails/times out on weird setups (a 33GB fallocate).
-	rm -f src/test/obj_pool/TEST34
 	+$(MAKE) check pycheck $(BUILD_ARGS)
 endif