From 800110ad9681e31a87fa2742c53ee8ef2541658f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Sep 2014 22:19:12 +0200 Subject: Debian bug #762850, #762853 --- debian/argyll-dbg.postinst | 2 +- debian/argyll-dbg.postrm | 2 +- debian/argyll-dbg.preinst | 2 +- debian/argyll-ref.postinst | 2 +- debian/argyll-ref.postrm | 2 +- debian/argyll-ref.preinst | 2 +- debian/argyll.examples | 1 - debian/argyll.postinst | 2 +- debian/argyll.postrm | 4 ++-- debian/argyll.preinst | 2 +- debian/changelog | 9 +++++++-- debian/control | 4 ++-- debian/rules | 2 +- 13 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 debian/argyll.examples diff --git a/debian/argyll-dbg.postinst b/debian/argyll-dbg.postinst index 8618fb3..a0b1290 100644 --- a/debian/argyll-dbg.postinst +++ b/debian/argyll-dbg.postinst @@ -24,7 +24,7 @@ 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-dbg argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg argyll-doc -- "$@" ;; *) diff --git a/debian/argyll-dbg.postrm b/debian/argyll-dbg.postrm index e5f18a2..05092d4 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 dir_to_symlink /usr/share/doc/argyll-dbg argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg argyll-doc -- "$@" ;; *) diff --git a/debian/argyll-dbg.preinst b/debian/argyll-dbg.preinst index e2c4065..0ddb750 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 dir_to_symlink /usr/share/doc/argyll-dbg argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-dbg argyll-doc -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/argyll-ref.postinst b/debian/argyll-ref.postinst index 858bf74..983848c 100644 --- a/debian/argyll-ref.postinst +++ b/debian/argyll-ref.postinst @@ -24,7 +24,7 @@ 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 -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref argyll-doc -- "$@" ;; *) diff --git a/debian/argyll-ref.postrm b/debian/argyll-ref.postrm index 4399c0d..b40616f 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 dir_to_symlink /usr/share/doc/argyll-ref argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref argyll-doc -- "$@" ;; *) diff --git a/debian/argyll-ref.preinst b/debian/argyll-ref.preinst index 44f928b..282bd29 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 dir_to_symlink /usr/share/doc/argyll-ref argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll-ref argyll-doc -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/argyll.examples b/debian/argyll.examples deleted file mode 100644 index e6e5f44..0000000 --- a/debian/argyll.examples +++ /dev/null @@ -1 +0,0 @@ -#firmware-package-builder/spyder2.tar.gz diff --git a/debian/argyll.postinst b/debian/argyll.postinst index a750277..5c583c2 100644 --- a/debian/argyll.postinst +++ b/debian/argyll.postinst @@ -24,7 +24,7 @@ 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 argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" ;; *) diff --git a/debian/argyll.postrm b/debian/argyll.postrm index 75bfc37..ce6c548 100644 --- a/debian/argyll.postrm +++ b/debian/argyll.postrm @@ -19,10 +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 -- "$@" + dpkg-maintscript-helper symlink_to_dir /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 -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" ;; *) diff --git a/debian/argyll.preinst b/debian/argyll.preinst index bd4b532..126f48c 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 dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/argyll argyll-doc -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/changelog b/debian/changelog index e11383c..a3ec686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ argyll (1.6.3-2) unstable; urgency=medium Breaks (<< 1.6.3-1) to argyll-ref (Closes: #762780). - Change Achitecture from any to linux-any hurd-i386 to disable build on kfreebsd-* (Closes: #762773). + - At argyll move argyll-doc from Depends to Suggests (Closes: #762850). * debian/patches/15_jam.patch: - Add missing multiarch directories for libtiff and libjpeg (Closes: #762772). @@ -14,9 +15,13 @@ argyll (1.6.3-2) unstable; urgency=medium * debian/rules: - Remove the move of the html docs into a subdirectory (Closes: #762771). - Remove BUILTIN_TIFF=false from JAMCMDLINE to prevent - false negative tests for libtiff. + false negative tests for libtiff + - Remove "-A --link-doc=argyll-doc" from dh_installdocs (Closes: #762853). + * debian/*.(postinst|preinst|postrm): + - replace dpkg-maintscript-helper dir_to_symlink to sysmlink_to_dir. + * Remove useless debian/argyll.examples - -- Jörg Frings-Fürst Thu, 25 Sep 2014 12:49:49 +0200 + -- Jörg Frings-Fürst Thu, 25 Sep 2014 20:49:49 +0200 argyll (1.6.3-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 5646e6e..1b498b6 100644 --- a/debian/control +++ b/debian/control @@ -25,12 +25,12 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git Package: argyll Architecture: linux-any hurd-i386 -Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-doc, argyll-ref +Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-ref Pre-Depends: dpkg (>= 1.17.5) Replaces: argyll-bin Recommends: libpam-systemd [linux-any], udev (>= 196) [linux-any] -Suggests: colord, gir1.2-colordgtk-1.0 +Suggests: argyll-doc, colord, gir1.2-colordgtk-1.0 Conflicts: argyll-bin Description: Color Management System, calibrator and profiler Argyll is an experimental, open source, ICC compatible color management diff --git a/debian/rules b/debian/rules index 75954a3..4c9853a 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ override_dh_auto_install: rm $(CURDIR)/debian/tmp/usr/bin/License.txt override_dh_installdocs: - dh_installdocs -A --link-doc=argyll-doc + dh_installdocs rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License.txt rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License2.txt rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License3.txt -- cgit v1.2.3