From f9e60cb57104f4bd2e3170af4e60e0cba56d42ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 9 Apr 2016 11:10:55 +0200 Subject: Use dpkg-maintscript-helper dir_to_symlink at debian/*.postinst --- debian/changelog | 1 + debian/libxbase64-1.postinst | 11 ++--------- debian/libxbase64-bin.postinst | 10 +--------- debian/libxbase64-dev.postinst | 10 +--------- debian/rules | 4 ++-- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d3d39f..5bb7a3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xbase64 (3.1.2-7) unstable; urgency=low * debian/control: - Change Vcs-* to secure uri. - Bump Standards-Version to 3.9.7 (no changes required). + * Use dpkg-maintscript-helper dir_to_symlink at debian/*.postinst -- Jörg Frings-Fürst Sat, 23 Jan 2016 07:55:36 +0100 diff --git a/debian/libxbase64-1.postinst b/debian/libxbase64-1.postinst index fe67044..4ad8b6a 100644 --- a/debian/libxbase64-1.postinst +++ b/debian/libxbase64-1.postinst @@ -24,15 +24,8 @@ case "$1" in configure) # Replace documentation directory with symlink - if [ -d /usr/share/doc/libxbase64-1 ] && [ ! -L /usr/share/doc/libxbase64-1 ]; then - if rmdir /usr/share/doc/libxbase64-1 2>/dev/null; then - ln -sf libxbase64-doc /usr/share/doc/libxbase64-1 - else - echo "Remove nonempty doc directory to doc/libxbase64-1.bak" - mv /usr/share/doc/libxbase64-1 /usr/share/doc/libxbase64-1.bak - ln -sf libxbase64-doc /usr/share/doc/libxbase64-1 - fi - fi + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libxbase64-1 /usr/share/doc/libxbase64-doc 3.1.2-4 -- "$@" + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libxbase64-bin.postinst b/debian/libxbase64-bin.postinst index 1333ee4..d8dd482 100644 --- a/debian/libxbase64-bin.postinst +++ b/debian/libxbase64-bin.postinst @@ -24,15 +24,7 @@ case "$1" in configure) # Replace documentation directory with symlink - if [ -d /usr/share/doc/libxbase64-bin ] && [ ! -L /usr/share/doc/libxbase64-bin ]; then - if rmdir /usr/share/doc/libxbase64-bin 2>/dev/null; then - ln -sf libxbase64-doc /usr/share/doc/libxbase64-bin - else - echo "Remove nonempty doc directory to doc/libxbase64-bin.bak" - mv /usr/share/doc/libxbase64-bin /usr/share/doc/libxbase64-bin.bak - ln -sf libxbase64-doc /usr/share/doc/libxbase64-bin - fi - fi + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libxbase64-bin /usr/share/doc/libxbase64-doc 3.1.2-4 -- "$@" ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libxbase64-dev.postinst b/debian/libxbase64-dev.postinst index d684003..4b2aaf7 100644 --- a/debian/libxbase64-dev.postinst +++ b/debian/libxbase64-dev.postinst @@ -24,15 +24,7 @@ case "$1" in configure) # Replace documentation directory with symlink - if [ -d /usr/share/doc/libxbase64-dev ] && [ ! -L /usr/share/doc/libxbase64-dev ]; then - if rmdir /usr/share/doc/libxbase64-dev 2>/dev/null; then - ln -sf libxbase64-doc /usr/share/doc/libxbase64-dev - else - echo "Remove nonempty doc directory to doc/libxbase64-1.bak" - mv /usr/share/doc/libxbase64-dev /usr/share/doc/libxbase64-dev.bak - ln -sf libxbase64-doc /usr/share/doc/libxbase64-dev - fi - fi + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libxbase64-dev /usr/share/doc/libxbase64-doc 3.1.2-4 -- "$@" ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index c3cf9a2..c52f106 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,8 @@ endif # # Test for gcc-6 support # -export CC=gcc-6 -export CXX=g++-6 +#export CC=gcc-6 +#export CXX=g++-6 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -- cgit v1.2.3