From a1ac12249d01d47e01fde86c871b85ca4d30bfe0 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 7 Feb 2012 11:33:08 +0400 Subject: Moved more into /usr/bin --- debian/changelog | 6 ++++++ debian/rules | 5 +++++ debian/util-linux.postinst | 2 +- debian/util-linux.prerm | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c9e6752..7fa995df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +util-linux (2.17-0+dyson2) unstable; urgency=low + + * Moved more into /usr/bin + + -- Igor Pashev Tue, 07 Feb 2012 11:00:11 +0400 + util-linux (2.17-0+dyson1) unstable; urgency=low * Ported to Dyson diff --git a/debian/rules b/debian/rules index 83184b4c..434d938e 100755 --- a/debian/rules +++ b/debian/rules @@ -173,6 +173,11 @@ ifeq (,$(findstring $(DEB_HOST_ARCH_OS),linux illumos)) cd debian/util-linux/sbin ; mv mkswap mkswap.linux cd debian/util-linux/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8 endif +ifeq (illumos,$(DEB_HOST_ARCH_OS)) + mv debian/util-linux/bin/* debian/util-linux/usr/bin/ + rmdir debian/util-linux/bin +endif + dh_compress -i -s dh_fixperms -i -s -Xusr/bin/wall -Xbin/mount -Xbin/umount rm -rf debian/*-udeb/usr/share/doc diff --git a/debian/util-linux.postinst b/debian/util-linux.postinst index 004f3487..ef6eb5fc 100644 --- a/debian/util-linux.postinst +++ b/debian/util-linux.postinst @@ -3,7 +3,7 @@ umask 022 set -e -update-alternatives --install /usr/bin/pager pager /bin/more 50 \ +update-alternatives --install /usr/bin/pager pager /usr/bin/more 50 \ --slave /usr/share/man/man1/pager.1.gz pager.1.gz /usr/share/man/man1/more.1.gz update-alternatives --install /usr/bin/pager pager /usr/bin/pg 10 \ --slave /usr/share/man/man1/pager.1.gz pager.1.gz /usr/share/man/man1/pg.1.gz diff --git a/debian/util-linux.prerm b/debian/util-linux.prerm index 7f538845..8d5867c4 100644 --- a/debian/util-linux.prerm +++ b/debian/util-linux.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove) - update-alternatives --remove pager /bin/more + update-alternatives --remove pager /usr/bin/more update-alternatives --remove pager /usr/bin/pg ;; upgrade|failed-upgrade|deconfigure) -- cgit v1.2.3