Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc:
  mprlimit: The new name for `prlimit'.
  debian/control: Include `prlimit' and `x86-model' in the metapackage.

diff --git a/Makefile.am b/Makefile.am
index 4a115fc..e46fe11 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,13 +97,13 @@ pause_LDADD          = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += pause.1
 endif
 
-## prlimit
+## mprlimit
 if HAVE_PRLIMIT
 if HAVE_MLIB
-bin_PROGRAMS           += prlimit
-prlimit_SOURCES                 = prlimit.c
-prlimit_LDADD           = $(mLib_LIBS)
-dist_man_MANS          += prlimit.1
+bin_PROGRAMS           += mprlimit
+mprlimit_SOURCES        = mprlimit.c
+mprlimit_LDADD          = $(mLib_LIBS)
+dist_man_MANS          += mprlimit.1
 endif
 endif
 

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
-Architecture: all
+Architecture: any
 Section: utils
 Replaces: nsict-utils (<< 1.4.0~)
 Breaks: nsict-utils (<< 1.4.0~)
@@ -26,13 +26,16 @@ Depends:
        locking,
        mdwopt-perl,
        mtimeout,
+       mprlimit [linux-any],
        pause,
+       prlimit [linux-any],
        shadowfix,
        space,
        splitconf,
        sshsvc-mkauthkeys,
        stamp,
        with-umask,
+       x86-model [any-i386 any-amd64],
        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.
 
+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}
@@ -118,10 +127,13 @@ Section: utils
 Description: Wait for a given time, or until a key is pressed.
 
 Package: prlimit
-Architecture: linux-any
+Architecture: all
 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.
+ This package provides a symlink to `mprlimit' for the sake of backwards
+ compatibility.
 
 Package: sema
 Architecture: any

diff --git a/debian/inst b/debian/inst
index e888314..7f2997e 100644 (file)
--- a/debian/inst
+++ b/debian/inst
@@ -33,8 +33,8 @@ not distorted-mail /usr/bin
 not.1 distorted-mail /usr/share/man/man1
 pause pause /usr/bin
 pause.1 pause /usr/share/man/man1
-prlimit prlimit /usr/bin
-prlimit.1 prlimit /usr/share/man/man1
+mprlimit mprlimit /usr/bin
+mprlimit.1 mprlimit /usr/share/man/man1
 sema sema /usr/bin
 sema.1 sema /usr/share/man/man1
 shadowfix shadowfix /usr/sbin

diff --git a/debian/rules b/debian/rules
index f04c6f8..5352d04 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_clean:
        dh_clean
        rm -f debian/*.install debian/*.stamp
 
-override_dh_install: debian/install-files.stamp
+override_dh_install: debian/install-files.stamp debian/compat-links.stamp
        dh_install
 
 debian/install-files.stamp: debian/inst
@@ -29,4 +29,10 @@ debian/install-files.stamp: debian/inst
          mv debian/$$pkg.install.new debian/$$pkg.install; \
        done
 
+debian/compat-links.stamp:
+       mkdir -p debian/prlimit/usr/bin/
+       mkdir -p debian/prlimit/usr/share/man/man1/
+       ln -s mprlimit debian/prlimit/usr/bin/prlimit
+       ln -s mprlimit.1.gz debian/prlimit/usr/share/man/man1/prlimit.1.gz
+
 ###----- That's all, folks --------------------------------------------------

diff --git a/prlimit.1 b/mprlimit.1
similarity index 100%
rename from prlimit.1
rename to mprlimit.1

diff --git a/prlimit.c b/mprlimit.c
similarity index 100%
rename from prlimit.c
rename to mprlimit.c