Andreas Tille pushed to branch master at Debian Med / ecopcr
Commits: eb2822c1 by Andreas Tille at 2019-01-26T10:16:07Z Cleanup watch file - - - - - b37f9f80 by Andreas Tille at 2019-01-26T10:16:20Z New upstream version 1.0.1+dfsg - - - - - dfcddfc3 by Andreas Tille at 2019-01-26T10:16:49Z Update upstream source from tag 'upstream/1.0.1+dfsg' Update to upstream version '1.0.1+dfsg' with Debian dir 47eca154b7418a8f5ec418c853fe0518d6ef4191 - - - - - 61b5ec58 by Andreas Tille at 2019-01-26T10:17:13Z New upstream version - - - - - ef90c98b by Andreas Tille at 2019-01-26T10:17:43Z debhelper 12 - - - - - a246b7ea by Andreas Tille at 2019-01-26T10:17:54Z Standards-Version: 4.3.0 - - - - - 9cd3c8ff by Andreas Tille at 2019-01-26T10:17:55Z Remove trailing whitespace in debian/copyright - - - - - bd73551d by Andreas Tille at 2019-01-26T10:21:04Z Upload to unstable - - - - - 7 changed files: - VERSION - debian/changelog - debian/compat - debian/control - debian/copyright - debian/watch - src/ecopcr.c Changes: ===================================== VERSION ===================================== @@ -1 +1 @@ -0.8.0 +1.0.0 ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +ecopcr (1.0.1+dfsg-1) unstable; urgency=medium + + * New upstream version + * Cleanup watch file + * debhelper 12 + * Standards-Version: 4.3.0 + * Remove trailing whitespace in debian/copyright + + -- Andreas Tille <[email protected]> Sat, 26 Jan 2019 11:17:55 +0100 + ecopcr (1.0.0+dfsg-1) unstable; urgency=medium * New upstream version ===================================== debian/compat ===================================== @@ -1 +1 @@ -11 +12 ===================================== debian/control ===================================== @@ -3,11 +3,11 @@ Maintainer: Debian Med Packaging Team <[email protected]. Uploaders: Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper (>= 12~), dh-python, python3, zlib1g-dev -Standards-Version: 4.2.0 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/med-team/ecopcr Vcs-Git: https://salsa.debian.org/med-team/ecopcr.git Homepage: https://git.metabarcoding.org/obitools/ecopcr/wikis/home ===================================== debian/copyright ===================================== @@ -146,7 +146,7 @@ License: CeCILL_V2 The purpose of the Agreement is the grant by the Licensor to the Licensee of a non-exclusive, transferable and worldwide license for the Software as set forth in Article 5 hereinafter for the whole term of the - protection granted by the rights over said Software. + protection granted by the rights over said Software. . . Article 3 - ACCEPTANCE @@ -413,7 +413,7 @@ License: CeCILL_V2 . 9.3 The Licensee acknowledges that the Software is supplied "as is" by the Licensor without any other express or tacit warranty, other than - that provided for in Article 9.2 and, in particular, without any warranty + that provided for in Article 9.2 and, in particular, without any warranty as to its commercial value, its secured, safe, innovative or relevant nature. . ===================================== debian/watch ===================================== @@ -1,4 +1,4 @@ version=4 -opts="filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/<project>-$1\.tar\.gz/g,repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \ - https://git.metabarcoding.org/obitools/ecopcr/tags .*/ecopcr_v@ANY_VERSION@/archive@ARCHIVE_EXT@ +opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \ + https://git.metabarcoding.org/obitools/ecopcr/tags .*/ecopcr_v@ANY_VERSION@/archive\.tar.gz ===================================== src/ecopcr.c ===================================== @@ -6,7 +6,7 @@ #include <getopt.h> -#define VERSION "1.0.0" +#define VERSION "1.0.1" /* ----------------------------------------------- */ @@ -610,13 +610,12 @@ int main(int argc, char **argv) { posj+=o2c->patlen; // printf("coucou %d %d %d\n",posi,posj,apatseq->seqlen); - errj =apatseq->hiterr[1]->val[j]; + errj = apatseq->hiterr[1]->val[j]; length = 0; if (posj > posi) length = posj - posi - o1->patlen - o2->patlen; if (posj < posi) - //length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; // TODO - length = posi - posj - o1->patlen - o2->patlen; + length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; if ((length>0) && // For when primers touch or overlap (!lmin || (length >= lmin)) && (!lmax || (length <= lmax))) @@ -668,11 +667,9 @@ int main(int argc, char **argv) length = 0; if (posj > posi) - //length = posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */ TODO ???? - length = posj - posi - o2->patlen - o1->patlen; + length = posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */ if (posj < posi) - //length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; TODO ???? - length = posi - posj - o2->patlen - o1->patlen; + length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; if ((length>0) && // For when primers touch or overlap (!lmin || (length >= lmin)) && (!lmax || (length <= lmax))) View it on GitLab: https://salsa.debian.org/med-team/ecopcr/compare/a73fda511697d5cf863290d134d0239c0878bff5...bd73551d614bdf9269415babbff8624ce4e914c2 -- View it on GitLab: https://salsa.debian.org/med-team/ecopcr/compare/a73fda511697d5cf863290d134d0239c0878bff5...bd73551d614bdf9269415babbff8624ce4e914c2 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
