summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:03:23 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:03:23 +0100
commit69aec3b712232e93600ecd741269fed1f90b412a (patch)
tree3d2197769dacc611bbea907a122bb9a2037975e2
parent9c5118ba93871235dcc7dbb02ed16ea00adb6dd7 (diff)
parentae5e9101c43fb0eef8979c6fa0169a861eee6beb (diff)
Merge branch 'release/1.9.2+repack-2'1.9.2+repack-2
-rw-r--r--debian/README.source18
-rw-r--r--debian/changelog23
-rw-r--r--debian/control20
-rw-r--r--debian/copyright2
-rw-r--r--debian/files1
-rw-r--r--debian/patches/0100_spelling.patch96
-rw-r--r--debian/patches/0130_openssl.patch19
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules11
9 files changed, 166 insertions, 25 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e4f2b3d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index 81d83d7..3860758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+argyll (1.9.2+repack-2) unstable; urgency=medium
+
+ * New README.source to explain the branching model used.
+ * Declare compliance with Debian Policy 4.0.1. (No changes needed).
+ * debian/copyright:
+ - Add 2017 to debian/*.
+ * debian/control:
+ - Remove dh-autoreconf.
+ + Not longer needed since debhelper compatibility level >= 10.
+ * debian/rules:
+ - For better handling replace dpkg-parsechangelog with SOURCE_DATE_EPOCH
+ from pkg-info.mk.
+ * New patch 0130_openssl.patch:
+ - Enable all ssl connections since openssl provides only connetions with
+ TLS1.2 or greater (Closes: #871427).
+ * Use the automatic debug symbol packages:
+ - Remove argyll-dbg section from debian/control.
+ - Use --dbgsym-migration at override_dh_strip from debian/rules.
+ * Refresh patches:
+ - 0100_spelling.patch.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 31 Aug 2017 06:49:06 +0200
+
argyll (1.9.2+repack-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 0fea387..407baf4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,14 @@ Source: argyll
Section: graphics
Priority: optional
Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Standards-Version: 3.9.8
+Standards-Version: 4.0.1
Build-Depends:
debhelper (>= 10),
- dh-autoreconf,
dpkg-dev (>= 1.17.0),
jam,
libjpeg-dev,
- libssl-dev,
libpng-dev,
+ libssl-dev,
libtiff5-dev,
libtool,
libusb-1.0-0-dev,
@@ -47,21 +46,6 @@ Description: Color Management System, calibrator and profiler
fast, fully accurate 16 bit conversion. Device color gamuts can also be
viewed and compared using a VRML viewer.
-Package: argyll-dbg
-Section: debug
-Priority: extra
-Architecture: linux-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
- printers, film recorders and calibration and profiling of displays.
- .
- This package contains the debugging symbols for argyll, libicc and libimdi
- libraries
-
Package: argyll-ref
Architecture: all
Priority: extra
diff --git a/debian/copyright b/debian/copyright
index 41649e1..3dd2dcb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -147,7 +147,7 @@ License: public-domain
Files: debian/*
Copyright: 2006-2008 Christian Marillat <marillat@debian.org>
2008-2010 Roland Mas <lolando@debian.org>
- 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
License: GPL-3+
License: AGPL-3
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..f651ec4
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+argyll_1.9.2+repack-2_source.buildinfo graphics optional
diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch
index f0d1f25..c65916b 100644
--- a/debian/patches/0100_spelling.patch
+++ b/debian/patches/0100_spelling.patch
@@ -1,6 +1,6 @@
Description: correct some typos
Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2016-10-11
+Last-Update: 2017-08-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/spectro/dispcal.c
@@ -269,6 +269,15 @@ Index: trunk/spectro/i1pro_imp.c
/* Compute overall delay */
dispmsec = (int)(samp[i].sec * 1000.0 + 0.5); /* Display update time */
+@@ -3153,7 +3153,7 @@ i1pro_code i1pro_imp_measure(
+ }
+ }
+
+- a1logd(p->log,3,"i1pro_imp_measure sucessful return\n");
++ a1logd(p->log,3,"i1pro_imp_measure successful return\n");
+ if (user_trig)
+ return I1PRO_USER_TRIG;
+ return ev;
@@ -3815,7 +3815,7 @@ i1pro_code i1pro_imp_meas_refrate(
}
}
@@ -296,6 +305,15 @@ Index: trunk/spectro/i1pro_imp.c
s->cal_valid = 1;
s->cfdate = m->caldate;
+@@ -4310,7 +4310,7 @@ i1pro_code i1pro_save_calibration(i1pro
+ write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1);
+ }
+
+- a1logd(p->log,3,"nbytes = %d, Checkum = 0x%x\n",x.nbytes,x.chsum);
++ a1logd(p->log,3,"nbytes = %d, Checksum = 0x%x\n",x.nbytes,x.chsum);
+ write_ints(&x, fp, (int *)&x.chsum, 1);
+
+ if (fclose(fp) != 0)
Index: trunk/spectro/madvrwin.c
===================================================================
--- trunk.orig/spectro/madvrwin.c
@@ -445,6 +463,15 @@ Index: trunk/spectro/munki_imp.c
/* Compute overall delay and subtract patch change delay */
dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);
+@@ -2385,7 +2385,7 @@ munki_code munki_imp_measure(
+ if (nvals > 0)
+ vals[0].duration = duration; /* Possible flash duration */
+
+- a1logd(p->log,3,"munki_imp_measure sucessful return\n");
++ a1logd(p->log,3,"munki_imp_measure successful return\n");
+ if (user_trig)
+ return MUNKI_USER_TRIG;
+ return ev;
@@ -3046,7 +3046,7 @@ munki_code munki_imp_meas_refrate(
}
}
@@ -454,6 +481,15 @@ Index: trunk/spectro/munki_imp.c
}
return MUNKI_RD_NOREFR_FOUND;
+@@ -3260,7 +3260,7 @@ munki_code munki_save_calibration(munki
+ write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1);
+ }
+
+- a1logd(p->log,3,"Checkum = 0x%x\n",x.chsum);
++ a1logd(p->log,3,"Checksum = 0x%x\n",x.chsum);
+ write_ints(&x, fp, (int *)&x.chsum, 1);
+
+ if (fclose(fp) != 0)
@@ -6425,7 +6425,7 @@ munki_code munki_create_hr(munki *p, int
int i, j, jj, k, cx, sx;
munki_fc coeff[40][16]; /* Existing filter cooefficients */
@@ -954,6 +990,24 @@ Index: trunk/spectro/ex1.c
return inst_ok;
}
+@@ -929,7 +929,7 @@ ex1_interp_native_error(ex1 *p, int ec)
+ case EX1_FLASH_MAP:
+ return "Flash map is incompatible with firmware";
+ case EX1_DEFERRED:
+- return "Operation/Response deffered";
++ return "Operation/Response deferred";
+ default:
+ return NULL;
+ }
+@@ -1279,7 +1279,7 @@ static int ex1_save_calibration(ex1 *p)
+ calf_wrspec(&x, p->sconf.idark[0]);
+ calf_wrspec(&x, p->sconf.idark[1]);
+
+- a1logd(p->log,3,"nbytes = %d, Checkum = 0x%x\n",x.nbytes,x.chsum);
++ a1logd(p->log,3,"nbytes = %d, Checksum = 0x%x\n",x.nbytes,x.chsum);
+ calf_wints(&x, (int *)(&x.chsum), 1);
+
+ if (calf_done(&x))
@@ -1466,7 +1466,7 @@ static void dump_command(ex1 *p, ORD8 *b
if (flags & EX1_FLAG_NACK)
a1logd(p->log, 0, " Negative acknowldgement response\n");
@@ -1066,6 +1120,15 @@ Index: trunk/icc/icc.c
/* ArgyllCMS private tag: */
case icmSigAbsToRelTransSpace:
+@@ -5773,7 +5773,7 @@ int icmSetMultiLutTables(
+ return icp->errc = 1;
+ }
+ if (pp[tn]->ttype != p->ttype) {
+- sprintf(icp->err,"icmSetMultiLutTables Tables have different Tage Type");
++ sprintf(icp->err,"icmSetMultiLutTables Tables have different Tag Type");
+ return icp->errc = 1;
+ }
+
Index: trunk/gamut/isecvol.c
===================================================================
--- trunk.orig/gamut/isecvol.c
@@ -1315,6 +1378,15 @@ Index: trunk/target/ofps.c
}
#ifdef DUMP_STRUCTURE
dump_node_vtxs(s, 1);
+@@ -8443,7 +8443,7 @@ int nopstop /* Debug - number of opti
+ fprintf(stderr,"Average dnsqs/position = %.2f\n",s->dnsqs/(double)s->positions);
+ fprintf(stderr,"Average function calls/dnsq = %.1f\n",s->funccount/(double)s->dnsqs);
+ fprintf(stderr,"Maximum function calls/dnsq = %d\n",s->maxfunc);
+- fprintf(stderr,"Average function calls/sucessful dnsq = %.2f\n",s->sucfunc/(double)s->sucdnsq);
++ fprintf(stderr,"Average function calls/successful dnsq = %.2f\n",s->sucfunc/(double)s->sucdnsq);
+ fprintf(stderr,"Average function calls/position = %.1f\n",s->funccount/(double)s->positions);
+ fprintf(stderr,"Maximum tries for dnsq sucess %d\n",s->maxretries);
+ fprintf(stderr,"Number of position_vtx failures %d\n",s->posfails);
Index: trunk/spectro/synthread.c
===================================================================
--- trunk.orig/spectro/synthread.c
@@ -1390,6 +1462,15 @@ Index: trunk/spectro/smcube.c
icmLab2XYZ(&icmD50_100, p->XYZ, p->XYZ);
+@@ -2065,7 +2065,7 @@ int static smcube_save_calibration(smcub
+ calf_wtime_ts(&x, &p->gdate, 1);
+ calf_wdoubles(&x, p->goff, 3);
+
+- a1logd(p->log,3,"nbytes = %d, Checkum = 0x%x\n",x.nbytes,x.chsum);
++ a1logd(p->log,3,"nbytes = %d, Checksum = 0x%x\n",x.nbytes,x.chsum);
+ calf_wints(&x, (int *)(&x.chsum), 1);
+
+ if (calf_done(&x))
Index: trunk/spectro/kleink10.c
===================================================================
--- trunk.orig/spectro/kleink10.c
@@ -1616,3 +1697,16 @@ Index: trunk/spectro/illumread.c
continue;
}
if ((rv = it->get_set_opt(it, trigmode)) != inst_ok) {
+Index: trunk/profile/mppprof.c
+===================================================================
+--- trunk.orig/profile/mppprof.c
++++ trunk/profile/mppprof.c
+@@ -582,7 +582,7 @@ make_output_mpp(
+
+ /* Estimate the ink mixing model */
+ if (omix) {
+- printf("The ink mixing model isn't implimented here yet\n");
++ printf("The ink mixing model isn't implemented here yet\n");
+ }
+
+ /* create and write the cgats profile */
diff --git a/debian/patches/0130_openssl.patch b/debian/patches/0130_openssl.patch
new file mode 100644
index 0000000..b938ddc
--- /dev/null
+++ b/debian/patches/0130_openssl.patch
@@ -0,0 +1,19 @@
+Description: Enable all ssl connections
+Author: Jörg Frings-Fürst
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871427
+Last-Update: 2017-08-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/ccast/ccpacket.c
+===================================================================
+--- trunk.orig/ccast/ccpacket.c
++++ trunk/ccast/ccpacket.c
+@@ -157,7 +157,7 @@ static ccpacket_err connect_ccpacket_imp
+ if ((p->ctx = ssl_ctx_new(SSL_SERVER_VERIFY_LATER, 1)) == NULL)
+ #else
+ // Want to use TLS_client_method(), but older OpenSSL doesn't have it...
+- if ((p->ctx = SSL_CTX_new(TLSv1_client_method())) == NULL)
++ if ((p->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
+ #endif
+ {
+ DBG((g_log,0, "connect ssl_ctx_new failed\n"))
diff --git a/debian/patches/series b/debian/patches/series
index c9ba163..47582dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
#0110_usb-db_new.patch
#0120_kfreebsd.patch
0125_gcc5.patch
+0130_openssl.patch
diff --git a/debian/rules b/debian/rules
index 8cd2669..fe01084 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpkg/pkg-info.mk
+
export DH_OPTIONS
# hardening
@@ -11,8 +13,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
NO_PROC=$(shell cat /proc/cpuinfo | grep processor | wc -l)
JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref
-CHDATE=$(shell dpkg-parsechangelog -S Date)
-CRDATE=$(shell LC_ALL=C date --utc -d "$(CHDATE)" "+%a %b %d %T %Y")
+CRDATE=$(shell LC_ALL=C date --utc --date='@$(SOURCE_DATE_EPOCH)' "+%a %b %d %T %Y")
%:
dh $@
@@ -43,15 +44,15 @@ override_dh_installdocs:
override_dh_installchangelogs:
dh_installchangelogs log.txt
-override_dh_strip:
- dh_strip --dbg-package=argyll-dbg
-
override_dh_builddeb:
dh_builddeb
override_dh_compress:
dh_compress -X.html
+override_dh_strip:
+ dh_strip --dbgsym-migration='argyll-dbg (<< 1.9.2+repack-2~)'
+
build-manpages:
help2man -N --no-discard-stderr --name="Apply device calibration to an ICC profile." debian/tmp/usr/bin/applycal > debian/man/applycal.1
help2man -N --no-discard-stderr --name="Dump an ICC file in human readable form." debian/tmp/usr/bin/iccdump > debian/man/iccdump.1