From d24476ffb1406d0f7f1651adf730c4945c50cfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 14:52:36 +0200 Subject: New README.source to explain the branching model used --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 7 +++++++ 2 files changed, 25 insertions(+) create mode 100644 debian/README.source 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/. + + +Many thanks. + + -- Jörg Frings-Fürst 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..38defba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +argyll (1.9.2+repack-2) UNRELEASED; urgency=medium + + * New README.source to explain the branching model used. + * + + -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 + argyll (1.9.2+repack-1) unstable; urgency=medium * New upstream release. -- cgit v1.2.3 From da57859e04ffc8576073ab2d60b0f72367a53cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 15:12:57 +0200 Subject: Declare compliance with Debian Policy 4.0.0; Remove libssl from build depends --- debian/changelog | 4 +++- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38defba..562f196 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * New README.source to explain the branching model used. - * + * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * debian/control: + - Remove libssl from build depends to use the upstream ssl implemantiton. -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 diff --git a/debian/control b/debian/control index 0fea387..1d7544d 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: argyll Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Build-Depends: debhelper (>= 10), dh-autoreconf, dpkg-dev (>= 1.17.0), jam, libjpeg-dev, - libssl-dev, +# libssl-dev, libpng-dev, libtiff5-dev, libtool, -- cgit v1.2.3 From 0327d87521bfe240de5a23ecb72eff55616b028b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 15:24:19 +0200 Subject: Remove B-D dh-autoreconf --- debian/changelog | 4 +++- debian/control | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 562f196..d41c53f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,9 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * New README.source to explain the branching model used. * Declare compliance with Debian Policy 4.0.0. (No changes needed). * debian/control: - - Remove libssl from build depends to use the upstream ssl implemantiton. + - Remove dh-autoreconf. + + Not longer needed since debhelper compatibility level > 10. + - Remove libssl-dev from build depends to use the upstream ssl implemantiton. -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 diff --git a/debian/control b/debian/control index 1d7544d..1c0a481 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,9 @@ Maintainer: Jörg Frings-Fürst Standards-Version: 4.0.0 Build-Depends: debhelper (>= 10), - dh-autoreconf, dpkg-dev (>= 1.17.0), jam, libjpeg-dev, -# libssl-dev, libpng-dev, libtiff5-dev, libtool, -- cgit v1.2.3 From b9e682f948795fbb3ebcd0275647e6e7c49afcdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 15:27:36 +0200 Subject: Use the automatic debug symbol packages --- debian/changelog | 3 +++ debian/control | 15 --------------- debian/rules | 3 --- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index d41c53f..af6e2a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium - Remove dh-autoreconf. + Not longer needed since debhelper compatibility level > 10. - Remove libssl-dev from build depends to use the upstream ssl implemantiton. + * Use the automatic debug symbol packages: + - Remove argyll-dbg section from debian/control. + - Remove override_dh_strip from debian/rules. -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 diff --git a/debian/control b/debian/control index 1c0a481..4c34a52 100644 --- a/debian/control +++ b/debian/control @@ -45,21 +45,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/rules b/debian/rules index 8cd2669..85ab4d3 100755 --- a/debian/rules +++ b/debian/rules @@ -43,9 +43,6 @@ override_dh_installdocs: override_dh_installchangelogs: dh_installchangelogs log.txt -override_dh_strip: - dh_strip --dbg-package=argyll-dbg - override_dh_builddeb: dh_builddeb -- cgit v1.2.3 From 6dd5a6134df0fb50cdeb5d1001c276b532a81438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 15:40:27 +0200 Subject: d/copyright: Add 2017 to debian/* --- debian/changelog | 6 +++++- debian/copyright | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index af6e2a0..434e592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,14 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * New README.source to explain the branching model used. * Declare compliance with Debian Policy 4.0.0. (No changes needed). - * debian/control: + * debian/changelog: + - Add 2017 to debian/*. + * debian/copyright: - Remove dh-autoreconf. + Not longer needed since debhelper compatibility level > 10. - Remove libssl-dev from build depends to use the upstream ssl implemantiton. + + Openssl provides only TLS1.2. TLS1.0 / TLS1.1 is using to connect some + devices (Closes #871427). * Use the automatic debug symbol packages: - Remove argyll-dbg section from debian/control. - Remove override_dh_strip from debian/rules. 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 2008-2010 Roland Mas - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-3+ License: AGPL-3 -- cgit v1.2.3 From d2d6a5eef29fc0325a614022ae1c9d2fd677d7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 16:48:15 +0200 Subject: Refresh 0100_spelling.patch --- debian/changelog | 7 ++- debian/patches/0100_spelling.patch | 94 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 434e592..f111366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,12 +7,15 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * debian/copyright: - Remove dh-autoreconf. + Not longer needed since debhelper compatibility level > 10. - - Remove libssl-dev from build depends to use the upstream ssl implemantiton. + - Remove libssl-dev from build depends to use the upstream ssl + implemantiton. + Openssl provides only TLS1.2. TLS1.0 / TLS1.1 is using to connect some - devices (Closes #871427). + devices (Closes: #871427). * Use the automatic debug symbol packages: - Remove argyll-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * Refresh patches: + - 0100_spelling.patch. -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch index f0d1f25..2705f6b 100644 --- a/debian/patches/0100_spelling.patch +++ b/debian/patches/0100_spelling.patch @@ -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 */ -- cgit v1.2.3 From 7aa4b340bfd6600147a86b952e3caea335ff00d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 20:26:31 +0200 Subject: New patch 0130_openssl.patch --- debian/changelog | 11 +++++------ debian/control | 1 + debian/patches/0100_spelling.patch | 2 +- debian/patches/0130_openssl.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 debian/patches/0130_openssl.patch diff --git a/debian/changelog b/debian/changelog index f111366..a6775df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,15 +2,14 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * New README.source to explain the branching model used. * Declare compliance with Debian Policy 4.0.0. (No changes needed). - * debian/changelog: - - Add 2017 to debian/*. * debian/copyright: + - Add 2017 to debian/*. + * debian/control: - Remove dh-autoreconf. + Not longer needed since debhelper compatibility level > 10. - - Remove libssl-dev from build depends to use the upstream ssl - implemantiton. - + Openssl provides only TLS1.2. TLS1.0 / TLS1.1 is using to connect some - devices (Closes: #871427). + * 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. - Remove override_dh_strip from debian/rules. diff --git a/debian/control b/debian/control index 4c34a52..3d0157d 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: jam, libjpeg-dev, libpng-dev, + libssl-dev, libtiff5-dev, libtool, libusb-1.0-0-dev, diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch index 2705f6b..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 -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 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 -- cgit v1.2.3 From cfda51d8c9d7473091da1cf37c72bf267a0d110e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 22:12:08 +0200 Subject: Replace dpkg-parsechangelog with SOURCE_DATE_EPOCH --- debian/changelog | 3 +++ debian/rules | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6775df..adf4d59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * debian/control: - Remove dh-autoreconf. + Not longer needed since debhelper compatibility level > 10. + * debian/rules: + - Replace dpkg-parsechangelog with SOURCE_DATE_EPOCH to prevent + lintian warning. * New patch 0130_openssl.patch: - Enable all ssl connections since openssl provides only connetions with TLS1.2 or greater (Closes: #871427). diff --git a/debian/rules b/debian/rules index 85ab4d3..6f743b7 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 $@ -- cgit v1.2.3 From ca09589bae0936bb8446d975257c6962e609469b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Aug 2017 09:21:30 +0200 Subject: Bump Standards-Version to 4.0.1 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index adf4d59..08e423b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * New README.source to explain the branching model used. - * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Declare compliance with Debian Policy 4.0.1. (No changes needed). * debian/copyright: - Add 2017 to debian/*. * debian/control: diff --git a/debian/control b/debian/control index 3d0157d..407baf4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: argyll Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.17.0), -- cgit v1.2.3 From 1ad9482d72ca2fa48d8c1fdc4f5bdfd8b2b1fbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Aug 2017 10:48:51 +0200 Subject: d/changelog: Change Date/Time --- debian/changelog | 4 ++-- debian/files | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index 08e423b..04ee935 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -argyll (1.9.2+repack-2) UNRELEASED; urgency=medium +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). @@ -19,7 +19,7 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * Refresh patches: - 0100_spelling.patch. - -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 + -- Jörg Frings-Fürst Sun, 27 Aug 2017 10:18:44 +0200 argyll (1.9.2+repack-1) unstable; urgency=medium 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 -- cgit v1.2.3 From ae5e9101c43fb0eef8979c6fa0169a861eee6beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 31 Aug 2017 06:50:21 +0200 Subject: d/changelog: change some tags to make better --- debian/changelog | 10 +++++----- debian/rules | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04ee935..3860758 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,20 +6,20 @@ argyll (1.9.2+repack-2) unstable; urgency=medium - Add 2017 to debian/*. * debian/control: - Remove dh-autoreconf. - + Not longer needed since debhelper compatibility level > 10. + + Not longer needed since debhelper compatibility level >= 10. * debian/rules: - - Replace dpkg-parsechangelog with SOURCE_DATE_EPOCH to prevent - lintian warning. + - 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. - - Remove override_dh_strip from debian/rules. + - Use --dbgsym-migration at override_dh_strip from debian/rules. * Refresh patches: - 0100_spelling.patch. - -- Jörg Frings-Fürst Sun, 27 Aug 2017 10:18:44 +0200 + -- Jörg Frings-Fürst Thu, 31 Aug 2017 06:49:06 +0200 argyll (1.9.2+repack-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 6f743b7..fe01084 100755 --- a/debian/rules +++ b/debian/rules @@ -50,6 +50,9 @@ override_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 -- cgit v1.2.3