Skip to content

Commits on Source 8

Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ bd73551d
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 <tille@debian.org> Sat, 26 Jan 2019 11:17:55 +0100
ecopcr (1.0.0+dfsg-1) unstable; urgency=medium
* New upstream version
......
debian/control
View file @ bd73551d
......@@ -3,11 +3,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
Uploaders: Andreas Tille <tille@debian.org>
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/watch
View file @ bd73551d
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
View file @ bd73551d
......@@ -6,7 +6,7 @@
#include <getopt.h>
#define VERSION "1.0.0"
#define VERSION "1.0.1"
/* ----------------------------------------------- */
......@@ -615,8 +615,7 @@ int main(int argc, char **argv)
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)))
......