From 0ca0b3131872ce0a4e179839676e3fe7271ec565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 2 Oct 2014 07:47:57 +0200 Subject: changes at dpkg-maintscript-helper, typo at d/copyright --- debian/argyll-dbg.postinst | 4 ++-- debian/argyll-dbg.postrm | 2 +- debian/argyll-dbg.preinst | 2 +- debian/argyll-ref.postinst | 4 ++-- debian/argyll-ref.postrm | 2 +- debian/argyll-ref.preinst | 2 +- debian/argyll.postinst | 4 ++-- debian/argyll.postrm | 7 ++----- debian/argyll.preinst | 2 +- debian/copyright | 8 ++------ debian/icc-utils.postinst | 17 +++-------------- debian/rules | 3 --- 12 files changed, 18 insertions(+), 39 deletions(-) diff --git a/debian/argyll-dbg.postinst b/debian/argyll-dbg.postinst index a0b1290..d9dd8ae 100644 --- a/debian/argyll-dbg.postinst +++ b/debian/argyll-dbg.postinst @@ -23,8 +23,8 @@ set -e case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) - # Replace documentation directory with symlink - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg argyll-doc -- "$@" + # Replace documentation directory symlink + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) diff --git a/debian/argyll-dbg.postrm b/debian/argyll-dbg.postrm index 05092d4..a6fa1f4 100644 --- a/debian/argyll-dbg.postrm +++ b/debian/argyll-dbg.postrm @@ -18,7 +18,7 @@ set -e case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) diff --git a/debian/argyll-dbg.preinst b/debian/argyll-dbg.preinst index 0ddb750..d19bb59 100644 --- a/debian/argyll-dbg.preinst +++ b/debian/argyll-dbg.preinst @@ -15,7 +15,7 @@ set -e case "$1" in install|upgrade|abort-upgrade) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/argyll-ref.postinst b/debian/argyll-ref.postinst index 983848c..55f5836 100644 --- a/debian/argyll-ref.postinst +++ b/debian/argyll-ref.postinst @@ -23,8 +23,8 @@ set -e case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) - # Replace documentation directory with symlink - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref argyll-doc -- "$@" + # Replace documentation directory symlink + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) diff --git a/debian/argyll-ref.postrm b/debian/argyll-ref.postrm index b40616f..c0e5142 100644 --- a/debian/argyll-ref.postrm +++ b/debian/argyll-ref.postrm @@ -18,7 +18,7 @@ set -e case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) diff --git a/debian/argyll-ref.preinst b/debian/argyll-ref.preinst index 282bd29..9466c1d 100644 --- a/debian/argyll-ref.preinst +++ b/debian/argyll-ref.preinst @@ -15,7 +15,7 @@ set -e case "$1" in install|upgrade|abort-upgrade) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/argyll.postinst b/debian/argyll.postinst index 5c583c2..c25ef8c 100644 --- a/debian/argyll.postinst +++ b/debian/argyll.postinst @@ -23,8 +23,8 @@ set -e case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) - # Replace documentation directory with symlink - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" + # Replace documentation directory symlink + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) diff --git a/debian/argyll.postrm b/debian/argyll.postrm index ce6c548..2d57e5d 100644 --- a/debian/argyll.postrm +++ b/debian/argyll.postrm @@ -17,12 +17,9 @@ set -e # for details, see /usr/share/doc/packaging-manual/ case "$1" in - purge) + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) rm -rf /var/lib/argyll - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) diff --git a/debian/argyll.preinst b/debian/argyll.preinst index 126f48c..ddc8803 100644 --- a/debian/argyll.preinst +++ b/debian/argyll.preinst @@ -16,7 +16,7 @@ set -e case "$1" in install|upgrade|abort-upgrade) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/copyright b/debian/copyright index 8791edf..a378f6f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -198,8 +198,9 @@ License: GPL-2+ Files: ref/*.icm icc/*.icm -Copyright: 1996-2014 Graeme W. Gill +Copyright: Public domain License: public-domain + Public Domain. No Warranty, Use at own risk Files: debian/* Copyright: 2006-2008 Christian Marillat @@ -1036,8 +1037,3 @@ License: libjpeg "The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated. GIF(sm) is a Service Mark property of CompuServe Incorporated." - -License: public-domain - The files are written by Graeme W. Gill , - and is placed in the public domain. The author hereby disclaims - copyright to this source code. diff --git a/debian/icc-utils.postinst b/debian/icc-utils.postinst index 220a5a0..9b1f984 100644 --- a/debian/icc-utils.postinst +++ b/debian/icc-utils.postinst @@ -22,21 +22,10 @@ set -e case "$1" in - configure) - # Replace documentation directory with symlink - if [ -d /usr/share/doc/icc-utils ] && [ ! -L /usr/share/doc/icc-utils ]; then - if rmdir /usr/share/doc/icc-utils 2>/dev/null; then - ln -sf argyll-doc /usr/share/doc/iss-utils - else - echo "Remove nonempty doc directory to doc/icc-utils.bak" - mv /usr/share/doc/icc-utils /usr/share/doc/icc-utils.bak - ln -sf argyll-doc /usr/share/doc/icc-utils - fi - fi - ;; + configure|abort-upgrade|abort-remove|abort-deconfigure) + # Replace documentation directory symlink + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/icc-utils /usr/share/doc/argyll-doc 1.6.3-1~ -- "$@" - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 ;; *) diff --git a/debian/rules b/debian/rules index 106e173..c94abef 100755 --- a/debian/rules +++ b/debian/rules @@ -12,9 +12,6 @@ JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/ override_dh_auto_build: jam $(JAMCMDLINE) all -override_dh_auto_clean: - dh_auto_clean - override_dh_auto_install: jam $(JAMCMDLINE) dirs jam $(JAMCMDLINE) install -- cgit v1.2.3