From 047b5603c45a7788719b4083723d771384c48855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 16 Sep 2014 09:32:07 +0200 Subject: use dpkg-maintscript-helper dir_to_symlink for symlink doc dir --- debian/argyll-dbg.postinst | 16 ++-------------- debian/argyll-dbg.postrm | 33 +++++++++++++++++++++++++++++++++ debian/argyll-dbg.preinst | 31 +++++++++++++++++++++++++++++++ debian/argyll-ref.postinst | 40 ++++++++++++++++++++++++++++++++++++++++ debian/argyll-ref.postrm | 33 +++++++++++++++++++++++++++++++++ debian/argyll-ref.preinst | 31 +++++++++++++++++++++++++++++++ debian/argyll.postinst | 16 ++-------------- debian/argyll.postrm | 2 ++ debian/argyll.preinst | 2 ++ debian/changelog | 8 +++++--- debian/control | 2 ++ 11 files changed, 183 insertions(+), 31 deletions(-) create mode 100644 debian/argyll-dbg.postrm create mode 100644 debian/argyll-dbg.preinst create mode 100644 debian/argyll-ref.postinst create mode 100644 debian/argyll-ref.postrm create mode 100644 debian/argyll-ref.preinst (limited to 'debian') diff --git a/debian/argyll-dbg.postinst b/debian/argyll-dbg.postinst index 88e56e4..8618fb3 100644 --- a/debian/argyll-dbg.postinst +++ b/debian/argyll-dbg.postinst @@ -22,21 +22,9 @@ set -e case "$1" in - configure) + configure|abort-upgrade|abort-remove|abort-deconfigure) # Replace documentation directory with symlink - if [ -d /usr/share/doc/argyll-dbg ] && [ ! -L /usr/share/doc/argyll-dbg ]; then - if rmdir /usr/share/doc/argyll-dbg 2>/dev/null; then - ln -sf argyll-doc /usr/share/doc/argyll-dbg - else - echo "Remove nonempty doc directory to doc/argyll-dbg.bak" - mv /usr/share/doc/argyll-dbg /usr/share/doc/argyll-dbg.bak - ln -sf argyll-doc /usr/share/doc/argyll-dbg - fi - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll-dbg argyll-doc -- "$@" ;; *) diff --git a/debian/argyll-dbg.postrm b/debian/argyll-dbg.postrm new file mode 100644 index 0000000..e5f18a2 --- /dev/null +++ b/debian/argyll-dbg.postrm @@ -0,0 +1,33 @@ +#! /bin/sh +# postrm script for argyll +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll-dbg argyll-doc -- "$@" + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# diff --git a/debian/argyll-dbg.preinst b/debian/argyll-dbg.preinst new file mode 100644 index 0000000..e2c4065 --- /dev/null +++ b/debian/argyll-dbg.preinst @@ -0,0 +1,31 @@ +#!/bin/sh +# preinst script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + install|upgrade|abort-upgrade) + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll-dbg argyll-doc -- "$@" + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/argyll-ref.postinst b/debian/argyll-ref.postinst new file mode 100644 index 0000000..858bf74 --- /dev/null +++ b/debian/argyll-ref.postinst @@ -0,0 +1,40 @@ +#!/bin/sh +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# source debconf library +#. /usr/share/debconf/confmodule + + +case "$1" in + + configure|abort-upgrade|abort-remove|abort-deconfigure) + # Replace documentation directory with symlink + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll-ref argyll-doc -- "$@" + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + + +exit 0 diff --git a/debian/argyll-ref.postrm b/debian/argyll-ref.postrm new file mode 100644 index 0000000..4399c0d --- /dev/null +++ b/debian/argyll-ref.postrm @@ -0,0 +1,33 @@ +#! /bin/sh +# postrm script for argyll +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll-ref argyll-doc -- "$@" + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# diff --git a/debian/argyll-ref.preinst b/debian/argyll-ref.preinst new file mode 100644 index 0000000..44f928b --- /dev/null +++ b/debian/argyll-ref.preinst @@ -0,0 +1,31 @@ +#!/bin/sh +# preinst script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + install|upgrade|abort-upgrade) + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll-ref argyll-doc -- "$@" + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/argyll.postinst b/debian/argyll.postinst index d32fab9..a750277 100644 --- a/debian/argyll.postinst +++ b/debian/argyll.postinst @@ -22,21 +22,9 @@ set -e case "$1" in - configure) + configure|abort-upgrade|abort-remove|abort-deconfigure) # Replace documentation directory with symlink - if [ -d /usr/share/doc/argyll ] && [ ! -L /usr/share/doc/argyll ]; then - if rmdir /usr/share/doc/argyll 2>/dev/null; then - ln -sf argyll-doc /usr/share/doc/argyll - else - echo "Remove nonempty doc directory to doc/argyll.bak" - mv /usr/share/doc/argyll /usr/share/doc/argyll.bak - ln -sf argyll-doc /usr/share/doc/argyll - fi - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" ;; *) diff --git a/debian/argyll.postrm b/debian/argyll.postrm index 4a165ab..75bfc37 100644 --- a/debian/argyll.postrm +++ b/debian/argyll.postrm @@ -19,8 +19,10 @@ set -e case "$1" in purge) rm -rf /var/lib/argyll + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" ;; *) diff --git a/debian/argyll.preinst b/debian/argyll.preinst index 200ce8a..0c5c4a9 100644 --- a/debian/argyll.preinst +++ b/debian/argyll.preinst @@ -40,8 +40,10 @@ case "$1" in rm_conffile argyll "/etc/udev/rules.d/45-Argyll.rules" rm_conffile argyll "/etc/udev/rules.d/55-Argyll.rules" fi + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" ;; abort-upgrade) + dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/changelog b/debian/changelog index ae7a0d2..a7adf1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ argyll (1.6.3-1) unstable; urgency=medium Useless. Only linked to argyll & icc-utils. - Move documentation to new package argyll-doc and symlink into the other packages. + - Add Pre-Depends: + * dpkg (>= 1.17.5) for use of the dpkg-maintscript-helper. * debian/copyright: - Rewrite into DEP-5 format. - Add myself to the list of authors for debian/*. @@ -44,11 +46,11 @@ argyll (1.6.3-1) unstable; urgency=medium + 04_CVE-2012-4405.diff + 05_external-yajl.diff + 06_fix_udev_rule.patch - * New debian/argyll.postinst: + * New debian/*.(postinst|preinst|postrm): - Remove existing doc directory and replace it with - a symlink to argyll-doc. + a symlink to argyll-doc with dpkg-maintscript-helper dir_to_symlink. - -- Jörg Frings-Fürst Sun, 14 Sep 2014 18:35:54 +0200 + -- Jörg Frings-Fürst Tue, 16 Sep 2014 08:56:17 +0200 argyll (1.5.1-8) unstable; urgency=medium diff --git a/debian/control b/debian/control index 30991ee..b3d0412 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,8 @@ Build-Depends: libxxf86vm-dev, x11proto-scrnsaver-dev, x11proto-xf86vidmode-dev +Pre-Depends: + dpkg (>= 1.17.5) Homepage: http://www.argyllcms.com/ Vcs-Git: git://anonscm.debian.org/collab-maint/argyll.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git -- cgit v1.2.3