summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/argyll-dbg.postinst52
-rw-r--r--debian/argyll.postinst52
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rw-r--r--debian/icc-utils.postinst52
-rw-r--r--debian/patches/110_dispwin_segfault.patch4
6 files changed, 165 insertions, 4 deletions
diff --git a/debian/argyll-dbg.postinst b/debian/argyll-dbg.postinst
new file mode 100644
index 0000000..88e56e4
--- /dev/null
+++ b/debian/argyll-dbg.postinst
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# 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)
+ # 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
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+#DEBHELPER#
+
+
+exit 0
diff --git a/debian/argyll.postinst b/debian/argyll.postinst
new file mode 100644
index 0000000..d32fab9
--- /dev/null
+++ b/debian/argyll.postinst
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# 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)
+ # 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
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+#DEBHELPER#
+
+
+exit 0
diff --git a/debian/changelog b/debian/changelog
index 38f8b08..ae7a0d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ argyll (1.6.3-1) unstable; urgency=medium
Useless. Only linked to argyll & icc-utils.
+ libimdi0 & libimdi-dev
Useless. Only linked to argyll & icc-utils.
+ - Move documentation to new package argyll-doc
+ and symlink into the other packages.
* debian/copyright:
- Rewrite into DEP-5 format.
- Add myself to the list of authors for debian/*.
@@ -42,8 +44,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:
+ - Remove existing doc directory and replace it with
+ a symlink to argyll-doc.
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 14 Sep 2014 13:51:13 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 14 Sep 2014 18:35:54 +0200
argyll (1.5.1-8) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c502610..30991ee 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git
Package: argyll
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-ref
+Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-doc, argyll-ref
Replaces: argyll-bin
Recommends: libpam-systemd [linux-any], udev (>= 196) [linux-any]
Suggests: colord, gir1.2-colordgtk-1.0
diff --git a/debian/icc-utils.postinst b/debian/icc-utils.postinst
new file mode 100644
index 0000000..220a5a0
--- /dev/null
+++ b/debian/icc-utils.postinst
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# 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)
+ # 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
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ exit 0
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+#DEBHELPER#
+
+
+exit 0
diff --git a/debian/patches/110_dispwin_segfault.patch b/debian/patches/110_dispwin_segfault.patch
index e08e924..62c40ff 100644
--- a/debian/patches/110_dispwin_segfault.patch
+++ b/debian/patches/110_dispwin_segfault.patch
@@ -1,9 +1,9 @@
Description: Add check for NULL pointer
Author: Jörg Frings-Fürst <debian@jff-webhsoting.net>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700253
-Forwarded: Yes, to ML
+Forwarded: http://www.freelists.org/post/argyllcms/dispwin-bad-command-line-option-makes-dispwin-segfault
Reviewed-by:
-Last-Update: 2014-09-10
+Last-Update: 2014-09-14
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/spectro/dispwin.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:04:27 +0000