diff -Nru s390-tools-1.37.0/debian/changelog s390-tools-1.37.0/debian/changelog --- s390-tools-1.37.0/debian/changelog 2017-07-03 11:42:52.000000000 +0000 +++ s390-tools-1.37.0/debian/changelog 2017-08-02 13:59:54.000000000 +0000 @@ -1,3 +1,9 @@ +s390-tools (1.37.0-0ubuntu7) artful; urgency=medium + + * Drop chmem/lsmem utilities, moved to util-linux. + + -- Dimitri John Ledkov Wed, 02 Aug 2017 16:59:54 +0300 + s390-tools (1.37.0-0ubuntu6) artful; urgency=medium * Set cpi vars (system name, type, level and sysplex name) via systemd diff -Nru s390-tools-1.37.0/debian/#changelog.rej# s390-tools-1.37.0/debian/#changelog.rej# --- s390-tools-1.37.0/debian/#changelog.rej# 2017-03-14 09:25:20.000000000 +0000 +++ s390-tools-1.37.0/debian/#changelog.rej# 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- debian/changelog 2016-09-15 12:05:28.000000000 +0000 -+++ debian/changelog 2016-10-03 13:49:14.000000000 +0000 -@@ -1,3 +1,9 @@ -+s390-tools (1.36.1-0ubuntu3) yakkety; urgency=medium -+ -+ -+ -+ -- Dimitri John Ledkov Mon, 03 Oct 2016 14:48:28 +0100 -+ - s390-tools (1.36.1-0ubuntu2) yakkety; urgency=medium - - * Fix exit codes. LP: #1616596 diff -Nru s390-tools-1.37.0/debian/patches/drop-mem-tools.patch s390-tools-1.37.0/debian/patches/drop-mem-tools.patch --- s390-tools-1.37.0/debian/patches/drop-mem-tools.patch 1970-01-01 00:00:00.000000000 +0000 +++ s390-tools-1.37.0/debian/patches/drop-mem-tools.patch 2017-08-02 13:59:54.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Drop chmem/lsmem utilities, moved to util-linux. +Author: Dimitri John Ledkov + +--- s390-tools-1.37.0.orig/zconf/Makefile ++++ s390-tools-1.37.0/zconf/Makefile +@@ -5,9 +5,9 @@ include ../common.mak + + SCRIPTS = lsdasd lstape lscss chccwdev lsqeth lszfcp cio_ignore znetconf \ + dasdstat +-USRSBIN_SCRIPTS = lsmem chmem lsluns ++USRSBIN_SCRIPTS = lsluns + MANPAGES= lsdasd.8 lstape.8 lscss.8 chccwdev.8 lsqeth.8 lszfcp.8 lsluns.8 \ +- cio_ignore.8 znetconf.8 chmem.8 lsmem.8 dasdstat.8 ++ cio_ignore.8 znetconf.8 dasdstat.8 + + SUB_DIRS = zcrypt scm chp + diff -Nru s390-tools-1.37.0/debian/patches/series s390-tools-1.37.0/debian/patches/series --- s390-tools-1.37.0/debian/patches/series 2017-05-24 16:03:37.000000000 +0000 +++ s390-tools-1.37.0/debian/patches/series 2017-08-02 13:59:54.000000000 +0000 @@ -9,3 +9,4 @@ fix-ftbfs-link-order.patch v1.37.1-updates.patch s390-tools-chzdev-Fix-ineffective-zfcp-lun-udev-rule.patch +drop-mem-tools.patch diff -Nru s390-tools-1.37.0/debian/patches/#series.rej# s390-tools-1.37.0/debian/patches/#series.rej# --- s390-tools-1.37.0/debian/patches/#series.rej# 2017-03-14 09:25:20.000000000 +0000 +++ s390-tools-1.37.0/debian/patches/#series.rej# 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ ---- debian/patches/series 2016-09-15 12:05:05.000000000 +0000 -+++ debian/patches/series 2016-10-03 13:49:31.000000000 +0000 -@@ -7,3 +7,4 @@ - condition-cpacfstatsd.patch - no-wait-for.patch - 0001-ziomon-Use-exit-code-0-for-version-and-help.patch -+