[med-svn] [Git][med-team/dazzdb][master] 8 commits: Remove redundant comments
Andreas Tille
gitlab at salsa.debian.org
Mon Jul 27 21:19:19 BST 2020
Andreas Tille pushed to branch master at Debian Med / dazzdb
Commits:
3b3db700 by Andreas Tille at 2020-07-27T22:13:13+02:00
Remove redundant comments
- - - - -
4c2b548e by Andreas Tille at 2020-07-27T22:13:35+02:00
New upstream version 1.0+git20200727.d22ae58
- - - - -
3e6498a5 by Andreas Tille at 2020-07-27T22:13:35+02:00
routine-update: New upstream version
- - - - -
607c8f26 by Andreas Tille at 2020-07-27T22:13:35+02:00
Update upstream source from tag 'upstream/1.0+git20200727.d22ae58'
Update to upstream version '1.0+git20200727.d22ae58'
with Debian dir c0c6dd26c6cf2918988bd62e8e57524478fdadc2
- - - - -
95d250f2 by Andreas Tille at 2020-07-27T22:13:35+02:00
routine-update: debhelper-compat 13
- - - - -
cb5f956d by Andreas Tille at 2020-07-27T22:13:38+02:00
routine-update: Add salsa-ci file
- - - - -
d6281b8f by Andreas Tille at 2020-07-27T22:13:38+02:00
routine-update: Rules-Requires-Root: no
- - - - -
4cae57c8 by Andreas Tille at 2020-07-27T22:16:55+02:00
Upload to unstable
- - - - -
7 changed files:
- Catrack.c
- DB.c
- DBshow.c
- debian/changelog
- debian/control
- + debian/salsa-ci.yml
- debian/tests/run-unit-test
Changes:
=====================================
Catrack.c
=====================================
@@ -71,13 +71,20 @@ int main(int argc, char *argv[])
plen = strlen(argv[1]);
pwd = PathTo(argv[1]);
- if (strcmp(argv[1]+(plen-3),".dam") == 0)
+ if (strcmp(argv[1]+(plen-4),".dam") == 0)
{ root = Root(argv[1],".dam");
stub = Read_DB_Stub(Catenate(pwd,"/",root,".dam"),0);
}
else
{ root = Root(argv[1],".db");
stub = Read_DB_Stub(Catenate(pwd,"/",root,".db"),0);
+ if (stub == NULL)
+ { stub = Read_DB_Stub(Catenate(pwd,"/",root,".dam"),0);
+ if (stub == NULL)
+ { fprintf(stderr,"%s: Cannot open %s as either a DB or a DAM\n",Prog_Name,argv[1]);
+ exit (1);
+ }
+ }
}
nblocks = stub->nblocks;
@@ -185,7 +192,6 @@ int main(int argc, char *argv[])
esize = 8;
else
esize = size;
-
if (nfiles == 0)
{ tracksiz = size;
if (dfile != NULL)
=====================================
DB.c
=====================================
@@ -1758,7 +1758,6 @@ static int Late_Track_Trim(DAZZ_DB *db, DAZZ_TRACK *track, int ispart)
j += 1;
}
}
- track->data = Realloc(track->data,anno4[j],NULL);
track->alen = Realloc(track->alen,sizeof(int)*j,NULL);
track->anno = Realloc(track->anno,track->size*(j+1),NULL);
}
@@ -1779,7 +1778,6 @@ static int Late_Track_Trim(DAZZ_DB *db, DAZZ_TRACK *track, int ispart)
j += 1;
}
}
- track->data = Realloc(track->data,anno8[j],NULL);
track->alen = Realloc(track->alen,sizeof(int)*j,NULL);
track->anno = Realloc(track->anno,track->size*(j+1),NULL);
}
=====================================
DBshow.c
=====================================
@@ -617,10 +617,31 @@ int main(int argc, char *argv[])
else if (DOSEQ)
{ int j;
+#ifdef COMPRESS
+ { int k, last;
+
+ last = 0;
+ for (j = fst; j+WIDTH < lst; j += WIDTH)
+ { for (k = j; k < j+WIDTH; k++)
+ if (read[k] != last)
+ { PRINTF("%c",read[k]);
+ last = read[k];
+ }
+ printf("\n");
+ }
+ for (k = j; k < lst; k++)
+ if (read[k] != last)
+ { PRINTF("%c",read[k]);
+ last = read[k];
+ }
+ printf("\n");
+ }
+#else
for (j = fst; j+WIDTH < lst; j += WIDTH)
PRINTF("%.*s\n",WIDTH,read+j)
if (j < lst)
PRINTF("%.*s\n",lst-j,read+j)
+#endif
}
}
}
=====================================
debian/changelog
=====================================
@@ -1,10 +1,17 @@
-dazzdb (1.0+git20200115.d8adde7-3) UNRELEASED; urgency=medium
+dazzdb (1.0+git20200727.d22ae58-1) unstable; urgency=medium
+ [ Pranav Ballaney ]
* Install autopkgtests
* Install docs
* Add Pranav Ballaney to uploaders
- -- Pranav Ballaney <ballaneypranav at gmail.com> Mon, 27 Jul 2020 21:40:08 +0530
+ [ Andreas Tille ]
+ * New upstream version
+ * debhelper-compat 13 (routine-update)
+ * Add salsa-ci file (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+
+ -- Pranav Ballaney <ballaneypranav at gmail.com> Mon, 27 Jul 2020 22:13:35 +0200
dazzdb (1.0+git20200115.d8adde7-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -4,12 +4,13 @@ Uploaders: Andreas Tille <tille at debian.org>,
Pranav Ballaney <ballaneypranav at gmail.com>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
zlib1g-dev
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/dazzdb
Vcs-Git: https://salsa.debian.org/med-team/dazzdb.git
Homepage: https://github.com/thegenemyers/DAZZ_DB
+Rules-Requires-Root: no
Package: dazzdb
Architecture: any
=====================================
debian/salsa-ci.yml
=====================================
@@ -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
=====================================
debian/tests/run-unit-test
=====================================
@@ -6,9 +6,6 @@ pkg=dazzdb
export LC_ALL=C.UTF-8
if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
- # Double quote below to expand the temporary directory variable now versus
- # later is on purpose.
- # shellcheck disable=SC2064
trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
fi
@@ -57,4 +54,3 @@ DBstats -mdust G > result
echo "5c5c5f89a9ae055cc06487febc6adb3d result" >> checksums
md5sum --check checksums
-
View it on GitLab: https://salsa.debian.org/med-team/dazzdb/-/compare/2bbb7e66a85b88d8e91a89b9a0b3203c13c02acb...4cae57c853a5367c0c3386d518608a6179cdd1bb
--
View it on GitLab: https://salsa.debian.org/med-team/dazzdb/-/compare/2bbb7e66a85b88d8e91a89b9a0b3203c13c02acb...4cae57c853a5367c0c3386d518608a6179cdd1bb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200727/2abfa673/attachment-0001.html>
More information about the debian-med-commit
mailing list