~mdw
/
misc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc
[misc]
/
debian
/
control
diff --git
a/debian/control
b/debian/control
index
d9d9a22
..
a99d6f0
100644
(file)
--- a/
debian/control
+++ b/
debian/control
@@
-9,7
+9,7
@@
Build-Depends: debhelper (>= 9), pkg-config,
Standards-Version: 3.1.1
Package: distorted-utils
Standards-Version: 3.1.1
Package: distorted-utils
-Architecture: a
ll
+Architecture: a
ny
Section: utils
Replaces: nsict-utils (<< 1.4.0~)
Breaks: nsict-utils (<< 1.4.0~)
Section: utils
Replaces: nsict-utils (<< 1.4.0~)
Breaks: nsict-utils (<< 1.4.0~)
@@
-26,13
+26,16
@@
Depends:
locking,
mdwopt-perl,
mtimeout,
locking,
mdwopt-perl,
mtimeout,
+ mprlimit [linux-any],
pause,
pause,
+ prlimit [linux-any],
shadowfix,
space,
splitconf,
sshsvc-mkauthkeys,
stamp,
with-umask,
shadowfix,
space,
splitconf,
sshsvc-mkauthkeys,
stamp,
with-umask,
+ x86-model [any-i386 any-amd64],
xtitle,
zz
Description: Dummy package for convenience.
xtitle,
zz
Description: Dummy package for convenience.
@@
-111,6
+114,12
@@
Section: utils
Depends: ${shlibs:Depends}
Description: Run a program for at most a given amount of time.
Depends: ${shlibs:Depends}
Description: Run a program for at most a given amount of time.
+Package: mprlimit
+Architecture: linux-any
+Section: utils
+Depends: ${shlibs:Depends}
+Description: Run a program for at most a given amount of time.
+
Package: pause
Architecture: any
Depends: ${shlibs:Depends}
Package: pause
Architecture: any
Depends: ${shlibs:Depends}
@@
-118,10
+127,13
@@
Section: utils
Description: Wait for a given time, or until a key is pressed.
Package: prlimit
Description: Wait for a given time, or until a key is pressed.
Package: prlimit
-Architecture:
linux-any
+Architecture:
all
Section: utils
Section: utils
-Depends: ${shlibs:Depends}
+Depends: mprlimit
+Conflicts: util-linux (>= 2.24.2)
Description: Run a program for at most a given amount of time.
Description: Run a program for at most a given amount of time.
+ This package provides a symlink to `mprlimit' for the sake of backwards
+ compatibility.
Package: sema
Architecture: any
Package: sema
Architecture: any