diff options
| -rw-r--r-- | debian/argyll.preinst | 29 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/copyright | 10 |
4 files changed, 23 insertions, 31 deletions
diff --git a/debian/argyll.preinst b/debian/argyll.preinst index 0c5c4a9..bd4b532 100644 --- a/debian/argyll.preinst +++ b/debian/argyll.preinst @@ -13,36 +13,9 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -# Remove a no-longer used conffile -rm_conffile() { - local PKGNAME="$1" - local CONFFILE="$2" - - [ -e "$CONFFILE" ] || return 0 - - local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" - local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ - sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi -} case "$1" in - install|upgrade) - if dpkg --compare-versions "$2" le "1.1.0-3"; then - rm_conffile argyll "/etc/udev/permissions.d/10-Argyll.permissions" - 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) + install|upgrade|abort-upgrade) dpkg-maintscript-helper dir_to_symlink /usr/share/doc/argyll argyll-doc -- "$@" ;; *) diff --git a/debian/changelog b/debian/changelog index a7adf1e..06c3576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,8 +49,11 @@ argyll (1.6.3-1) unstable; urgency=medium * New debian/*.(postinst|preinst|postrm): - Remove existing doc directory and replace it with a symlink to argyll-doc with dpkg-maintscript-helper dir_to_symlink. + * debian/argyll.preinst: + - Remove useless rm_conffile(). First version in Debian was 1.1.1-1, + rm_conffile was for version less equal 1.1.0-3. - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 16 Sep 2014 08:56:17 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 17 Sep 2014 08:47:26 +0200 argyll (1.5.1-8) unstable; urgency=medium diff --git a/debian/control b/debian/control index b3d0412..d21f905 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,6 @@ 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 @@ -28,6 +26,8 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git Package: argyll Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-doc, 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 @@ -50,6 +50,8 @@ Package: argyll-dbg Section: debug Architecture: any Depends: argyll (= ${binary:Version}), ${misc:Depends} +Pre-Depends: + dpkg (>= 1.17.5) Description: debugging symbols for argyll Argyll is an experimental, open source, ICC compatible color management system. It supports accurate ICC profile creation for scanners, CMYK @@ -61,6 +63,8 @@ Description: debugging symbols for argyll Package: argyll-ref Architecture: all Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: + dpkg (>= 1.17.5) Description: Color Management System, calibrator and profiler (data files) Argyll is an experimental, open source, ICC compatible color management system. It supports accurate ICC profile creation for scanners, CMYK @@ -72,6 +76,8 @@ Package: argyll-doc Architecture: all Section: doc Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: + dpkg (>= 1.17.5) Description: Color Management System, calibrator and profiler (documentation) Argyll is an experimental, open source, ICC compatible color management system. It supports accurate ICC profile creation for scanners, CMYK diff --git a/debian/copyright b/debian/copyright index 64ae48f..8791edf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -196,6 +196,11 @@ Files: rspl/rspl1.* Copyright: 1996-2010 Graeme W. Gill <Graeme@argyllcms.com> License: GPL-2+ +Files: ref/*.icm + icc/*.icm +Copyright: 1996-2014 Graeme W. Gill <Graeme@argyllcms.com> +License: public-domain + Files: debian/* Copyright: 2006-2008 Christian Marillat <marillat@debian.org> 2008-2010 Roland Mas <lolando@debian.org> @@ -1031,3 +1036,8 @@ 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 <Graeme@argyllcms.com>, + and is placed in the public domain. The author hereby disclaims + copyright to this source code. |