Your message dated Fri, 02 Aug 2013 06:33:14 +0000
with message-id <[email protected]>
and subject line Bug#544223: fixed in argyll 1.5.1-3
has caused the Debian Bug report #544223,
regarding argyll uses embedded yajl
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
544223: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544223
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: argyll
Version: 1.0.4-1
Severity: normal
Tags: patch
Argyll embeds an old version of yajl (0.3.0) in its source code. Now
that yajl is in Debian, I'm attaching a patch that lets it compile
against the system yajl instead.
Note: Argyll modified yajl's API so argyll's jcnf can save comments.
But from what I can see, ucmm/ucmm.c is the only file that uses jcnf,
and it doesn't take advantage of that feature. So even though the patch
comments out a bit of argyll's code, it shouldn't affect its
functionality.
Regards,
John Stamp
--- a/jcnf/Makefile.am
+++ b/jcnf/Makefile.am
@@ -2,15 +2,13 @@
include $(top_srcdir)/Makefile.shared
-SUBDIRS = yajl
-
privatelib_LTLIBRARIES = libjcnf.la
privatelibdir = $(pkglibdir)
libjcnf_la_SOURCES = jcnf.h jcnf.c
-libjcnf_la_LIBADD = yajl/libyajl.la
+libjcnf_la_LIBADD = -lyajl
-LDADD = ./libjcnf.la yajl/libyajl.la
+LDADD = ./libjcnf.la -lyajl
check_PROGRAMS = test
--- a/jcnf/jcnf.c
+++ b/jcnf/jcnf.c
@@ -42,9 +42,9 @@
#include <string.h>
#include <math.h>
-#include "yajl/yajl_common.h"
-#include "yajl/yajl_gen.h"
-#include "yajl/yajl_parse.h"
+#include <yajl/yajl_common.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_parse.h>
#include "jcnf.h"
@@ -955,9 +955,10 @@
}
}
+ /*
if (p->keys[i]->comment != NULL) {
yajl_gen_cpp_comment(g, p->keys[i]->comment, strlen(p->keys[i]->comment));
- }
+ }*/
#ifdef NEVER
yajl_gen_map_open(g);
--- a/spectro/Makefile.am
+++ b/spectro/Makefile.am
@@ -22,10 +22,10 @@
../numlib/libargyllnum.la ./libinst.la ../libargyll.la
LDADD = ./libinsttypes.la ./libdisp.la ./libinst.la ../ucmm/libucmm.la \
- ../jcnf/libjcnf.la ../jcnf/yajl/libyajl.la ../xicc/libxicc.la \
+ ../jcnf/libjcnf.la ../xicc/libxicc.la \
../xicc/libxcolorants.la $(ICC_LIBS) ../cgats/libcgats.la \
../rspl/librspl.la ../gamut/libgamut.la ../target/libtarget.la \
- ../plot/libplot.la ../numlib/libargyllnum.la $(X_LIBS) -lusb
+ ../plot/libplot.la ../numlib/libargyllnum.la $(X_LIBS) -lusb -lyajl
bin_PROGRAMS = synthcal dispwin dispread dispcal fakeread synthread \
chartread spotread spec2cie average spyd2en
--- End Message ---
--- Begin Message ---
Source: argyll
Source-Version: 1.5.1-3
We believe that the bug you reported is fixed in the latest version of
argyll, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christian Marillat <[email protected]> (supplier of updated argyll package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Fri, 02 Aug 2013 08:10:38 +0200
Source: argyll
Binary: argyll argyll-dbg icc-utils libicc-dev libicc2 libimdi-dev libimdi0
Architecture: source i386
Version: 1.5.1-3
Distribution: unstable
Urgency: low
Maintainer: Christian Marillat <[email protected]>
Changed-By: Christian Marillat <[email protected]>
Description:
argyll - Color Management System, calibrator and profiler
argyll-dbg - debugging symbols for argyll
icc-utils - ICC profile I/O library
libicc-dev - Development files for the ICC profile I/O library
libicc2 - ICC profile I/O library
libimdi-dev - Development files for the IMDI library
libimdi0 - Integer Multi-Dimensional Interpolation routines (IMDI) library
Closes: 544223
Changes:
argyll (1.5.1-3) unstable; urgency=low
.
* Uptade patch 01_autotools-support with patch from bug report to link
argyll against external yajl also add an one line patch called
05_external-yajl (Closes: #544223)
Checksums-Sha1:
e9e76434e671ababb40899fc01f199f30e465a35 1617 argyll_1.5.1-3.dsc
8eb233a8ec2ff3bced9c2a69b70ffb38bf267161 336207 argyll_1.5.1-3.debian.tar.gz
03e6e8a152a13c7ffe5678f3074173ef1e9d17b7 167904
libicc2_2.12+argyll1.5.1-3_i386.deb
21ecdff0216cb93bf396c174e24cb0898b9ef9b2 193862
libicc-dev_2.12+argyll1.5.1-3_i386.deb
c50d742c32adec0b92f03cbe1c07511f4467cc1b 4309724 argyll_1.5.1-3_i386.deb
f4c61ef2d91d85fc3cedbaa52adb2c56ab6c6233 5241628 argyll-dbg_1.5.1-3_i386.deb
151401c439b81691fe6f5c04f22a5ae35cadd2b0 78774 icc-utils_1.5.1-3_i386.deb
d37a4de588852a64f0c069715c2a2936beaa5497 410758 libimdi-dev_1.5.1-3_i386.deb
a4bf54264c175ab643c10cc373971d4e42833d2a 437892 libimdi0_1.5.1-3_i386.deb
Checksums-Sha256:
b0ff394d3fe8a2804592304daeac2bb4b588d79ad794e8e44b8feef7083d68a8 1617
argyll_1.5.1-3.dsc
4e91b4e9ffac6cb2940535fe39ac34c8dd12e11f8b2655733c74cd535d08c5ab 336207
argyll_1.5.1-3.debian.tar.gz
eb56c67c0711d5a07cf275979db9b182c499a57c50da7db6b0a99368813f2d16 167904
libicc2_2.12+argyll1.5.1-3_i386.deb
56f707a8aa9291a4bd33248037dc9c4b224c3298cba0306f07497c066f13038a 193862
libicc-dev_2.12+argyll1.5.1-3_i386.deb
6c72aee5cd310b1063d90d43eaf0008a86ac1f2e79e72119935d5fee97958e24 4309724
argyll_1.5.1-3_i386.deb
da191d8c2ea5d4709dabad0346f1c2f8567e470a12a4566e490541a4360c8b38 5241628
argyll-dbg_1.5.1-3_i386.deb
a98e73c823f2bfa9facc6f7d245a88160727d69ce45e4c1c435fa041d7696063 78774
icc-utils_1.5.1-3_i386.deb
cf6f125906208b7ace592e698e65ec907d80f6a81850c6a8913c2fd9efc05b38 410758
libimdi-dev_1.5.1-3_i386.deb
abc07385b4720312e007cfddac1aa52e8cdf49eaf8df53c25953447c8c80f875 437892
libimdi0_1.5.1-3_i386.deb
Files:
ec8de9c3da1d0363640cbb90f45b165d 1617 graphics optional argyll_1.5.1-3.dsc
80b71caece27caeea0f30c9861a9c392 336207 graphics optional
argyll_1.5.1-3.debian.tar.gz
24d7150d2fa0e965fa7cd93664073022 167904 libs optional
libicc2_2.12+argyll1.5.1-3_i386.deb
6bc42d5f330b6e9cd91034dae0254573 193862 libdevel optional
libicc-dev_2.12+argyll1.5.1-3_i386.deb
3aeadbffdb1ca230d93a1212f30cfc9b 4309724 graphics optional
argyll_1.5.1-3_i386.deb
96f0b91c9da3ae9926185eea2cfee922 5241628 debug extra
argyll-dbg_1.5.1-3_i386.deb
482d2f5502e8bc5e45094501f6e251c2 78774 graphics optional
icc-utils_1.5.1-3_i386.deb
cb461bcbadc5d7c5d605fc490f205343 410758 libdevel optional
libimdi-dev_1.5.1-3_i386.deb
861ff6571b11fb30035c74f63e8db5a3 437892 libs optional libimdi0_1.5.1-3_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iD8DBQFR+1AQB9xWPR9BuQcRAliuAJ9SDW/WJg0smZCxEnl1emfmSMLQLACfeRbo
vHEyp9u4Z578olob2tq7Jds=
=He80
-----END PGP SIGNATURE-----
--- End Message ---
