summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-21 00:11:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-21 00:11:11 +0000
commitca23bbc0127834570e7525281a15a5b20e1b5c59 (patch)
tree618f3c91e23e261228b8dda2e27e368cf85959d8
parentMerging upstream version 23.4. (diff)
downloadpsmisc-ca23bbc0127834570e7525281a15a5b20e1b5c59.tar.xz
psmisc-ca23bbc0127834570e7525281a15a5b20e1b5c59.zip
Merging debian version 23.4-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/compat1
-rw-r--r--debian/control7
-rw-r--r--debian/patches/manpage-fixes14
-rw-r--r--debian/patches/series1
-rw-r--r--debian/tests/control3
-rw-r--r--debian/tests/version10
7 files changed, 25 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 9972ca8..b70a36b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+psmisc (23.4-1) unstable; urgency=medium
+
+ * New upstream release
+ * Update to standards 4.5.1 no change
+ * Update to debhelper v13
+
+ -- Craig Small <csmall@debian.org> Sat, 06 Feb 2021 11:21:39 +1100
+
psmisc (23.3-1~progress5+u1) engywuck-backports; urgency=medium
* Initial upload to engywuck-backports.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 9a54280..432bc4e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,10 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Craig Small <csmall@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper (>= 11), libncurses-dev, gettext, libselinux1-dev [linux-any]
-Standards-Version: 4.4.1
+Build-Depends: debhelper-compat (= 13),
+ dejagnu, gettext,
+ libncurses-dev, gettext, libselinux1-dev [linux-any]
+Standards-Version: 4.5.1
Vcs-Browser: https://git.progress-linux.org/packages/engywuck-backports/psmisc
Vcs-Git: https://git.progress-linux.org/packages/engywuck-backports/psmisc
XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/psmisc
@@ -16,7 +18,6 @@ Package: psmisc
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: procps (<< 1:1.2)
Description: utilities that use the proc file system
This package contains miscellaneous utilities that use the proc FS:
.
diff --git a/debian/patches/manpage-fixes b/debian/patches/manpage-fixes
deleted file mode 100644
index a4509fe..0000000
--- a/debian/patches/manpage-fixes
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/doc/fuser.1
-+++ b/doc/fuser.1
-@@ -289,4 +289,3 @@
- .BR pkill (1),
- .BR ps (1),
- .BR kill (2).
--.\{{{}}}
---- a/doc/killall.1
-+++ b/doc/killall.1
-@@ -176,4 +176,3 @@
- .BR ps (1),
- .BR kill (2),
- .BR regex (3).
--.\{{{}}}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4bbbe65..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-manpage-fixes
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..998abe3
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: version
+Restrictions: superficial
+
diff --git a/debian/tests/version b/debian/tests/version
new file mode 100644
index 0000000..b7700bc
--- /dev/null
+++ b/debian/tests/version
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+BINARIES='killall pslog prtstat pstree fuser peekfd'
+
+for bin in $BINARIES ; do \
+ $bin --version 2>&1 | egrep "^$bin \(PSmisc\) [0-9.]+$" ; \
+done
+