summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-10-18 23:46:39 +0400
committerIgor Pashev <pashev.igor@gmail.com>2013-10-18 23:46:39 +0400
commit15abfbcc2a292d1720a9a5cf61c004c605bdce36 (patch)
tree3903b1266ec0ae051fb145d85bd606e716fb8d54
parent0e39b90eab160820ae938fcb3ea27f056c482ef5 (diff)
downloadillumos-packaging-15abfbcc2a292d1720a9a5cf61c004c605bdce36.tar.gz
ptools (2.10+1) unstable; urgency=low
* Included plimit * Added plimit-no-isaexec.patch * Priority is standard * Use native version scheme to make dpkg-source happy
-rw-r--r--ptools/debian/changelog9
-rw-r--r--ptools/debian/control1
-rw-r--r--ptools/debian/patches/plimit-no-isaexec.patch13
-rw-r--r--ptools/debian/patches/series1
-rw-r--r--ptools/debian/ptools.install20
-rw-r--r--ptools/debian/ptools.manpages1
-rwxr-xr-xptools/debian/rules4
7 files changed, 45 insertions, 4 deletions
diff --git a/ptools/debian/changelog b/ptools/debian/changelog
index a1079be..cbfaa06 100644
--- a/ptools/debian/changelog
+++ b/ptools/debian/changelog
@@ -1,3 +1,12 @@
+ptools (2.10+1) unstable; urgency=low
+
+ * Included plimit
+ * Added plimit-no-isaexec.patch
+ * Priority is standard
+ * Use native version scheme to make dpkg-source happy
+
+ -- Igor Pashev <pashev.igor@gmail.com> Fri, 18 Oct 2013 12:54:09 +0400
+
ptools (2.10-1) unstable; urgency=low
* Initial release.
diff --git a/ptools/debian/control b/ptools/debian/control
index ced6fe0..24d780c 100644
--- a/ptools/debian/control
+++ b/ptools/debian/control
@@ -14,7 +14,6 @@ Standards-Version: 3.9.4
Homepage: https://www.illumos.org
Package: ptools
-Priority: optional
Architecture: illumos-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: processes observability tools
diff --git a/ptools/debian/patches/plimit-no-isaexec.patch b/ptools/debian/patches/plimit-no-isaexec.patch
new file mode 100644
index 0000000..2456e03
--- /dev/null
+++ b/ptools/debian/patches/plimit-no-isaexec.patch
@@ -0,0 +1,13 @@
+Index: ptools/usr/src/cmd/plimit/Makefile
+===================================================================
+--- ptools.orig/usr/src/cmd/plimit/Makefile 2012-10-08 04:25:33.000000000 +0400
++++ ptools/usr/src/cmd/plimit/Makefile 2013-10-18 12:54:01.929200575 +0400
+@@ -48,8 +48,6 @@
+ clean clobber lint: $(SUBDIRS)
+
+ install: $(SUBDIRS)
+- -$(RM) $(ROOTPROG)
+- -$(LN) $(ISAEXEC) $(ROOTPROG)
+
+ $(SUBDIRS): FRC
+ @cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/ptools/debian/patches/series b/ptools/debian/patches/series
index 23cf100..1c86595 100644
--- a/ptools/debian/patches/series
+++ b/ptools/debian/patches/series
@@ -4,3 +4,4 @@ ptools-psig-pointers.patch
ptools-pargs-pointers.patch
ptools-pargs-use-libiconv.patch
ptools-Makefile.bld-gnu-make.patch
+plimit-no-isaexec.patch
diff --git a/ptools/debian/ptools.install b/ptools/debian/ptools.install
index 1df36c6..f4bb238 100644
--- a/ptools/debian/ptools.install
+++ b/ptools/debian/ptools.install
@@ -1 +1,19 @@
-usr/bin/*
+usr/bin/pargs
+usr/bin/pcred
+usr/bin/pfiles
+usr/bin/pflags
+usr/bin/pldd
+usr/bin/plgrp
+usr/bin/plimit
+usr/bin/pmadvise
+usr/bin/pmap
+usr/bin/ppriv
+usr/bin/preap
+usr/bin/prun
+usr/bin/psig
+usr/bin/pstack
+usr/bin/pstop
+usr/bin/ptime
+usr/bin/ptree
+usr/bin/pwait
+usr/bin/pwdx
diff --git a/ptools/debian/ptools.manpages b/ptools/debian/ptools.manpages
index 978573e..3c9dbba 100644
--- a/ptools/debian/ptools.manpages
+++ b/ptools/debian/ptools.manpages
@@ -1,5 +1,6 @@
usr/src/man/man1/pargs.1
usr/src/man/man1/plgrp.1
+usr/src/man/man1/plimit.1
usr/src/man/man1/pmadvise.1
usr/src/man/man1/pmap.1
usr/src/man/man1/ppriv.1
diff --git a/ptools/debian/rules b/ptools/debian/rules
index bc5b62d..4c62394 100755
--- a/ptools/debian/rules
+++ b/ptools/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/dpkg/architecture.mk
export DH_VERBOSE = 1
-cmd := ptools
+cmd := ptools plimit
unpack: unpack-stamp
unpack-stamp:
@@ -62,7 +62,7 @@ binary-stamp: build-stamp
dh_testdir
dh_testroot
dh_installdirs
- dh_install
+ dh_install --fail-missing
dh_installman
dh_installdocs
dh_installexamples