diff -Nru fastqc-0.11.9+dfsg/debian/changelog fastqc-0.11.9+dfsg/debian/changelog --- fastqc-0.11.9+dfsg/debian/changelog 2020-01-31 10:24:32.000000000 +0000 +++ fastqc-0.11.9+dfsg/debian/changelog 2020-04-06 22:26:31.000000000 +0000 @@ -1,3 +1,16 @@ +fastqc (0.11.9+dfsg-3) unstable; urgency=medium + + [ tony mancill ] + * Team upload. + * Update autopkgtests to compare summary output (Closes: #950311) + + [ Andreas Tille ] + * Add salsa-ci file (routine-update) + * Rules-Requires-Root: no (routine-update) + * Set upstream metadata fields: Repository, Repository-Browse. + + -- tony mancill Mon, 06 Apr 2020 15:26:31 -0700 + fastqc (0.11.9+dfsg-2) unstable; urgency=medium * Fix and enhance autopkgtest diff -Nru fastqc-0.11.9+dfsg/debian/control fastqc-0.11.9+dfsg/debian/control --- fastqc-0.11.9+dfsg/debian/control 2020-01-31 10:24:32.000000000 +0000 +++ fastqc-0.11.9+dfsg/debian/control 2020-04-06 22:26:31.000000000 +0000 @@ -16,6 +16,7 @@ Vcs-Browser: https://salsa.debian.org/med-team/fastqc Vcs-Git: https://salsa.debian.org/med-team/fastqc.git Homepage: https://www.bioinformatics.babraham.ac.uk/projects/fastqc/ +Rules-Requires-Root: no Package: fastqc Architecture: all diff -Nru fastqc-0.11.9+dfsg/debian/salsa-ci.yml fastqc-0.11.9+dfsg/debian/salsa-ci.yml --- fastqc-0.11.9+dfsg/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ fastqc-0.11.9+dfsg/debian/salsa-ci.yml 2020-04-06 22:26:31.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru fastqc-0.11.9+dfsg/debian/source/include-binaries fastqc-0.11.9+dfsg/debian/source/include-binaries --- fastqc-0.11.9+dfsg/debian/source/include-binaries 2020-01-31 10:24:32.000000000 +0000 +++ fastqc-0.11.9+dfsg/debian/source/include-binaries 2020-04-06 22:26:31.000000000 +0000 @@ -1 +1 @@ -debian/tests.fastqc/toy.bam +debian/tests.fastqc/toy_bam.bam diff -Nru fastqc-0.11.9+dfsg/debian/tests/example_fastqc_expected_summary.txt fastqc-0.11.9+dfsg/debian/tests/example_fastqc_expected_summary.txt --- fastqc-0.11.9+dfsg/debian/tests/example_fastqc_expected_summary.txt 1970-01-01 00:00:00.000000000 +0000 +++ fastqc-0.11.9+dfsg/debian/tests/example_fastqc_expected_summary.txt 2020-04-06 22:26:31.000000000 +0000 @@ -0,0 +1,11 @@ +PASS Basic Statistics example.fastq +WARN Per base sequence quality example.fastq +PASS Per tile sequence quality example.fastq +PASS Per sequence quality scores example.fastq +WARN Per base sequence content example.fastq +WARN Per sequence GC content example.fastq +PASS Per base N content example.fastq +PASS Sequence Length Distribution example.fastq +PASS Sequence Duplication Levels example.fastq +WARN Overrepresented sequences example.fastq +PASS Adapter Content example.fastq diff -Nru fastqc-0.11.9+dfsg/debian/tests/run-unit-test fastqc-0.11.9+dfsg/debian/tests/run-unit-test --- fastqc-0.11.9+dfsg/debian/tests/run-unit-test 2020-01-31 10:24:32.000000000 +0000 +++ fastqc-0.11.9+dfsg/debian/tests/run-unit-test 2020-04-06 22:26:31.000000000 +0000 @@ -2,6 +2,8 @@ set -e pkg="fastqc" +tests_dir="$PWD/debian/tests" +test_failures=0 if [ "$AUTOPKGTEST_TMP" = "" ] ; then AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX` @@ -14,26 +16,28 @@ find . -name "*.gz" -exec gunzip \{\} \; -for sample in example.fastq toy.sam toy.bam ; do - /usr/bin/fastqc "$sample" - if [ "$sample" = "example.fastq" ] ; then - result=example_fastqc - else - result=toy_fastqc - fi - unzip -q "$result".zip - if grep -q FAIL "$result"/summary.txt ; then +for sample in example.fastq toy_sam.sam toy_bam.bam ; do + /usr/bin/fastqc --extract "$sample" + result="${sample%%.*}_fastqc" + expected="${tests_dir}/${result}_expected_summary.txt" + if ! diff -q "${result}/summary.txt" ${expected} 2>/dev/null ; then + (( test_failures += 1 )) cat <