diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/argyll.lintian-overrides | 7 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/copyright | 183 | ||||
| -rw-r--r-- | debian/man/ls2ti3.1 | 13 | ||||
| -rw-r--r-- | debian/patches/110_dispwin_segfault.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 1 |
8 files changed, 131 insertions, 92 deletions
diff --git a/debian/argyll.lintian-overrides b/debian/argyll.lintian-overrides new file mode 100644 index 0000000..3dd90a3 --- /dev/null +++ b/debian/argyll.lintian-overrides @@ -0,0 +1,7 @@ +# +# false positive. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782902 +# +spelling-error-in-binary usr/bin/dispcal tEH the +spelling-error-in-binary usr/bin/ccxxmake tEH the +spelling-error-in-binary usr/bin/dispread tEH the +spelling-error-in-binary usr/bin/dispwin tEH the diff --git a/debian/changelog b/debian/changelog index 979d859..7d74005 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ argyll (1.7.0-1) UNRELEASED; urgency=medium * debian/control: - - For future use in kfreebsd-* add libusbhid-dev [kfreebsd-any] to - Build-Depends. + - Add libpng12-dev to build-Depends. + - Change Architecture from linux-any to any, because + KFreeBSD* and hurd* are not longer available. * Make debian/man/scanin.1 more readable (LP: #1192368). * Make build results reproducible: - debian/rules: @@ -14,11 +15,16 @@ argyll (1.7.0-1) UNRELEASED; urgency=medium - get-orig-source: + Remove unwanted Windows binaries. + Remove unused sources: tiff, jpeg, zlib, png. + - Add ls2ti3 to build-manpages. - New override_dh_compress: + Don't compress html files. * debian/copyright: - Remove unused tags. + - Add new files. - Set year 2015. + * Remove patches: + - 120_usb-db_new.patch applied upstream. + - 20_hurd_PATH_MAX.patch & 25_kfreebsd.patch not more needed. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 01 May 2015 16:42:49 +0200 diff --git a/debian/control b/debian/control index f8b2f4d..6ab4b86 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Build-Depends: libtiff5-dev, libtool, libusb-dev, - libusbhid-dev [kfreebsd-any], libx11-dev, libxinerama-dev, libxrandr-dev, @@ -26,7 +25,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/argyll.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git Package: argyll -Architecture: linux-any +Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-ref Pre-Depends: dpkg (>= 1.17.5) @@ -50,7 +49,7 @@ Description: Color Management System, calibrator and profiler Package: argyll-dbg Section: debug -Architecture: linux-any +Architecture: any Depends: argyll (= ${binary:Version}), ${misc:Depends} Pre-Depends: dpkg (>= 1.17.5) diff --git a/debian/copyright b/debian/copyright index c035f45..c88e9e3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,14 +11,35 @@ Files: icc/* cgats/* jcnf/* ucmm/* -Copyright: 1995-2011 Graeme W. Gill <Graeme@argyllcms.com> +Copyright: 1995-2014 Graeme W. Gill <Graeme@argyllcms.com> License: Expat +Files: ccast/cast_channel.proto +Copyright: 2013 The Chromium Authors +License: BSD-3 + +Files: ccast/chan/protobuf-c.* +Copyright: 2008-2014 Dave Benson and the protobuf-c authors +License: BSD-2 + +Files: ccast/axTLS/os_int.h +Copyright: 2014 Graeme W. Gill +License: Expat + +Files: ccast/axTLS/*.c + ccast/axTLS/*.h +Copyright: 2007 Cameron Rich +License: BSD-3 + Files: icc/iccV42.h Copyright: 1994-1998 SunSoft, Inc 1994-2014 Graeme W. Gill <Graeme@argyllcms.com> License: Expat +Files: plot/x3dom.* +Copyright: 2009 Fraunhofer IGD, Darmstadt, Germany +License: MIT and GPL-3+ + Files: yajl/yajl_tree.* Copyright: 2010-2011 Florian Forster <ff@octo.it> License: BSD-3 @@ -55,7 +76,7 @@ Copyright: 1998-2010 Marti Maria Saguer License: Expat Files: spectro/* -Copyright: 1996-2011 Graeme W. Gill <Graeme@argyllcms.com> +Copyright: 1996-2014 Graeme W. Gill <Graeme@argyllcms.com> License: GPL-2+ Files: spectro/dispcal.c @@ -109,6 +130,14 @@ Files: rspl/rspl1.* Copyright: 1996-2010 Graeme W. Gill <Graeme@argyllcms.com> License: GPL-2+ +Files: xml/install-sh +Copyright: 1991 Massachusetts Institute of Technology +License: MIT + +Files: xml/* +Copyright: 2003-2011 Michael R Sweet +License: LGPL-2+ + Files: ref/*.icm icc/*.icm Copyright: Public domain @@ -784,6 +813,31 @@ License: AGPL-3 For more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>. +License: BSD-2 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License: BSD-3 All rights reserved. . @@ -833,27 +887,6 @@ License: GFDL-1.3+ On Debian systems, the complete text of the GNU Free Documentation License version 1.3 can be found in "/usr/share/common-licenses/GFDL-1.3". -License: GPL-1 - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 1 of the License. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 1 can be found in the file - `/usr/share/common-licenses/GPL-1'. - License: GPL-2+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -888,65 +921,45 @@ License: GPL-3+ On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -License: libjpeg - The authors make NO WARRANTY or representation, either express or implied, - with respect to this software, its quality, accuracy, merchantability, or - fitness for a particular purpose. This software is provided "AS IS", and you, - its user, assume the entire risk as to its quality and accuracy. - . - This software is copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding. - All Rights Reserved except as specified below. - . - Permission is hereby granted to use, copy, modify, and distribute this - software (or portions thereof) for any purpose, without fee, subject to these - conditions: - (1) If any part of the source code for this software is distributed, then this - README file must be included, with this copyright and no-warranty notice - unaltered; and any additions, deletions, or changes to the original files - must be clearly indicated in accompanying documentation. - (2) If only executable code is distributed, then the accompanying - documentation must state that "this software is based in part on the work of - the Independent JPEG Group". - (3) Permission for use of this software is granted only if the user accepts - full responsibility for any undesirable consequences; the authors accept - NO LIABILITY for damages of any kind. - . - These conditions apply to any software derived from or based on the IJG code, - not just to the unmodified library. If you use our work, you ought to - acknowledge us. - . - Permission is NOT granted for the use of any IJG author's name or company name - in advertising or publicity relating to this software or products derived from - it. This software may be referred to only as "the Independent JPEG Group's - software". - . - We specifically permit and encourage the use of this software as the basis of - commercial products, provided that all warranty or liability claims are - assumed by the product vendor. - . - ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, - sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. - ansi2knr.c is NOT covered by the above copyright and conditions, but instead - by the usual distribution terms of the Free Software Foundation; principally, - that you must include source code if you redistribute it. (See the file - ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part - of any program generated from the IJG code, this does not limit you more than - the foregoing paragraphs do. - . - The Unix configuration script "configure" was produced with GNU Autoconf. - It is copyright by the Free Software Foundation but is freely distributable. - The same holds for its supporting scripts (config.guess, config.sub, - ltmain.sh). Another support script, install-sh, is copyright by X Consortium - but is also freely distributable. - . - The IJG distribution formerly included code to read and write GIF files. - To avoid entanglement with the Unisys LZW patent, GIF reading support has - been removed altogether, and the GIF writer has been simplified to produce - "uncompressed GIFs". This technique does not use the LZW algorithm; the - resulting GIF files are larger than usual, but are readable by all standard - GIF decoders. - . - We are required to state that - "The Graphics Interchange Format(c) is the Copyright property of - CompuServe Incorporated. GIF(sm) is a Service Mark property of - CompuServe Incorporated." +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Library General Public License + version 2 can be found in "/usr/share/common-licenses/LGPL-2". + +License: MIT + All rights reserved. No part of this source code may be reproduced, + stored in a retrieval system, or transmitted, in any form or by any + means, electronic, mechanical, photocopying, recording or otherwise, + except as stated in the end-user licence agreement, without the prior + permission of the copyright owners. + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of OSF, UI or X/Open not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. OSF, UI and X/Open make + no representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + . + OSF, UI and X/Open DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL OSF, UI or X/Open BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. diff --git a/debian/man/ls2ti3.1 b/debian/man/ls2ti3.1 new file mode 100644 index 0000000..d7c7315 --- /dev/null +++ b/debian/man/ls2ti3.1 @@ -0,0 +1,13 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6. +.TH CONVERT "1" "May 2015" "Convert LightSpace raw RGB device profile data to Argyll CGATS data, Version 1.7.0" "User Commands" +.SH NAME +Convert \- Convert LightSpace raw RGB device profile data to Argyll CGATS data +.SH DESCRIPTION +Convert LightSpace raw RGB device profile data to Argyll CGATS data, Version 1.7.0 +Author: Graeme W. Gill, licensed under the AGPL Version 3 +.TP +infile +Input LightSpace .bcs file +.TP +outbasename +Output file basename for .ti3 diff --git a/debian/patches/110_dispwin_segfault.patch b/debian/patches/110_dispwin_segfault.patch index 1e65a0d..a18602b 100644 --- a/debian/patches/110_dispwin_segfault.patch +++ b/debian/patches/110_dispwin_segfault.patch @@ -14,7 +14,7 @@ Index: trunk/spectro/dispwin.c /* Display number */ else if (argv[fa][1] == 'd') { -+ if(na == NULL) usage("-d parameter missing"); ++ if(na == NULL) usage(0, "-d parameter missing"); if (strncmp(na,"web",3) == 0 || strncmp(na,"WEB",3) == 0) { webdisp = 8080; diff --git a/debian/patches/series b/debian/patches/series index 5ac0fd1..3e71aa7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -#110_dispwin_segfault.patch +110_dispwin_segfault.patch 100_spelling.patch 15_jam.patch #20_hurd_PATH_MAX.patch diff --git a/debian/rules b/debian/rules index bf38bd6..7522cf3 100755 --- a/debian/rules +++ b/debian/rules @@ -93,6 +93,7 @@ build-manpages: help2man -N --no-discard-stderr --name="Convert Gretag/Logo or X-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data." debian/tmp/usr/bin/txt2ti3 > debian/man/txt2ti3.1 help2man -N --no-discard-stderr --name="View gamuts." debian/tmp/usr/bin/viewgam > debian/man/viewgam.1 help2man -N --no-discard-stderr --name="Translate colors through an xicc." debian/tmp/usr/bin/xicclu > debian/man/xicclu.1 + help2man -N --no-discard-stderr --name="Convert LightSpace raw RGB device profile data to Argyll CGATS dat" debian/tmp/usr/bin/ls2ti3 > debian/man/ls2ti3.1 VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') |